let empty_ugraph = empty_bag, UriManager.UriSet.empty, false
let oblivion_ugraph = empty_bag, UriManager.UriSet.empty, true
+(* FG: default choice for a ugraph ??? *)
+let default_ugraph = oblivion_ugraph
let current_index_anon = ref (-1)
let current_index_named = ref (-1)
let rank = ref MAL.empty;;
let do_rank (b,_,_) =
-(* print_ugraph ugraph; *)
- let keys = MAL.fold (fun k _ acc -> k::acc) b [] in
+ let keys =
+ MAL.fold
+ (fun k v acc ->
+ SOF.union acc (SOF.union (SOF.singleton k)
+ (SOF.union v.eq_closure (SOF.union v.gt_closure v.ge_closure))))
+ b SOF.empty
+ in
+ let keys = SOF.elements keys in
let fall =
List.fold_left
(fun acc u ->
| [] -> 0, seen
| x::tl when SOF.mem x seen -> aux k seen tl
| x::tl ->
-(* prerr_endline (String.make k '.' ^ string_of_universe x); *)
let seen = SOF.add x seen in
let t1, seen = aux (k+1) seen (SOF.elements (repr x b).eq_closure) in
let t3, seen = aux (k+1) seen (SOF.elements (repr x b).gt_closure) in
MAL.empty
in
rank := fall keys;
+ let res = ref [] in
+ let resk = ref [] in
MAL.iter
(fun k v ->
- prerr_endline (string_of_universe k ^ " = " ^ string_of_int v)) !rank
+ if not (List.mem v !res) then res := v::!res;
+ resk := k :: !resk) !rank;
+ !res, !resk
;;
let get_rank u =
let univno = fst
let univuri = function
- | _,None -> assert false
+ | _,None -> UriManager.uri_of_string "cic:/fake.con"
| _,Some u -> u