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 (*****************************************************************************)
41 (*****************************************************************************)
45 (*****************************************************************************)
46 (** Types and default values **)
47 (*****************************************************************************)
50 type universe = int * UriManager.uri option
54 | (id1, Some uri1),(id2, Some uri2) ->
55 id1 = id2 && UriManager.eq uri1 uri2
56 | (id1, None),(id2, None) -> id1 = id2
59 let compare (id1, uri1) (id2, uri2) =
60 let cmp = id1 - id2 in
66 | Some uri1, Some uri2 -> UriManager.compare uri1 uri2
70 module UniverseType = struct
75 module SOF = Set.Make(UniverseType)
87 module MAL = Map.Make(UniverseType)
89 type arc_type = GE | GT | EQ
91 type bag = entry MAL.t
102 let empty_bag = MAL.empty
104 let are_set_eq s1 s2 =
107 let are_entry_eq v1 v2 =
108 (are_set_eq v1.gt_closure v2.gt_closure ) &&
109 (are_set_eq v1.ge_closure v2.ge_closure ) &&
110 (are_set_eq v1.eq_closure v2.eq_closure ) &&
111 (*(are_set_eq v1.in_gegt_of v2.in_gegt_of ) &&*)
112 (are_set_eq v1.one_s_ge v2.one_s_ge ) &&
113 (are_set_eq v1.one_s_gt v2.one_s_gt ) &&
114 (are_set_eq v1.one_s_eq v2.one_s_eq )
116 let are_ugraph_eq = MAL.equal are_entry_eq
118 (*****************************************************************************)
119 (** Pretty printings **)
120 (*****************************************************************************)
122 let string_of_universe (i,u) =
125 "(" ^ ((string_of_int i) ^ "," ^ (UriManager.string_of_uri u) ^ ")")
126 | None -> "(" ^ (string_of_int i) ^ ",None)"
128 let string_of_universe_set l =
129 SOF.fold (fun x s -> s ^ (string_of_universe x) ^ " ") l ""
131 let string_of_node n =
133 "eq_c: " ^ (string_of_universe_set n.eq_closure) ^ "; " ^
134 "ge_c: " ^ (string_of_universe_set n.ge_closure) ^ "; " ^
135 "gt_c: " ^ (string_of_universe_set n.gt_closure) ^ "; " ^
136 "i_gegt: " ^ (string_of_universe_set n.in_gegt_of) ^ "}\n"
138 let string_of_arc (a,u,v) =
139 (string_of_universe u) ^ " " ^ a ^ " " ^ (string_of_universe v)
141 let string_of_mal m =
144 rc := !rc ^ sprintf "%s --> %s" (string_of_universe k)
145 (string_of_node v)) m;
148 let string_of_bag b =
151 (*****************************************************************************)
153 (*****************************************************************************)
160 Not_found -> empty_entry
162 (* FIXME: May be faster if we make it by hand *)
163 let merge_closures f nodes m =
164 SOF.fold (fun x i -> SOF.union (f (repr x m)) i ) nodes SOF.empty
167 (*****************************************************************************)
168 (** _fats implementation **)
169 (*****************************************************************************)
171 let rec closure_of_fast ru m =
172 let eq_c = closure_eq_fast ru m in
173 let ge_c = closure_ge_fast ru m in
174 let gt_c = closure_gt_fast ru m in
179 in_gegt_of = ru.in_gegt_of;
180 one_s_eq = ru.one_s_eq;
181 one_s_ge = ru.one_s_ge;
182 one_s_gt = ru.one_s_gt
185 and closure_eq_fast ru m =
187 let j = ru.one_s_eq in
188 let _Uj = merge_closures (fun x -> x.eq_closure) j m in
189 let one_step_eq = ru.one_s_eq in
190 (SOF.union one_step_eq _Uj)
194 and closure_ge_fast ru m =
196 let j = SOF.union ru.one_s_ge (SOF.union ru.one_s_gt ru.one_s_eq) in
197 let _Uj = merge_closures (fun x -> x.ge_closure) j m in
203 and closure_gt_fast ru m =
205 let j = ru.one_s_gt in
206 let k = ru.one_s_ge in
207 let l = ru.one_s_eq in
208 let _Uj = merge_closures (fun x -> x.ge_closure) j m in
209 let _Uk = merge_closures (fun x -> x.gt_closure) k m in
210 let _Ul = merge_closures (fun x -> x.gt_closure) l m in
211 let one_step_gt = ru.one_s_gt in
212 (SOF.union (SOF.union (SOF.union _Ul one_step_gt) _Uk) _Uj)
216 and print_rec_status u ru =
217 print_endline ("Aggiusto " ^ (string_of_universe u) ^
218 "e ottengo questa chiusura\n " ^ (string_of_node ru))
220 and adjust_fast_aux adjusted u m =
221 if SOF.mem u adjusted then m, adjusted else
222 let adjusted = SOF.add u adjusted in
224 let gt_c = closure_gt_fast ru m in
225 let ge_c = closure_ge_fast ru m in
226 let eq_c = closure_eq_fast ru m in
227 let changed_eq = not (are_set_eq eq_c ru.eq_closure) in
229 (not (are_set_eq gt_c ru.gt_closure)) ||
230 (not (are_set_eq ge_c ru.ge_closure))
232 if ((not changed_gegt) && (not changed_eq)) then
240 in_gegt_of = ru.in_gegt_of;
241 one_s_eq = ru.one_s_eq;
242 one_s_ge = ru.one_s_ge;
243 one_s_gt = ru.one_s_gt}
245 let m = MAL.add u ru' m in
247 SOF.fold (fun x (m,adjusted) -> MAL.add x ru' m, SOF.add x adjusted)
248 (SOF.diff ru'.eq_closure adjusted)
252 SOF.fold (fun x (m,adjusted) -> adjust_fast_aux adjusted x m)
253 (SOF.diff ru'.in_gegt_of adjusted)
260 and profiler_adj = HExtlib.profile "CicUniv.adjust_fast"
261 and adjust_fast x y = profiler_adj.HExtlib.profile (adjust_fast_aux x) y
263 and adjust_fast x y =
264 fst(adjust_fast_aux SOF.empty x y)
266 and add_gt_arc_fast u v m =
268 if SOF.mem v ru.gt_closure then m else
269 let ru' = {ru with one_s_gt = SOF.add v ru.one_s_gt} in
270 let m' = MAL.add u ru' m in
271 let rv = repr v m' in
272 let rv' = {rv with in_gegt_of = SOF.add u rv.in_gegt_of} in
273 let m'' = MAL.add v rv' m' in
276 and add_ge_arc_fast u v m =
278 if SOF.mem v ru.ge_closure then m else
279 let ru' = { ru with one_s_ge = SOF.add v ru.one_s_ge} in
280 let m' = MAL.add u ru' m in
281 let rv = repr v m' in
282 let rv' = {rv with in_gegt_of = SOF.add u rv.in_gegt_of} in
283 let m'' = MAL.add v rv' m' in
286 and add_eq_arc_fast u v m =
288 if SOF.mem v ru.eq_closure then m else
290 let ru' = {ru with one_s_eq = SOF.add v ru.one_s_eq} in
291 (*TESI: let ru' = {ru' with in_gegt_of = SOF.add v ru.in_gegt_of} in *)
292 let m' = MAL.add u ru' m in
293 let rv' = {rv with one_s_eq = SOF.add u rv.one_s_eq} in
294 (*TESI: let rv' = {rv' with in_gegt_of = SOF.add u rv.in_gegt_of} in *)
295 let m'' = MAL.add v rv' m' in
296 adjust_fast v (*(adjust_fast u*) m'' (* ) *)
301 (*****************************************************************************)
302 (** Other real code **)
303 (*****************************************************************************)
305 exception UniverseInconsistency of string Lazy.t
307 let error arc node1 closure_type node2 closure =
310 ("\n ===== Universe Inconsistency detected =====\n\n" ^
312 "\t" ^ (string_of_arc arc) ^ "\n" ^
314 "\t" ^ (string_of_universe node1) ^ "\n" ^
315 " is in the " ^ closure_type ^ " closure\n" ^
316 "\t{" ^ (string_of_universe_set closure) ^ "}\n" ^
318 "\t" ^ (string_of_universe node2) ^ "\n\n" ^
319 " ===== Universe Inconsistency detected =====\n") in
320 prerr_endline (Lazy.force s);
321 raise (UniverseInconsistency s)
324 let fill_empty_nodes_with_uri (g, already_contained,o) l uri =
325 let fill_empty_universe u =
327 (i,None) -> (i,Some uri)
328 | (i,Some _) as u -> u
330 let fill_empty_set s =
331 SOF.fold (fun e s -> SOF.add (fill_empty_universe e) s) s SOF.empty
333 let fill_empty_entry e = {
334 eq_closure = (fill_empty_set e.eq_closure) ;
335 ge_closure = (fill_empty_set e.ge_closure) ;
336 gt_closure = (fill_empty_set e.gt_closure) ;
337 in_gegt_of = (fill_empty_set e.in_gegt_of) ;
338 one_s_eq = (fill_empty_set e.one_s_eq) ;
339 one_s_ge = (fill_empty_set e.one_s_ge) ;
340 one_s_gt = (fill_empty_set e.one_s_gt) ;
345 MAL.add (fill_empty_universe k) (fill_empty_entry v) m) m MAL.empty
347 let l' = List.map fill_empty_universe l in
348 (m', already_contained,o),l'
351 (*****************************************************************************)
352 (** World interface **)
353 (*****************************************************************************)
355 type universe_graph = bag * UriManager.UriSet.t * bool
356 (* the graph , the cache of already merged ugraphs, oblivion? *)
358 let empty_ugraph = empty_bag, UriManager.UriSet.empty, false
359 let oblivion_ugraph = empty_bag, UriManager.UriSet.empty, true
361 let current_index_anon = ref (-1)
362 let current_index_named = ref (-1)
364 let restart_numbering () = current_index_named := (-1)
366 let fresh ?uri ?id () =
370 current_index_anon := !current_index_anon + 1;
372 | None, Some _ -> assert false
374 current_index_named := !current_index_named + 1;
376 | Some _, Some id -> id
380 let name_universe u uri =
382 | (i, None) -> (i, Some uri)
386 let print_ugraph (g, _, o) =
387 if o then prerr_endline "oblivion universe" else
388 prerr_endline (string_of_bag g)
391 (* should we check to no add twice the same?? *)
394 if SOF.mem v ru.gt_closure then
395 error ("EQ",u,v) v "GT" u ru.gt_closure
399 if SOF.mem u rv.gt_closure then
400 error ("EQ",u,v) u "GT" v rv.gt_closure
402 add_eq_arc_fast u v b
406 (* should we check to no add twice the same?? *)
409 if SOF.mem u rv.gt_closure then
410 error ("GE",u,v) u "GT" v rv.gt_closure
412 add_ge_arc_fast u v b
415 (* should we check to no add twice the same?? *)
417 FIXME : check the thesis... no need to check GT and EQ closure since the
418 GE is a superset of both
424 error ("GT",u,v) u "==" v SOF.empty
427 (*if SOF.mem u rv.gt_closure then
428 error ("GT",u,v) u "GT" v rv.gt_closure
431 if SOF.mem u rv.ge_closure then
432 error ("GT",u,v) u "GE" v rv.ge_closure
435 if SOF.mem u rv.eq_closure then
436 error ("GT",u,v) u "EQ" v rv.eq_closure
438 add_gt_arc_fast u v b
442 (*****************************************************************************)
443 (** START: Decomment this for performance comparisons **)
444 (*****************************************************************************)
446 let add_eq u v (b,already_contained,oblivion) =
447 if oblivion then (b,already_contained,oblivion) else
448 let rc = add_eq u v b in
449 rc,already_contained,false
451 let add_ge u v (b,already_contained,oblivion) =
452 if oblivion then (b,already_contained,oblivion) else
453 let rc = add_ge u v b in
454 rc,already_contained,false
456 let add_gt u v (b,already_contained,oblivion) =
457 if oblivion then (b,already_contained,oblivion) else
458 let rc = add_gt u v b in
459 rc,already_contained,false
462 let profiler_eq = HExtlib.profile "CicUniv.add_eq"
463 let profiler_ge = HExtlib.profile "CicUniv.add_ge"
464 let profiler_gt = HExtlib.profile "CicUniv.add_gt"
466 profiler_gt.HExtlib.profile (fun _ -> add_gt u v b) ()
468 profiler_ge.HExtlib.profile (fun _ -> add_ge u v b) ()
470 profiler_eq.HExtlib.profile (fun _ -> add_eq u v b) ()
474 let rank = ref MAL.empty;;
476 let do_rank (b,_,_) =
477 (* print_ugraph ugraph; *)
478 let keys = MAL.fold (fun k _ acc -> k::acc) b [] in
482 let rec aux k seen = function
484 | x::tl when SOF.mem x seen -> aux k seen tl
486 (* prerr_endline (String.make k '.' ^ string_of_universe x); *)
487 let seen = SOF.add x seen in
488 let t1, seen = aux (k+1) seen (SOF.elements (repr x b).eq_closure) in
489 let t3, seen = aux (k+1) seen (SOF.elements (repr x b).gt_closure) in
490 let t2, seen = aux (k+1) seen (SOF.elements (repr x b).ge_closure) in
491 let t4, seen = aux k seen tl in
493 (max (if SOF.is_empty (repr x b).gt_closure then 0 else t3+1) t4),
496 let rank, _ = aux 0 SOF.empty [u] in
504 if not (List.mem v !res) then res := v::!res;
505 prerr_endline (string_of_universe k ^ " = " ^ string_of_int v)) !rank;
512 (* if the universe is not in the graph it means there are
513 * no contraints on it! thus it can be freely set to Type0 *)
516 (*****************************************************************************)
517 (** END: Decomment this for performance comparisons **)
518 (*****************************************************************************)
520 (* TODO: uncomment l to gain a small speedup *)
521 let merge_ugraphs ~base_ugraph ~increment:(increment, uri_of_increment(*,l*)) =
522 let merge_brutal (u,a,_) v =
523 (* prerr_endline ("merging graph: "^UriManager.string_of_uri
524 * uri_of_increment); *)
531 let m = add_gt k u x in m)
532 (SOF.union v.one_s_gt v.gt_closure)
535 let m = add_ge k u x in m)
536 (SOF.union v.one_s_ge v.ge_closure)
539 let m = add_eq k u x in m)
540 (SOF.union v.one_s_eq v.eq_closure) x)))
543 let base, already_contained, oblivion = base_ugraph in
544 let inc,_,oblivion2 = increment in
547 else if oblivion2 then
549 else if MAL.is_empty base then
553 UriManager.UriSet.mem uri_of_increment already_contained
557 (fun (x,_,_) -> x) (merge_brutal increment base_ugraph),
559 List.fold_right UriManager.UriSet.add
560 (List.map (fun (_,x) -> HExtlib.unopt x) l)
562 (UriManager.UriSet.add uri_of_increment already_contained), false
564 (* profiling code; WARNING: the time spent during profiling can be
565 greater than the profiled time
566 let profiler_merge = HExtlib.profile "CicUniv.merge_ugraphs"
567 let merge_ugraphs ~base_ugraph ~increment =
568 profiler_merge.HExtlib.profile
569 (fun _ -> merge_ugraphs ~base_ugraph ~increment) ()
572 (*****************************************************************************)
573 (** Xml sesialization and parsing **)
574 (*****************************************************************************)
576 let xml_of_universe name u =
580 None,"id",(string_of_int i) ;
581 None,"uri",(UriManager.string_of_uri u)]
583 raise (Failure "we can serialize only universes with uri")
587 List.map (xml_of_universe "node") (SOF.elements s)
589 List.fold_left (fun s x -> [< s ; x >] ) [<>] l
591 let xml_of_entry_content e =
592 let stream_of_field f name =
593 let eq_c = xml_of_set f in
595 Xml.xml_nempty name [] eq_c
600 (stream_of_field e.eq_closure "eq_closure");
601 (stream_of_field e.gt_closure "gt_closure");
602 (stream_of_field e.ge_closure "ge_closure");
603 (stream_of_field e.in_gegt_of "in_gegt_of");
604 (stream_of_field e.one_s_eq "one_s_eq");
605 (stream_of_field e.one_s_gt "one_s_gt");
606 (stream_of_field e.one_s_ge "one_s_ge")
609 let xml_of_entry u e =
615 raise (Failure "we can serialize only universes (entry) with uri")
617 let ent = Xml.xml_nempty "entry" [
618 None,"id",(string_of_int i) ;
619 None,"uri",(UriManager.string_of_uri u'')] in
620 let content = xml_of_entry_content e in
623 let write_xml_of_ugraph filename (m,_,_) l =
626 Xml.xml_cdata "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
627 Xml.xml_nempty "ugraph" []
628 ([< (MAL.fold ( fun k v s -> [< s ; (xml_of_entry k v) >]) m [<>]) ;
630 (fun s u -> [< s ; xml_of_universe "owned_node" u >]) [<>] l) >])>]
632 Xml.pp ~gzip:true tokens (Some filename)
635 let univuri = function
636 | _,None -> UriManager.uri_of_string "cic:/fake.con"
640 let rec clean_ugraph m already_contained f =
642 MAL.fold (fun k v x -> if (f k) then MAL.add k v x else x ) m MAL.empty in
643 let m'' = MAL.fold (fun k v x ->
645 eq_closure = SOF.filter f v.eq_closure;
646 ge_closure = SOF.filter f v.ge_closure;
647 gt_closure = SOF.filter f v.gt_closure;
648 in_gegt_of = SOF.filter f v.in_gegt_of;
649 one_s_eq = SOF.filter f v.one_s_eq;
650 one_s_ge = SOF.filter f v.one_s_ge;
651 one_s_gt = SOF.filter f v.one_s_gt
653 MAL.add k v' x ) m' MAL.empty in
655 MAL.fold (fun k v l -> if v = empty_entry && not(f k) then
657 SOF.add k l end else l) m'' SOF.empty
659 if not (SOF.is_empty e_l) then
661 m'' already_contained (fun u -> (f u) && not (SOF.mem u e_l))
664 (fun k v x -> if v <> empty_entry then MAL.add k v x else x)
668 let clean_ugraph (m,a,o) l =
670 let l = List.fold_right SOF.add l SOF.empty in
671 let m, a = clean_ugraph m a (fun u -> SOF.mem u l) in
676 "ge_closure" -> (fun e u->{e with ge_closure=SOF.add u e.ge_closure})
677 | "gt_closure" -> (fun e u->{e with gt_closure=SOF.add u e.gt_closure})
678 | "eq_closure" -> (fun e u->{e with eq_closure=SOF.add u e.eq_closure})
679 | "in_gegt_of" -> (fun e u->{e with in_gegt_of =SOF.add u e.in_gegt_of})
680 | "one_s_ge" -> (fun e u->{e with one_s_ge =SOF.add u e.one_s_ge})
681 | "one_s_gt" -> (fun e u->{e with one_s_gt =SOF.add u e.one_s_gt})
682 | "one_s_eq" -> (fun e u->{e with one_s_eq =SOF.add u e.one_s_eq})
683 | s -> raise (Failure ("unsupported tag " ^ s))
687 let module XPP = XmlPushParser in
688 let current_node = ref (0,None) in
689 let current_entry = ref empty_entry in
690 let current_assign = ref (assigner_of "in_gegt_of") in
691 { XPP.default_callbacks with
692 XPP.end_element = Some( fun name ->
695 m := MAL.add !current_node !current_entry !m;
696 current_entry := empty_entry
699 XPP.start_element = Some( fun name attlist ->
703 let id = List.assoc "id" attlist in
704 let uri = List.assoc "uri" attlist in
705 current_node := (int_of_string id,Some (UriManager.uri_of_string uri))
707 let id = int_of_string (List.assoc "id" attlist) in
708 let uri = List.assoc "uri" attlist in
709 current_entry := !current_assign !current_entry
710 (id,Some (UriManager.uri_of_string uri))
712 let id = int_of_string (List.assoc "id" attlist) in
713 let uri = List.assoc "uri" attlist in
714 l := (id,Some (UriManager.uri_of_string uri)) :: !l
715 | s -> current_assign := assigner_of s
720 let ugraph_and_univlist_of_xml filename =
721 let module XPP = XmlPushParser in
722 let result_map = ref MAL.empty in
723 let result_list = ref [] in
724 let cb = cb_factory result_map result_list in
725 let xml_parser = XPP.create_parser cb in
726 let xml_source = `Gzip_file filename in
727 (try XPP.parse xml_parser xml_source
728 with (XPP.Parse_error err) as exn -> raise exn);
729 (!result_map,UriManager.UriSet.empty,false), !result_list
732 (*****************************************************************************)
733 (** the main, only for testing **)
734 (*****************************************************************************)
738 type arc = Ge | Gt | Eq ;;
740 let randomize_actionlist n m =
741 let ge_percent = 0.7 in
742 let gt_percent = 0.15 in
744 let node1 = Random.int m in
745 let node2 = Random.int m in
747 let r = Random.float 1.0 in
748 if r < ge_percent then
750 else (if r < (ge_percent +. gt_percent) then
760 | n -> (random_step ())::(aux (n-1))
764 let print_action_list l =
765 let string_of_step (op,node1,node2) =
770 "," ^ (string_of_int node1) ^ "," ^ (string_of_int node2)
776 ";" ^ (string_of_step a) ^ (aux tl)
779 let l_body = (String.length body) - 1 in
780 prerr_endline ("[" ^ (String.sub body 1 l_body))
783 let d_print_endline = if debug then print_endline else ignore
784 let d_print_ugraph = if debug then print_ugraph else ignore
787 (if Array.length Sys.argv < 2 then
788 prerr_endline ("Usage " ^ Sys.argv.(0) ^ " max_edges max_nodes"));
790 let max_edges = int_of_string Sys.argv.(1) in
791 let max_nodes = int_of_string Sys.argv.(2) in
792 let action_listR = randomize_actionlist max_edges max_nodes in
794 let action_list = [Ge,1,4;Ge,2,6;Ge,1,1;Eq,6,4;Gt,6,3] in
795 let action_list = action_listR in
797 print_action_list action_list;
798 let prform_step ?(fast=false) (t,u,v) g =
810 let g' = f ~fast (u,None) (v,None) g in
811 (*print_ugraph g' ;*)
814 let fail = ref false in
815 let time1 = Unix.gettimeofday () in
816 let n_safe = ref 0 in
819 d_print_endline "SAFE";
822 n_safe := !n_safe + 1;
824 ) empty_ugraph action_list
826 UniverseInconsistency s -> fail:=true;empty_bag
828 let time2 = Unix.gettimeofday () in
829 d_print_ugraph g_safe;
830 let time3 = Unix.gettimeofday () in
831 let n_test = ref 0 in
834 d_print_endline "FAST";
837 n_test := !n_test + 1;
838 prform_step ~fast:true e g
839 ) empty_ugraph action_list
841 UniverseInconsistency s -> empty_bag
843 let time4 = Unix.gettimeofday () in
844 d_print_ugraph g_test;
845 if are_ugraph_eq g_safe g_test && !n_test = !n_safe then
850 if e = Eq then s+1 else s
856 if e = Gt then s+1 else s
859 let num_ge = max_edges - num_gt - num_eq in
860 let time_fast = (time4 -. time3) in
861 let time_safe = (time2 -. time1) in
862 let gap = ((time_safe -. time_fast) *. 100.0) /. time_safe in
863 let fail = if !fail then 1 else 0 in
866 "OK %d safe %1.4f fast %1.4f %% %1.2f #eq %d #gt %d #ge %d %d"
867 fail time_safe time_fast gap num_eq num_gt num_ge !n_safe);
872 print_endline "FAIL";
885 i, Some (UriManager.uri_of_string (UriManager.string_of_uri uri))
887 let recons_entry entry =
889 SOF.fold (fun univ set -> SOF.add (recons_univ univ) set) set SOF.empty
892 eq_closure = recons_set entry.eq_closure;
893 ge_closure = recons_set entry.ge_closure;
894 gt_closure = recons_set entry.gt_closure;
895 in_gegt_of = recons_set entry.in_gegt_of;
896 one_s_eq = recons_set entry.one_s_eq;
897 one_s_ge = recons_set entry.one_s_ge;
898 one_s_gt = recons_set entry.one_s_gt;
901 let recons_graph (graph,uriset,o) =
903 (fun universe entry map ->
904 MAL.add (recons_univ universe) (recons_entry entry) map)
907 UriManager.UriSet.fold
909 UriManager.UriSet.add
910 (UriManager.uri_of_string (UriManager.string_of_uri u)) acc)
911 uriset UriManager.UriSet.empty, o
916 raise (UniverseInconsistency (lazy "This universe graph has a hole"))
919 let assert_univs_have_uri (graph,_,_) univlist =
921 SOF.iter (fun u -> assert_univ u) s
924 assert_set e.eq_closure;
925 assert_set e.ge_closure;
926 assert_set e.gt_closure;
927 assert_set e.in_gegt_of;
928 assert_set e.one_s_eq;
929 assert_set e.one_s_ge;
930 assert_set e.one_s_gt;
932 MAL.iter (fun k v -> assert_univ k; assert_entry v)graph;
933 List.iter assert_univ univlist
935 let is_anon = function (_,None) -> true | _ -> false