X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Fmatitaprover%2Fmatitaprover.ml;h=cfa82da98b6fa826c86113f631e9d6f07ee2bdee;hb=db7f6d6b32515c091e0f338dd4903624f35f27ac;hp=35d6fd79c4ea6468bbc498b8ac175a108992b266;hpb=b69275324ae2d436f2f4dbb70e0ddcbdf3886636;p=helm.git

diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml
index 35d6fd79c..cfa82da98 100644
--- a/helm/software/components/binaries/matitaprover/matitaprover.ml
+++ b/helm/software/components/binaries/matitaprover/matitaprover.ml
@@ -78,7 +78,9 @@ 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 " ^ 
@@ -89,10 +91,15 @@ let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) =
     print_endline (pp ~margin:max_int 
       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 passives g_passives (pp : 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:";
@@ -100,31 +107,21 @@ 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);
 ;;
 
 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
-   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 
+module Main(P : Paramod.Paramod with type t = leaf) = struct
+
+ let run bag g_passives 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
@@ -132,6 +129,56 @@ module Main(C:LeafComparer) = struct
  ;;
 end
 
+let worker order 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 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 symb_list = Stats.parse_symbols passives g_passives in
+     prerr_endline "Hypotheses statistics :";
+     List.iter (fun (t,occ,ar,g_occ) -> prerr_endline
+		  (Printf.sprintf "%s %d %d %d %s"
+		     (B.pp t) ar occ g_occ
+		     (String.concat ","
+			(List.map B.pp (Stats.dependencies t passives))));
+		  if List.exists
+		    (fun (u,occ2,ar2,g_occ2) -> not (B.eq t u) && occ = occ2
+			&& ar = ar2 && g_occ = g_occ2) symb_list
+		    then prerr_endline ((B.pp t) ^ " clashes")
+		 ) symb_list;
+   let module C = C in
+   let module B = MakeBlob(C) 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
+   | `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
+   | `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
+;;
+
 let print_status p = 
   let print_endline s = prerr_endline (string_of_int p ^ ": " ^ s) in
     function
@@ -175,7 +222,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)
@@ -193,13 +241,11 @@ 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