...

[helm.git] / helm / software / components / binaries / matitaprover / matitaprover.ml

diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml
index f516552bc795b19a3ec250edd96c37519a1f3cdf..627f2604b6c2ea0c36cfc3187b4598c4d42ab999 100644 (file)
--- a/helm/software/components/binaries/matitaprover/matitaprover.ml
+++ b/helm/software/components/binaries/matitaprover/matitaprover.ml
@@ -99,7 +99,7 @@ let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) ord
     (times.Unix.tms_utime +. times.Unix.tms_stime) ^ " using " ^ ord);
 ;;
 
-let start_msg passives g_passives (pp : leaf Terms.unit_clause -> string) oname =
+let start_msg stats passives g_passives (pp : ?margin:int -> leaf Terms.unit_clause -> string) oname =
   let prefix = string_of_int (Unix.getpid ()) in
   let prerr_endline s = prerr_endline (prefix ^ ": " ^ s) in
   prerr_endline "Facts:";
@@ -108,14 +108,27 @@ let start_msg passives g_passives (pp : leaf Terms.unit_clause -> string) oname
   prerr_endline (" " ^ pp g_passives);
   prerr_endline "Order:";
   prerr_endline ("  " ^ oname);
+  prerr_endline "Leaf order:";
+  List.iter (fun ((_,name), (a,b,c,gp,l)) ->
+     prerr_endline (" " ^name ^ " " ^ string_of_int a ^ " " ^
+       string_of_int b ^ " " ^
+       string_of_int c ^ " " ^
+       String.concat "," (List.map string_of_int gp) ^ 
+       String.concat "," (List.map snd l))) stats;
 ;;
 
 let report_error s =  prerr_endline (string_of_int (Unix.getpid())^": "^s);;
 
 module Main(P : Paramod.Paramod with type t = leaf) = struct
-   
- let run bag g_passives passives pp_unit_clause name = 
-   match 
+
+ let run stats goal hypotheses pp_unit_clause name = 
+   let bag = Terms.empty_bag, 0 in
+   let bag, g_passives = P.mk_goal bag goal in
+   let bag, passives = 
+     HExtlib.list_mapi_acc (fun x _ b -> P.mk_passive b x) bag hypotheses 
+   in
+   start_msg stats passives g_passives pp_unit_clause name;
+   match
      P.paramod 
       ~max_steps:max_int bag ~g_passives:[g_passives] ~passives 
    with
@@ -129,41 +142,74 @@ module Main(P : Paramod.Paramod with type t = leaf) = struct
  ;;
 end
 
-let worker order goal hypotheses =
+ let compute_stats goal hypotheses =
    let module C = 
      struct type t = leaf let cmp (a,_) (b,_) = Pervasives.compare a b end 
    in
    let module B = MakeBlob(C) in
    let module Pp = Pp.Pp(B) in
-   let module O = Orderings.NRKBO(B) in (* just for processing the clauses *)
+   let module O = Orderings.NRKBO(B) in
    let module P = Paramod.Paramod(O) in
+   let module Stats = Stats.Stats(O) in
    let bag = Terms.empty_bag, 0 in
    let bag, g_passives = P.mk_goal bag goal in
    let bag, passives = 
      HExtlib.list_mapi_acc (fun x _ b -> P.mk_passive b x) bag hypotheses 
    in
-   (* TODO: do stats analysys there and generate a new
-    *       C and then B 
-    * TODO: rebuild clauses, since the ordering has to
-    *       change after the stats are computed *)
-   let module C = C in
+   let data = Stats.parse_symbols passives g_passives in
+   let data = 
+     List.map
+       (fun (name, n_occ, arity, n_gocc, g_pos) ->
+          name, (n_occ, arity, n_gocc, g_pos, Stats.dependencies name passives))
+       data
+   in
+   List.sort 
+     (fun (n1,(o1,a1,go1,p1,d1)) (n2,(o2,a2,go2,p2,d2)) -> 
+        Pervasives.compare 
+          (a1,o1,go1,p1,d1) (a2,o2,go2,p2,d2))
+     data
+ ;;
+
+let worker order goal hypotheses =
+   let stats = compute_stats goal hypotheses in
+   let module C = 
+     struct
+      let cmp =
+        let raw = List.map snd stats in
+        let rec pos x = function
+          | ((y,_)::tl) when y = x -> 0
+          | _::tl -> 1 + pos x tl
+          | [] -> assert false
+        in
+        if List.length raw = 
+           List.length (HExtlib.list_uniq raw)
+        then
+          (prerr_endline "NO CLASH, using fixed ground order";
+           fun a b ->
+            Pervasives.compare 
+              (pos a stats)
+              (pos b stats))
+        else
+          (prerr_endline "CLASH, statistics insufficient";
+            fun (a,_) (b,_) -> Pervasives.compare a b)
+      ;;
+     end
+   in
    let module B = MakeBlob(C) in
+   let module Pp = Pp.Pp(B) in
    match order with
    | `NRKBO ->
        let module O = Orderings.NRKBO(B) in
        let module Main = Main(Paramod.Paramod(O)) in
-       start_msg passives g_passives Pp.pp_unit_clause O.name;
-       Main.run bag g_passives passives Pp.pp_unit_clause O.name
+       Main.run stats goal hypotheses Pp.pp_unit_clause O.name
    | `KBO ->
        let module O = Orderings.KBO(B) in
        let module Main = Main(Paramod.Paramod(O)) in
-       start_msg passives g_passives Pp.pp_unit_clause O.name;
-       Main.run bag g_passives passives Pp.pp_unit_clause O.name
+       Main.run stats goal hypotheses Pp.pp_unit_clause O.name
    | `LPO ->
        let module O = Orderings.LPO(B) in
        let module Main = Main(Paramod.Paramod(O)) in
-       start_msg passives g_passives Pp.pp_unit_clause O.name;
-       Main.run bag g_passives passives Pp.pp_unit_clause O.name
+       Main.run stats goal hypotheses Pp.pp_unit_clause O.name
 ;;
 
 let print_status p =