X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Fmatitaprover%2Fmatitaprover.ml;h=12fb6b9aacdf51cfac6166a7acafdb560e38ff8a;hb=8a3045a162622e8a76ffdb267309faff496ee7ec;hp=1172bbb5d3438f752eb44c1fedcea6f903330892;hpb=661cf1186c81c15122e0644b679795d2e6b9d389;p=helm.git diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml index 1172bbb5d..12fb6b9aa 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 @@ -45,40 +46,44 @@ module type LeafComparer = end ;; +let rec embed m = function + | Ast.Variable name -> + (try m, List.assoc name m + with Not_found -> + let t = Terms.Var ~-(List.length m) in + (name,t)::m, t) + | Ast.Constant name -> m, Terms.Leaf (hash name) + | Ast.Function (name,args) -> + let m, args = + HExtlib.list_mapi_acc + (fun x _ m -> embed m x) m args + in + m, Terms.Node (Terms.Leaf (hash name):: args) +;; + +let saturate bo (nlit,plit) = + let vars,nlit = HExtlib.list_mapi_acc (fun x _ m -> embed m x) [] nlit in + let vars,plit = HExtlib.list_mapi_acc (fun x _ m -> embed m x) vars plit in + let _, bo = embed vars bo in + let bo = Terms.Node (bo :: List.map snd (List.rev vars)) in + bo, (nlit, plit) +;; + +let embed t = snd(embed [] t);; + + module MakeBlob(C:LeafComparer) : Terms.Blob - with type t = leaf and type input = Ast.term = struct + with type t = leaf = struct type t = leaf let eq a b = a == b let compare a b = C.cmp a b let eqP = hash "==" let pp (_,a) = a - type input = Ast.term - let rec embed m = function - | Ast.Variable name -> - (try m, List.assoc name m - with Not_found -> - let t = Terms.Var ~-(List.length m) in - (name,t)::m, t) - | Ast.Constant name -> m, Terms.Leaf (hash name) - | Ast.Function (name,args) -> - let m, args = - HExtlib.list_mapi_acc - (fun x _ m -> embed m x) m args - in - m, Terms.Node (Terms.Leaf (hash name):: args) - ;; - let saturate bo ty = - let vars, ty = embed [] ty in - let _, bo = embed vars bo in - let bo = Terms.Node (bo :: List.map snd (List.rev vars)) in - bo, ty - ;; - let embed t = snd(embed [] t);; - + end ;; -let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) ord = +let success_msg bag l (pp : ?margin:int -> leaf Terms.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 " ^ @@ -99,13 +104,14 @@ 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 stats passives g_passives (pp : ?margin:int -> leaf Terms.unit_clause -> string) oname = +let start_msg stats hypotheses (g_t,g_ty) + (pp : ?margin:int -> leaf Terms.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; + (*List.iter (fun x -> prerr_endline (" " ^ pp x)) passives;*) prerr_endline "Goal:"; - prerr_endline (" " ^ pp g_passives); + (*prerr_endline (" " ^ pp g_passives);*) prerr_endline "Order:"; prerr_endline (" " ^ oname); prerr_endline "Leaf order:"; @@ -119,22 +125,21 @@ let start_msg stats passives g_passives (pp : ?margin:int -> leaf Terms.unit_cla let report_error s = prerr_endline (string_of_int (Unix.getpid())^": "^s);; -module Main(P : Paramod.Paramod with type t = leaf) = struct +module Main(O : Orderings.Blob with type t = leaf) = struct + module P = Paramod.Paramod(O) + module Utils = FoUtils.Utils(O) - 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; + let run ~useage ~printmsg stats (g_t,g_ty) hypotheses pp_clause name = + let g_t,g_ty = saturate g_t g_ty in + let hypotheses = List.map (fun (t,(nlit,plit)) -> saturate t (nlit,plit)) hypotheses in + if printmsg then start_msg stats hypotheses (g_t,g_ty) pp_clause name; match - P.paramod - ~max_steps:max_int bag ~g_passives:[g_passives] ~passives + P.paramod ~useage + ~max_steps:max_int (g_t,g_ty) ~print_problem:printmsg hypotheses with | P.Error s -> report_error s; 3 | P.Unsatisfiable ((bag,_,l)::_) -> - success_msg bag l pp_unit_clause name; 0 + success_msg bag l pp_clause name; 0 | P.Unsatisfiable ([]) -> report_error "Unsatisfiable but no solution output"; 3 | P.GaveUp -> 2 @@ -142,7 +147,7 @@ module Main(P : Paramod.Paramod with type t = leaf) = struct ;; end - let compute_stats goal hypotheses = +(* let compute_stats goal hypotheses = let module C = struct type t = leaf let cmp (a,_) (b,_) = Pervasives.compare a b end in @@ -163,15 +168,29 @@ end name, (n_occ, arity, n_gocc, g_pos, Stats.dependencies name passives)) data in - List.sort Pervasives.compare data - ;; + 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 goal hypotheses = - let stats = compute_stats goal hypotheses in +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 raw = List.map snd stats in let rec pos x = function | ((y,_)::tl) when y = x -> 0 | _::tl -> 1 + pos x tl @@ -186,26 +205,27 @@ let worker order goal hypotheses = (pos a stats) (pos b stats)) else - (prerr_endline "CLASH, statistics insufficient"; - fun (a,_) (b,_) -> Pervasives.compare a b) + (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 + let stats = [] 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 + let module Main = Main(O) in + Main.run ~useage ~printmsg stats goal hypotheses Pp.pp_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 + let module Main = Main(O) in + Main.run ~useage ~printmsg stats goal hypotheses Pp.pp_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 module Main = Main(O) in + Main.run ~useage ~printmsg stats goal hypotheses Pp.pp_clause O.name ;; let print_status p = @@ -270,13 +290,13 @@ usage: matitaprover [options] problemfile"; 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 goal hypotheses) + (fun () -> worker `KBO ~useage:true ~printmsg:false 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