1 (* Copyright (C) 2000, HELM Team.
3 * This file is part of HELM, an Hypertextual, Electronic
4 * Library of Mathematics, developed at the Computer Science
5 * Department, University of Bologna, Italy.
7 * HELM is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License
9 * as published by the Free Software Foundation; either version 2
10 * of the License, or (at your option) any later version.
12 * HELM is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
17 * You should have received a copy of the GNU General Public License
18 * along with HELM; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
22 * For details, see the HELM World-Wide-Web page,
23 * http://cs.unibo.it/helm/.
26 (*****************************************************************************)
30 (* Enrico Tassi <tassi@cs.unibo.it> *)
33 (* This module implements the aciclic graph of universes. *)
35 (*****************************************************************************)
39 (*****************************************************************************)
40 (** switch implementation **)
41 (*****************************************************************************)
43 let fast_implementation = ref true ;;
45 (*****************************************************************************)
47 (*****************************************************************************)
51 (*****************************************************************************)
52 (** Types and default values **)
53 (*****************************************************************************)
55 type universe = int * UriManager.uri option
57 module UniverseType = struct
59 let compare = Pervasives.compare
62 module SOF = Set.Make(UniverseType)
74 module MAL = Map.Make(UniverseType)
76 type arc_type = GE | GT | EQ
78 type bag = entry MAL.t
89 let empty_bag = MAL.empty
91 let are_set_eq s1 s2 =
94 let are_entry_eq v1 v2 =
95 (are_set_eq v1.gt_closure v2.gt_closure ) &&
96 (are_set_eq v1.ge_closure v2.ge_closure ) &&
97 (are_set_eq v1.eq_closure v2.eq_closure ) &&
98 (*(are_set_eq v1.in_gegt_of v2.in_gegt_of ) &&*)
99 (are_set_eq v1.one_s_ge v2.one_s_ge ) &&
100 (are_set_eq v1.one_s_gt v2.one_s_gt ) &&
101 (are_set_eq v1.one_s_eq v2.one_s_eq )
103 let are_ugraph_eq = MAL.equal are_entry_eq
105 (*****************************************************************************)
106 (** Pretty printings **)
107 (*****************************************************************************)
109 let string_of_universe (i,u) =
112 "(" ^ ((string_of_int i) ^ "," ^ (UriManager.string_of_uri u) ^ ")")
113 | None -> "(" ^ (string_of_int i) ^ ",None)"
115 let string_of_universe_set l =
116 SOF.fold (fun x s -> s ^ (string_of_universe x) ^ " ") l ""
118 let string_of_node n =
120 "eq_c: " ^ (string_of_universe_set n.eq_closure) ^ "; " ^
121 "ge_c: " ^ (string_of_universe_set n.ge_closure) ^ "; " ^
122 "gt_c: " ^ (string_of_universe_set n.gt_closure) ^ "; " ^
123 "i_gegt: " ^ (string_of_universe_set n.in_gegt_of) ^ "}\n"
125 let string_of_arc (a,u,v) =
126 (string_of_universe u) ^ " " ^ a ^ " " ^ (string_of_universe v)
128 let string_of_mal m =
131 rc := !rc ^ sprintf "%s --> %s" (string_of_universe k)
132 (string_of_node v)) m;
135 let string_of_bag b =
138 (*****************************************************************************)
140 (*****************************************************************************)
141 let time_spent = ref 0.0;;
142 let partial = ref 0.0 ;;
144 let reset_spent_time () = time_spent := 0.0;;
145 let get_spent_time () = !time_spent ;;
146 let begin_spending () = ()
147 (*assert (!partial = 0.0);*)
148 (* partial := Unix.gettimeofday () *)
151 let end_spending () = ()
153 assert (!partial > 0.0);
154 let interval = (Unix.gettimeofday ()) -. !partial in
156 time_spent := !time_spent +. interval
161 (*****************************************************************************)
163 (*****************************************************************************)
170 Not_found -> empty_entry
172 (* FIXME: May be faster if we make it by hand *)
173 let merge_closures f nodes m =
174 SOF.fold (fun x i -> SOF.union (f (repr x m)) i ) nodes SOF.empty
177 (*****************************************************************************)
178 (** _fats implementation **)
179 (*****************************************************************************)
181 let rec closure_of_fast ru m =
182 let eq_c = closure_eq_fast ru m in
183 let ge_c = closure_ge_fast ru m in
184 let gt_c = closure_gt_fast ru m in
189 in_gegt_of = ru.in_gegt_of;
190 one_s_eq = ru.one_s_eq;
191 one_s_ge = ru.one_s_ge;
192 one_s_gt = ru.one_s_gt
195 and closure_eq_fast ru m =
197 let j = ru.one_s_eq in
198 let _Uj = merge_closures (fun x -> x.eq_closure) j m in
199 let one_step_eq = ru.one_s_eq in
200 (SOF.union one_step_eq _Uj)
204 and closure_ge_fast ru m =
206 let j = SOF.union ru.one_s_ge (SOF.union ru.one_s_gt ru.one_s_eq) in
207 let _Uj = merge_closures (fun x -> x.ge_closure) j m in
213 and closure_gt_fast ru m =
215 let j = ru.one_s_gt in
216 let k = ru.one_s_ge in
217 let l = ru.one_s_eq in
218 let _Uj = merge_closures (fun x -> x.ge_closure) j m in
219 let _Uk = merge_closures (fun x -> x.gt_closure) k m in
220 let _Ul = merge_closures (fun x -> x.gt_closure) l m in
221 let one_step_gt = ru.one_s_gt in
222 (SOF.union (SOF.union (SOF.union _Ul one_step_gt) _Uk) _Uj)
226 and print_rec_status u ru =
227 print_endline ("Aggiusto " ^ (string_of_universe u) ^
228 "e ottengo questa chiusura\n " ^ (string_of_node ru))
230 and adjust_fast u m =
232 let gt_c = closure_gt_fast ru m in
233 let ge_c = closure_ge_fast ru m in
234 let eq_c = closure_eq_fast ru m in
235 let changed_eq = not (are_set_eq eq_c ru.eq_closure) in
237 (not (are_set_eq gt_c ru.gt_closure)) ||
238 (not (are_set_eq ge_c ru.ge_closure))
240 if ((not changed_gegt) && (not changed_eq)) then
248 in_gegt_of = ru.in_gegt_of;
249 one_s_eq = ru.one_s_eq;
250 one_s_ge = ru.one_s_ge;
251 one_s_gt = ru.one_s_gt}
253 let m = MAL.add u ru' m in
255 SOF.fold (fun x m -> adjust_fast x m)
256 (SOF.union ru'.eq_closure ru'.in_gegt_of) m
261 m (*adjust_fast u m*)
264 and add_gt_arc_fast u v m =
266 let ru' = {ru with one_s_gt = SOF.add v ru.one_s_gt} in
267 let m' = MAL.add u ru' m in
268 let rv = repr v m' in
269 let rv' = {rv with in_gegt_of = SOF.add u rv.in_gegt_of} in
270 let m'' = MAL.add v rv' m' in
273 and add_ge_arc_fast u v m =
275 let ru' = { ru with one_s_ge = SOF.add v ru.one_s_ge} in
276 let m' = MAL.add u ru' m in
277 let rv = repr v m' in
278 let rv' = {rv with in_gegt_of = SOF.add u rv.in_gegt_of} in
279 let m'' = MAL.add v rv' m' in
282 and add_eq_arc_fast u v m =
285 let ru' = {ru with one_s_eq = SOF.add v ru.one_s_eq} in
286 (*TESI: let ru' = {ru' with in_gegt_of = SOF.add v ru.in_gegt_of} in *)
287 let m' = MAL.add u ru' m in
288 let rv' = {rv with one_s_eq = SOF.add u rv.one_s_eq} in
289 (*TESI: let rv' = {rv' with in_gegt_of = SOF.add u rv.in_gegt_of} in *)
290 let m'' = MAL.add v rv' m' in
291 adjust_fast v (*(adjust_fast u*) m'' (* ) *)
295 (*****************************************************************************)
296 (** safe implementation **)
297 (*****************************************************************************)
302 let j = ru.one_s_eq in
303 let _Uj = merge_closures (fun x -> x.eq_closure) j m in
304 let one_step_eq = ru.one_s_eq in
305 (SOF.union one_step_eq _Uj)
308 let j = SOF.union ru.one_s_ge (SOF.union ru.one_s_gt ru.one_s_eq) in
309 let _Uj = merge_closures (fun x -> x.ge_closure) j m in
314 let j = ru.one_s_gt in
315 let k = ru.one_s_ge in
316 let l = ru.one_s_eq in
317 let _Uj = merge_closures (fun x -> x.ge_closure) j m in
318 let _Uk = merge_closures (fun x -> x.gt_closure) k m in
319 let _Ul = merge_closures (fun x -> x.gt_closure) l m in
320 let one_step_gt = ru.one_s_gt in
321 (SOF.union (SOF.union (SOF.union _Ul one_step_gt) _Uk) _Uj)
327 in_gegt_of = ru.in_gegt_of;
328 one_s_eq = ru.one_s_eq;
329 one_s_ge = ru.one_s_ge;
330 one_s_gt = ru.one_s_gt
333 let rec simple_adjust m =
335 MAL.mapi (fun x _ -> closure_of x m) m
337 if not (are_ugraph_eq m m') then(
342 let add_eq_arc u v m =
345 let ru' = {ru with one_s_eq = SOF.add v ru.one_s_eq} in
346 let m' = MAL.add u ru' m in
347 let rv' = {rv with one_s_eq = SOF.add u rv.one_s_eq} in
348 let m'' = MAL.add v rv' m' in
351 let add_ge_arc u v m =
353 let ru' = { ru with one_s_ge = SOF.add v ru.one_s_ge} in
354 let m' = MAL.add u ru' m in
357 let add_gt_arc u v m =
359 let ru' = {ru with one_s_gt = SOF.add v ru.one_s_gt} in
360 let m' = MAL.add u ru' m in
364 (*****************************************************************************)
365 (** Outhern interface, that chooses between _fast and safe **)
366 (*****************************************************************************)
369 given the 2 nodes plus the current bag, adds the arc, recomputes the
370 closures and returns the new map
372 let add_eq fast u v b =
374 add_eq_arc_fast u v b
379 given the 2 nodes plus the current bag, adds the arc, recomputes the
380 closures and returns the new map
382 let add_ge fast u v b =
384 add_ge_arc_fast u v b
388 given the 2 nodes plus the current bag, adds the arc, recomputes the
389 closures and returns the new map
391 let add_gt fast u v b =
393 add_gt_arc_fast u v b
398 (*****************************************************************************)
399 (** Other real code **)
400 (*****************************************************************************)
402 exception UniverseInconsistency of string Lazy.t
404 let error arc node1 closure_type node2 closure =
407 ("\n ===== Universe Inconsistency detected =====\n\n" ^
409 "\t" ^ (string_of_arc arc) ^ "\n" ^
411 "\t" ^ (string_of_universe node1) ^ "\n" ^
412 " is in the " ^ closure_type ^ " closure\n" ^
413 "\t{" ^ (string_of_universe_set closure) ^ "}\n" ^
415 "\t" ^ (string_of_universe node2) ^ "\n\n" ^
416 " ===== Universe Inconsistency detected =====\n") in
417 prerr_endline (Lazy.force s);
418 raise (UniverseInconsistency s)
421 let fill_empty_nodes_with_uri (g, already_contained,o) l uri =
422 let fill_empty_universe u =
424 (i,None) -> (i,Some uri)
425 | (i,Some _) as u -> u
427 let fill_empty_set s =
428 SOF.fold (fun e s -> SOF.add (fill_empty_universe e) s) s SOF.empty
430 let fill_empty_entry e = {
431 eq_closure = (fill_empty_set e.eq_closure) ;
432 ge_closure = (fill_empty_set e.ge_closure) ;
433 gt_closure = (fill_empty_set e.gt_closure) ;
434 in_gegt_of = (fill_empty_set e.in_gegt_of) ;
435 one_s_eq = (fill_empty_set e.one_s_eq) ;
436 one_s_ge = (fill_empty_set e.one_s_ge) ;
437 one_s_gt = (fill_empty_set e.one_s_gt) ;
442 MAL.add (fill_empty_universe k) (fill_empty_entry v) m) m MAL.empty
444 let l' = List.map fill_empty_universe l in
445 (m', already_contained,o),l'
448 (*****************************************************************************)
449 (** World interface **)
450 (*****************************************************************************)
452 type universe_graph = bag * UriManager.UriSet.t * bool
453 (* the graph , the cache of already merged ugraphs, oblivion? *)
455 let empty_ugraph = empty_bag, UriManager.UriSet.empty, false
456 let oblivion_ugraph = empty_bag, UriManager.UriSet.empty, true
458 let current_index_anon = ref (-1)
459 let current_index_named = ref (-1)
461 let restart_numbering () = current_index_named := (-1)
463 let fresh ?uri ?id () =
467 current_index_anon := !current_index_anon + 1;
469 | None, Some _ -> assert false
471 current_index_named := !current_index_named + 1;
473 | Some _, Some id -> id
477 let name_universe u uri =
479 | (i, None) -> (i, Some uri)
482 let print_ugraph (g, _, o) =
483 if o then prerr_endline "oblivion universe" else
484 prerr_endline (string_of_bag g)
486 let add_eq ?(fast=(!fast_implementation)) u v b =
487 (* should we check to no add twice the same?? *)
490 if SOF.mem v ru.gt_closure then
491 error ("EQ",u,v) v "GT" u ru.gt_closure
495 if SOF.mem u rv.gt_closure then
496 error ("EQ",u,v) u "GT" v rv.gt_closure
501 let add_ge ?(fast=(!fast_implementation)) u v b =
502 (* should we check to no add twice the same?? *)
505 if SOF.mem u rv.gt_closure then
506 error ("GE",u,v) u "GT" v rv.gt_closure
510 let add_gt ?(fast=(!fast_implementation)) u v b =
511 (* should we check to no add twice the same?? *)
513 FIXME : check the thesis... no need to check GT and EQ closure since the
514 GE is a superset of both
520 error ("GT",u,v) u "==" v SOF.empty
523 (*if SOF.mem u rv.gt_closure then
524 error ("GT",u,v) u "GT" v rv.gt_closure
527 if SOF.mem u rv.ge_closure then
528 error ("GT",u,v) u "GE" v rv.ge_closure
531 if SOF.mem u rv.eq_closure then
532 error ("GT",u,v) u "EQ" v rv.eq_closure
538 (*****************************************************************************)
539 (** START: Decomment this for performance comparisons **)
540 (*****************************************************************************)
542 let add_eq ?(fast=(!fast_implementation)) u v (b,already_contained,oblivion) =
543 if oblivion then (b,already_contained,oblivion) else
544 (*prerr_endline "add_eq";*)
546 let rc = add_eq ~fast u v b in
548 rc,already_contained,false)
550 let add_ge ?(fast=(!fast_implementation)) u v (b,already_contained,oblivion) =
551 if oblivion then (b,already_contained,oblivion) else
552 (* prerr_endline "add_ge"; *)
554 let rc = add_ge ~fast u v b in
556 rc,already_contained,false)
558 let add_gt ?(fast=(!fast_implementation)) u v (b,already_contained,oblivion) =
559 if oblivion then (b,already_contained,oblivion) else
560 (* prerr_endline "add_gt"; *)
562 let rc = add_gt ~fast u v b in
564 rc,already_contained,false)
567 let profiler_eq = HExtlib.profile "CicUniv.add_eq"
568 let profiler_ge = HExtlib.profile "CicUniv.add_ge"
569 let profiler_gt = HExtlib.profile "CicUniv.add_gt"
570 let add_gt ?fast u v b =
571 profiler_gt.HExtlib.profile (fun _ -> add_gt ?fast u v b) ()
572 let add_ge ?fast u v b =
573 profiler_ge.HExtlib.profile (fun _ -> add_ge ?fast u v b) ()
574 let add_eq ?fast u v b =
575 profiler_eq.HExtlib.profile (fun _ -> add_eq ?fast u v b) ()
578 (*****************************************************************************)
579 (** END: Decomment this for performance comparisons **)
580 (*****************************************************************************)
582 (* TODO: uncomment l to gain a small speedup *)
583 let merge_ugraphs ~base_ugraph ~increment:(increment, uri_of_increment(*,l*)) =
584 let merge_brutal (u,a,_) v =
585 (* prerr_endline ("merging graph: "^UriManager.string_of_uri
586 * uri_of_increment); *)
593 let m = add_gt k u x in m)
594 (SOF.union v.one_s_gt v.gt_closure)
597 let m = add_ge k u x in m)
598 (SOF.union v.one_s_ge v.ge_closure)
601 let m = add_eq k u x in m)
602 (SOF.union v.one_s_eq v.eq_closure) x)))
605 let base, already_contained, oblivion = base_ugraph in
606 let inc,_,oblivion2 = increment in
609 else if oblivion2 then
611 else if MAL.is_empty base then
615 UriManager.UriSet.mem uri_of_increment already_contained
619 (fun (x,_,_) -> x) (merge_brutal increment base_ugraph),
621 List.fold_right UriManager.UriSet.add
622 (List.map (fun (_,x) -> HExtlib.unopt x) l)
624 (UriManager.UriSet.add uri_of_increment already_contained), false
626 (* profiling code; WARNING: the time spent during profiling can be
627 greater than the profiled time
628 let profiler_merge = HExtlib.profile "CicUniv.merge_ugraphs"
629 let merge_ugraphs ~base_ugraph ~increment =
630 profiler_merge.HExtlib.profile
631 (fun _ -> merge_ugraphs ~base_ugraph ~increment) ()
634 (*****************************************************************************)
635 (** Xml sesialization and parsing **)
636 (*****************************************************************************)
638 let xml_of_universe name u =
642 None,"id",(string_of_int i) ;
643 None,"uri",(UriManager.string_of_uri u)]
645 raise (Failure "we can serialize only universes with uri")
649 List.map (xml_of_universe "node") (SOF.elements s)
651 List.fold_left (fun s x -> [< s ; x >] ) [<>] l
653 let xml_of_entry_content e =
654 let stream_of_field f name =
655 let eq_c = xml_of_set f in
657 Xml.xml_nempty name [] eq_c
662 (stream_of_field e.eq_closure "eq_closure");
663 (stream_of_field e.gt_closure "gt_closure");
664 (stream_of_field e.ge_closure "ge_closure");
665 (stream_of_field e.in_gegt_of "in_gegt_of");
666 (stream_of_field e.one_s_eq "one_s_eq");
667 (stream_of_field e.one_s_gt "one_s_gt");
668 (stream_of_field e.one_s_ge "one_s_ge")
671 let xml_of_entry u e =
677 raise (Failure "we can serialize only universes (entry) with uri")
679 let ent = Xml.xml_nempty "entry" [
680 None,"id",(string_of_int i) ;
681 None,"uri",(UriManager.string_of_uri u'')] in
682 let content = xml_of_entry_content e in
685 let write_xml_of_ugraph filename (m,_,_) l =
688 Xml.xml_cdata "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
689 Xml.xml_nempty "ugraph" []
690 ([< (MAL.fold ( fun k v s -> [< s ; (xml_of_entry k v) >]) m [<>]) ;
692 (fun s u -> [< s ; xml_of_universe "owned_node" u >]) [<>] l) >])>]
694 Xml.pp ~gzip:true tokens (Some filename)
699 let rec clean_ugraph m already_contained f =
701 MAL.fold (fun k v x -> if (f k) then MAL.add k v x else x ) m MAL.empty in
702 let m'' = MAL.fold (fun k v x ->
704 eq_closure = SOF.filter f v.eq_closure;
705 ge_closure = SOF.filter f v.ge_closure;
706 gt_closure = SOF.filter f v.gt_closure;
707 in_gegt_of = SOF.filter f v.in_gegt_of;
708 one_s_eq = SOF.filter f v.one_s_eq;
709 one_s_ge = SOF.filter f v.one_s_ge;
710 one_s_gt = SOF.filter f v.one_s_gt
712 MAL.add k v' x ) m' MAL.empty in
714 MAL.fold (fun k v l -> if v = empty_entry && not(f k) then
716 k::l end else l) m'' []
720 m'' already_contained (fun u -> (f u) && not (List.mem u e_l))
723 (fun k v x -> if v <> empty_entry then MAL.add k v x else x)
727 let clean_ugraph (m,a,o) l =
729 let m, a = clean_ugraph m a (fun u -> List.mem u l) in
734 "ge_closure" -> (fun e u->{e with ge_closure=SOF.add u e.ge_closure})
735 | "gt_closure" -> (fun e u->{e with gt_closure=SOF.add u e.gt_closure})
736 | "eq_closure" -> (fun e u->{e with eq_closure=SOF.add u e.eq_closure})
737 | "in_gegt_of" -> (fun e u->{e with in_gegt_of =SOF.add u e.in_gegt_of})
738 | "one_s_ge" -> (fun e u->{e with one_s_ge =SOF.add u e.one_s_ge})
739 | "one_s_gt" -> (fun e u->{e with one_s_gt =SOF.add u e.one_s_gt})
740 | "one_s_eq" -> (fun e u->{e with one_s_eq =SOF.add u e.one_s_eq})
741 | s -> raise (Failure ("unsupported tag " ^ s))
745 let module XPP = XmlPushParser in
746 let current_node = ref (0,None) in
747 let current_entry = ref empty_entry in
748 let current_assign = ref (assigner_of "in_gegt_of") in
749 { XPP.default_callbacks with
750 XPP.end_element = Some( fun name ->
753 m := MAL.add !current_node !current_entry !m;
754 current_entry := empty_entry
757 XPP.start_element = Some( fun name attlist ->
761 let id = List.assoc "id" attlist in
762 let uri = List.assoc "uri" attlist in
763 current_node := (int_of_string id,Some (UriManager.uri_of_string uri))
765 let id = int_of_string (List.assoc "id" attlist) in
766 let uri = List.assoc "uri" attlist in
767 current_entry := !current_assign !current_entry
768 (id,Some (UriManager.uri_of_string uri))
770 let id = int_of_string (List.assoc "id" attlist) in
771 let uri = List.assoc "uri" attlist in
772 l := (id,Some (UriManager.uri_of_string uri)) :: !l
773 | s -> current_assign := assigner_of s
778 let ugraph_and_univlist_of_xml filename =
779 let module XPP = XmlPushParser in
780 let result_map = ref MAL.empty in
781 let result_list = ref [] in
782 let cb = cb_factory result_map result_list in
783 let xml_parser = XPP.create_parser cb in
784 let xml_source = `Gzip_file filename in
785 (try XPP.parse xml_parser xml_source
786 with (XPP.Parse_error err) as exn -> raise exn);
787 (!result_map,UriManager.UriSet.empty,false), !result_list
790 (*****************************************************************************)
791 (** the main, only for testing **)
792 (*****************************************************************************)
796 type arc = Ge | Gt | Eq ;;
798 let randomize_actionlist n m =
799 let ge_percent = 0.7 in
800 let gt_percent = 0.15 in
802 let node1 = Random.int m in
803 let node2 = Random.int m in
805 let r = Random.float 1.0 in
806 if r < ge_percent then
808 else (if r < (ge_percent +. gt_percent) then
818 | n -> (random_step ())::(aux (n-1))
822 let print_action_list l =
823 let string_of_step (op,node1,node2) =
828 "," ^ (string_of_int node1) ^ "," ^ (string_of_int node2)
834 ";" ^ (string_of_step a) ^ (aux tl)
837 let l_body = (String.length body) - 1 in
838 prerr_endline ("[" ^ (String.sub body 1 l_body))
841 let d_print_endline = if debug then print_endline else ignore
842 let d_print_ugraph = if debug then print_ugraph else ignore
845 (if Array.length Sys.argv < 2 then
846 prerr_endline ("Usage " ^ Sys.argv.(0) ^ " max_edges max_nodes"));
848 let max_edges = int_of_string Sys.argv.(1) in
849 let max_nodes = int_of_string Sys.argv.(2) in
850 let action_listR = randomize_actionlist max_edges max_nodes in
852 let action_list = [Ge,1,4;Ge,2,6;Ge,1,1;Eq,6,4;Gt,6,3] in
853 let action_list = action_listR in
855 print_action_list action_list;
856 let prform_step ?(fast=false) (t,u,v) g =
868 let g' = f ~fast (u,None) (v,None) g in
869 (*print_ugraph g' ;*)
872 let fail = ref false in
873 let time1 = Unix.gettimeofday () in
874 let n_safe = ref 0 in
877 d_print_endline "SAFE";
880 n_safe := !n_safe + 1;
882 ) empty_ugraph action_list
884 UniverseInconsistency s -> fail:=true;empty_bag
886 let time2 = Unix.gettimeofday () in
887 d_print_ugraph g_safe;
888 let time3 = Unix.gettimeofday () in
889 let n_test = ref 0 in
892 d_print_endline "FAST";
895 n_test := !n_test + 1;
896 prform_step ~fast:true e g
897 ) empty_ugraph action_list
899 UniverseInconsistency s -> empty_bag
901 let time4 = Unix.gettimeofday () in
902 d_print_ugraph g_test;
903 if are_ugraph_eq g_safe g_test && !n_test = !n_safe then
908 if e = Eq then s+1 else s
914 if e = Gt then s+1 else s
917 let num_ge = max_edges - num_gt - num_eq in
918 let time_fast = (time4 -. time3) in
919 let time_safe = (time2 -. time1) in
920 let gap = ((time_safe -. time_fast) *. 100.0) /. time_safe in
921 let fail = if !fail then 1 else 0 in
924 "OK %d safe %1.4f fast %1.4f %% %1.2f #eq %d #gt %d #ge %d %d"
925 fail time_safe time_fast gap num_eq num_gt num_ge !n_safe);
930 print_endline "FAIL";
943 i, Some (UriManager.uri_of_string (UriManager.string_of_uri uri))
945 let recons_entry entry =
947 SOF.fold (fun univ set -> SOF.add (recons_univ univ) set) set SOF.empty
950 eq_closure = recons_set entry.eq_closure;
951 ge_closure = recons_set entry.ge_closure;
952 gt_closure = recons_set entry.gt_closure;
953 in_gegt_of = recons_set entry.in_gegt_of;
954 one_s_eq = recons_set entry.one_s_eq;
955 one_s_ge = recons_set entry.one_s_ge;
956 one_s_gt = recons_set entry.one_s_gt;
959 let recons_graph (graph,uriset,o) =
961 (fun universe entry map ->
962 MAL.add (recons_univ universe) (recons_entry entry) map)
965 UriManager.UriSet.fold
967 UriManager.UriSet.add
968 (UriManager.uri_of_string (UriManager.string_of_uri u)) acc)
969 uriset UriManager.UriSet.empty, o
974 raise (UniverseInconsistency (lazy "This universe graph has a hole"))
977 let assert_univs_have_uri (graph,_,_) univlist =
979 SOF.iter (fun u -> assert_univ u) s
982 assert_set e.eq_closure;
983 assert_set e.ge_closure;
984 assert_set e.gt_closure;
985 assert_set e.in_gegt_of;
986 assert_set e.one_s_eq;
987 assert_set e.one_s_ge;
988 assert_set e.one_s_gt;
990 MAL.iter (fun k v -> assert_univ k; assert_entry v)graph;
991 List.iter assert_univ univlist
995 | (id1, Some uri1),(id2, Some uri2) ->
996 id1 = id2 && UriManager.eq uri1 uri2
997 | (id1, None),(id2, None) -> id1 = id2
1000 let compare (id1, uri1) (id2, uri2) =
1001 let cmp = id1 - id2 in
1003 match uri1,uri2 with
1006 | None, Some _ -> ~-1
1007 | Some uri1, Some uri2 -> UriManager.compare uri1 uri2