better ranking interface

diff --git a/helm/software/components/cic/cicUniv.ml b/helm/software/components/cic/cicUniv.ml
index cf6b6eeffba96fb5796f7049c025a3635730829b..03088410f59e3804a3ad527581fb8baef8f19751 100644 (file)
--- a/helm/software/components/cic/cicUniv.ml
+++ b/helm/software/components/cic/cicUniv.ml
@@ -504,11 +504,12 @@ let do_rank (b,_,_) =
    in
    rank := fall keys;
    let res = ref [] in
+   let resk = ref [] in
    MAL.iter 
      (fun k v -> 
-        if not (List.mem v !res) then res := v::!res;
-       prerr_endline (string_of_universe k ^ " = " ^ string_of_int v)) !rank;
-   !res 
+       if not (List.mem v !res) then res := v::!res;
+       resk := k :: !resk) !rank;
+   !res, !resk
 ;;
 
 let get_rank u = 

diff --git a/helm/software/components/cic/cicUniv.mli b/helm/software/components/cic/cicUniv.mli
index b53e506914552d50f949cecd38364823d3a4b2b8..fa7f544c06036deebda609dfecba3446b5af760e 100644 (file)
--- a/helm/software/components/cic/cicUniv.mli
+++ b/helm/software/components/cic/cicUniv.mli
@@ -72,7 +72,7 @@ val add_ge:
 val add_gt: 
   universe -> universe -> universe_graph -> universe_graph
 
-val do_rank: universe_graph -> int list
+val do_rank: universe_graph -> int list * universe list
 val get_rank: universe -> int
 
 (*

diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml
index a51d97722b3e9a207a63c24b635853c89e4587cd..467d611474a0fe185e68786747ec78c59321233c 100644 (file)
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -142,7 +142,10 @@ let _ =
        try load_graph u with exn -> ())
     roots_alluris;
   prerr_endline "finished....";
-  let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in
+  let lll,uuu = List.sort compare (CicUniv.do_rank (get_graph ())) in
+  List.iter (fun k -> 
+    prerr_endline (string_of_universe k ^ " = " ^ string_of_int (Cicuniv.get_rank k))) uuu
+    in
   let _ = 
     try
     let rec aux = function