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

diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml
index cfa82da98..38553b305 100644
--- a/helm/software/components/binaries/matitaprover/matitaprover.ml
+++ b/helm/software/components/binaries/matitaprover/matitaprover.ml
@@ -13,6 +13,7 @@
 
 module OT = struct type t = string  let compare = Pervasives.compare end 
 module HC = Map.Make(OT)
+module TS = HTopoSort.Make(OT)
 
 type leaf = int * string
 
@@ -32,7 +33,7 @@ hash "_";;
 
 let problem_file = ref "no-file-given";;
 let tptppath = ref "/";;
-let seconds = ref 300;;
+let seconds = ref 0;;
 
 let fail_msg () =
       print_endline ("% SZS status Timeout for " ^ 
@@ -96,27 +97,51 @@ let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) ord
   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);
+    (times.Unix.tms_utime +. times.Unix.tms_stime) ^ "(Process Time) 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:";
   List.iter (fun x -> prerr_endline (" " ^ pp x)) passives;
   prerr_endline "Goal:";
   prerr_endline (" " ^ pp g_passives);
-  prerr_endline "Order:";
+(*  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 = 
+  (*let mk_clause bag maxvar (t,ty) =
+    let (proof,ty) = B.saturate t ty in
+    let c, maxvar = Utils.mk_unit_clause maxvar ty proof in
+    let bag, c = Terms.add_to_bag c bag in
+      (bag, maxvar), c
+  ;;
+  
+  let mk_passive (bag,maxvar) = mk_clause bag maxvar;;
+  let mk_goal (bag,maxvar) = mk_clause bag maxvar;;*)
+
+ let run ~useage ~printmsg 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
+   if printmsg then start_msg stats passives g_passives pp_unit_clause name;
    match
-     P.paramod 
+     P.paramod ~useage
       ~max_steps:max_int bag ~g_passives:[g_passives] ~passives 
    with
    | P.Error s -> report_error s; 3
@@ -129,13 +154,13 @@ 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
@@ -143,44 +168,74 @@ let worker order goal hypotheses =
    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 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
+   let oplist = List.map (fun ((_,x),_) -> x) data in
+   let deps op = 
+     (let _,(_,_,_,_,d) = List.find (fun ((_,op'),_) -> op = op') data 
+      in List.map snd d)
+   in 
+   let oplist = TS.topological_sort oplist deps in
+   List.sort 
+     (fun ((_,n1),(o1,a1,go1,p1,_)) ((_,n2),(o2,a2,go2,p2,_)) ->
+        if a1 = 0 && a2 = 0 then 0
+        else if a1 = 0 then -1
+        else if a2 = 0 then 1
+        else let res = Pervasives.compare (a1,o1,-go1,p1) (a2,o2,-go2,p2)
+             in if res = 0 then Pervasives.compare (HExtlib.list_index ((=) n1) oplist) (HExtlib.list_index ((=) n2) oplist)
+                else res)
+     data
+ ;;
+
+let worker order ~useage ~printmsg 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 ~useage ~printmsg 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 ~useage ~printmsg 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 ~useage ~printmsg 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
+  let print_endline s = () in (* prerr_endline (string_of_int p ^ ": " ^ s) in*)
     function
     | Unix.WEXITED 0 -> 
         print_endline ("status Unsatisfiable for " ^ 
@@ -211,13 +266,13 @@ let main () =
   in
   let _ =
     Sys.signal Sys.sigalrm 
-      (Sys.Signal_handle (fun _ -> fail_msg (); killall !childs; exit 1)) 
+      (Sys.Signal_handle (fun _ -> prerr_endline "Alarm!"; fail_msg (); killall !childs; exit 1)) 
   in
   Arg.parse [
    "--tptppath", Arg.String (fun p -> tptppath := p), 
      ("[path]  TPTP lib root, default " ^ !tptppath);
    "--timeout", Arg.Int (fun p -> seconds := p), 
-     ("[seconds]  timeout, default " ^ string_of_int !seconds);
+     ("[seconds]  timeout, default none");
    ] (fun x -> problem_file := x) "
 Matitaprover is the first order automatic prover that equips the 
 Matita interactive theorem prover (http://matita.cs.unibo.it).
@@ -234,18 +289,20 @@ in the current directory only.
 usage: matitaprover [options] problemfile";
   let hypotheses, goals = Tptp_cnf.parse ~tptppath:!tptppath !problem_file in
   let goal = match goals with [x] -> x | _ -> assert false in
-  let _ = Unix.alarm !seconds in
+  let _ = if !seconds > 0 then Unix.alarm !seconds else 0 in
   childs := 
     List.map 
       (fun f -> 
          let pid = Unix.fork () in 
          if pid = 0 then (exit (f ())) else pid)
     [ 
-      (fun () -> worker `NRKBO goal hypotheses)
+      (fun () -> worker `NRKBO ~useage:true ~printmsg:true goal hypotheses)
+    ;
+      (fun () -> worker `KBO ~useage:true ~printmsg:false goal hypotheses)
     ;
-      (fun () -> worker `KBO goal hypotheses)
+      (fun () -> worker `LPO ~useage:true ~printmsg:false goal hypotheses)
     ;
-      (fun () -> worker `LPO goal hypotheses)
+      (fun () -> worker `NRKBO ~useage:false ~printmsg:false goal hypotheses)
     ];
   let rec aux () =
     if List.length !childs = 0 then