X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Fmatitaprover%2Fmatitaprover.ml;h=b1a71034f854f9eb8ebb263ab121a7859e73b47b;hb=18beb4339a683c5b6243673b91da878a208b36e3;hp=776d0adbb6f252b5708e03957edac11cdc091c6e;hpb=c87f56790dcb2825dcc2178eaea34f05a4649557;p=helm.git

diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml
index 776d0adbb..b1a71034f 100644
--- a/helm/software/components/binaries/matitaprover/matitaprover.ml
+++ b/helm/software/components/binaries/matitaprover/matitaprover.ml
@@ -78,20 +78,28 @@ module MakeBlob(C:LeafComparer) : Terms.Blob
   end
 ;;
 
-let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) =
+let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) ord =
+  (* TODO: do some sort of poor man lock (open + OEXCL) so that
+   *       just one thread at a time prints the proof *)
   print_endline ("% SZS status Unsatisfiable for " ^ 
     Filename.basename !problem_file);
   print_endline ("% SZS output start CNFRefutation for " ^ 
     Filename.basename !problem_file);
   flush stdout;
   List.iter (fun x ->
+    let (cl,_,_) = Terms.get_from_bag x bag in
     print_endline (pp ~margin:max_int 
-      (fst(Terms.get_from_bag x bag)))) l;
+      cl)) l;
   print_endline ("% SZS output end CNFRefutation for " ^ 
-    Filename.basename !problem_file)
+    Filename.basename !problem_file);
+  let prefix = string_of_int (Unix.getpid ()) in
+  let prerr_endline s = prerr_endline (prefix ^ ": " ^ s) in
+  let times = Unix.times () in
+  prerr_endline ("solved " ^ !problem_file ^ " in " ^ string_of_float
+    (times.Unix.tms_utime +. times.Unix.tms_stime) ^ " using " ^ ord);
 ;;
 
-let start_msg passives g_passives (pp : leaf Terms.unit_clause -> string) =
+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:";
@@ -99,31 +107,34 @@ let start_msg passives g_passives (pp : leaf Terms.unit_clause -> string) =
   prerr_endline "Goal:";
   prerr_endline (" " ^ pp g_passives);
   prerr_endline "Order:";
-  prerr_endline " ...fixme...";
-  prerr_endline "Strategy:";
-  prerr_endline " ...fixme...";
+  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(C:LeafComparer) = struct
- let main goal hypotheses =
-   let module B = MakeBlob(C) in
-   let module Pp = Pp.Pp(B) in
-   let module P = Paramod.Paramod(B) in
+module Main(P : Paramod.Paramod with type t = leaf) = struct
+
+ 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 passives g_passives Pp.pp_unit_clause;
-   match 
+   start_msg stats passives g_passives pp_unit_clause name;
+   match
      P.paramod 
       ~max_steps:max_int bag ~g_passives:[g_passives] ~passives 
    with
    | P.Error s -> report_error s; 3
    | P.Unsatisfiable ((bag,_,l)::_) -> 
-         success_msg bag l Pp.pp_unit_clause; 0
+         success_msg bag l pp_unit_clause name; 0
    | P.Unsatisfiable ([]) -> 
          report_error "Unsatisfiable but no solution output"; 3
    | P.GaveUp -> 2
@@ -131,6 +142,72 @@ module Main(C:LeafComparer) = struct
  ;;
 end
 
+ 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
+   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
+   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 Pervasives.compare 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
+       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
+       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
+       Main.run stats goal hypotheses Pp.pp_unit_clause O.name
+;;
+
 let print_status p = 
   let print_endline s = prerr_endline (string_of_int p ^ ": " ^ s) in
     function
@@ -174,7 +251,8 @@ let main () =
 Matitaprover is the first order automatic prover that equips the 
 Matita interactive theorem prover (http://matita.cs.unibo.it).
 
-Developed by A.Asperti, M.Denes and E.Tassi, released under GPL-2.1
+Developed by A.Asperti, M.Denes and E.Tassi, released under GPL version 2
+or at your option any later version.
 
 If --tptppath is given, instead of the problem file you can just give the 
 problem name with the .p suffix (e.g. BOO001-1.p)
@@ -192,13 +270,13 @@ usage: matitaprover [options] problemfile";
          let pid = Unix.fork () in 
          if pid = 0 then (exit (f ())) else pid)
     [ 
-      (fun () ->     
-        let module M = Main(struct let cmp (a,_) (b,_) = compare a b end) in
-        M.main goal hypotheses)
+      (fun () -> worker `NRKBO goal hypotheses)
+    ;
+(*
+      (fun () -> worker `KBO goal hypotheses)
     ;
-      (fun () ->     
-        let module M = Main(struct let cmp (a,_) (b,_) = compare b a end) in
-        M.main goal hypotheses)
+      (fun () -> worker `LPO goal hypotheses)
+*)
     ];
   let rec aux () =
     if List.length !childs = 0 then