X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fparamod.ml;h=0dbd6260aede1286d79976ea364a17e40d1ca5b1;hb=94c7a260ca00f045a3ec1b371f19de757f83003b;hp=983dd53e84bd28e567904e2c51c74fe8209db52a;hpb=772def9075b7b62870ebf4cecec6bcd37a549b1d;p=helm.git diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml index 983dd53e8..0dbd6260a 100644 --- a/helm/software/components/ng_paramodulation/paramod.ml +++ b/helm/software/components/ng_paramodulation/paramod.ml @@ -11,12 +11,35 @@ (* $Id: orderings.ml 9869 2009-06-11 22:52:38Z denes $ *) -let debug s = prerr_endline s ;; -let debug _ = ();; +let debug s = prerr_endline (Lazy.force s) ;; +let debug _ = ();; let monster = 100;; -module Paramod (B : Terms.Blob) = struct +module type Paramod = + sig + type t + type input + type szsontology = + | Unsatisfiable of (t Terms.bag * int * int list) list + | GaveUp + | Error of string + | Timeout of int * t Terms.bag + type bag = t Terms.bag * int + val mk_passive : bag -> input * input -> bag * t Terms.unit_clause + val mk_goal : bag -> input * input -> bag * t Terms.unit_clause + val paramod : + useage:bool -> + max_steps:int -> + ?timeout:float -> + bag -> + g_passives:t Terms.unit_clause list -> + passives:t Terms.unit_clause list -> szsontology + end + +module Paramod (B : Orderings.Blob) = struct + type t = B.t + type input = B.input type szsontology = | Unsatisfiable of (B.t Terms.bag * int * int list) list | GaveUp @@ -29,7 +52,7 @@ module Paramod (B : Terms.Blob) = struct module IDX = Index.Index(B) module Sup = Superposition.Superposition(B) module Utils = FoUtils.Utils(B) - module Order = Orderings.Orderings(B) + module Order = B module WeightOrderedPassives = struct type t = B.t Terms.passive_clause @@ -139,11 +162,11 @@ module Paramod (B : Terms.Blob) = struct let backward_infer_step bag maxvar actives passives g_actives g_passives g_current iterno = (* superposition left, simplifications on goals *) - debug "infer_left step..."; + debug (lazy "infer_left step..."); let bag, maxvar, new_goals = Sup.infer_left bag maxvar g_current actives in - debug "Performed infer_left step"; + debug (lazy "Performed infer_left step"); let bag = Terms.replace_in_bag (g_current,false,iterno) bag in bag, maxvar, actives, passives, g_current::g_actives, (add_passive_goals g_passives new_goals) @@ -161,11 +184,12 @@ module Paramod (B : Terms.Blob) = struct * new = supright e'' A'' * * new'= demod A'' new * * P' = P + new' *) - debug "Forward infer step..."; + debug (lazy "Forward infer step..."); + debug (lazy("Number of actives : " ^ (string_of_int (List.length (fst actives))))); let bag, maxvar, actives, new_clauses = Sup.infer_right bag maxvar current actives in - debug "Demodulating goals with actives..."; + debug (lazy "Demodulating goals with actives..."); (* keep goals demodulated w.r.t. actives and check if solved *) let bag, g_actives = List.fold_left @@ -177,7 +201,7 @@ module Paramod (B : Terms.Blob) = struct | Some (bag,c1) -> bag,if c==c1 then c::acc else c::c1::acc) (bag,[]) g_actives in - let ctable = IDX.index_unit_clause IDX.DT.empty current in + let ctable = IDX.index_unit_clause maxvar IDX.DT.empty current in let bag, maxvar, new_goals = List.fold_left (fun (bag,m,acc) g -> @@ -186,12 +210,13 @@ module Paramod (B : Terms.Blob) = struct (bag,maxvar,[]) g_actives in let bag = Terms.replace_in_bag (current,false,iterno) bag in + (* prerr_endline (Pp.pp_bag bag); *) bag, maxvar, actives, add_passive_clauses passives new_clauses, g_actives, add_passive_goals g_passives new_goals ;; - let rec given_clause ~noinfer + let rec given_clause ~useage ~noinfer bag maxvar iterno weight_picks max_steps timeout actives passives g_actives g_passives = @@ -205,8 +230,8 @@ module Paramod (B : Terms.Blob) = struct if noinfer then begin debug - ("Last chance: all is indexed " ^ string_of_float - (Unix.gettimeofday())); + (lazy("Last chance: all is indexed " ^ string_of_float + (Unix.gettimeofday()))); let maxgoals = 100 in ignore(List.fold_left (fun (acc,i) x -> @@ -221,15 +246,15 @@ module Paramod (B : Terms.Blob) = struct end else if false then (* activates last chance strategy *) begin - debug("Last chance: "^string_of_float (Unix.gettimeofday())); - given_clause ~noinfer:true bag maxvar iterno weight_picks max_steps + debug (lazy("Last chance: "^string_of_float (Unix.gettimeofday()))); + given_clause ~useage ~noinfer:true bag maxvar iterno weight_picks max_steps (Some (Unix.gettimeofday () +. 20.)) actives passives g_actives g_passives; raise (Stop (Timeout (maxvar,bag))); end else raise (Stop (Timeout (maxvar,bag))); - let use_age = weight_picks = (iterno / 10 + 1) in + let use_age = useage && (weight_picks = (iterno / 6 + 1)) in let weight_picks = if use_age then 0 else weight_picks+1 in @@ -246,7 +271,7 @@ module Paramod (B : Terms.Blob) = struct else let bag = Terms.replace_in_bag (current,false,iterno) bag in if backward then - let _ = debug ("Selected goal : " ^ Pp.pp_unit_clause current) in + let _ = debug (lazy("Selected goal : " ^ Pp.pp_unit_clause current)) in match if noinfer then if weight > monster then None else Some (bag,current) @@ -263,14 +288,14 @@ module Paramod (B : Terms.Blob) = struct backward_infer_step bag maxvar actives passives g_actives g_passives g_current iterno else - let _ = debug ("Selected fact : " ^ Pp.pp_unit_clause current) in + let _ = debug (lazy("Selected fact : " ^ Pp.pp_unit_clause current)) in (*let is_orphan = Sup.orphan_murder bag (fst actives) current in*) match if noinfer then if weight > monster then bag,None else bag, Some (current,actives) else if Sup.orphan_murder bag (fst actives) current then - let _ = debug "Orphan murdered" in + let _ = debug (lazy "Orphan murdered") in let bag = Terms.replace_in_bag (current,true,iterno) bag in bag, None else Sup.keep_simplified current actives bag maxvar @@ -292,7 +317,7 @@ module Paramod (B : Terms.Blob) = struct if noinfer then let actives = current::fst actives, - IDX.index_unit_clause (snd actives) current + IDX.index_unit_clause maxvar (snd actives) current in bag,maxvar,actives,passives,g_actives,g_passives else @@ -309,23 +334,23 @@ module Paramod (B : Terms.Blob) = struct aux_select bag passives g_passives in debug - (Printf.sprintf "Number of active goals : %d" - (List.length g_actives)); + (lazy(Printf.sprintf "Number of active goals : %d" + (List.length g_actives))); debug - (Printf.sprintf "Number of passive goals : %d" - (passive_set_cardinal g_passives)); + (lazy(Printf.sprintf "Number of passive goals : %d" + (passive_set_cardinal g_passives))); debug - (Printf.sprintf "Number of actives : %d" (List.length (fst actives))); + (lazy(Printf.sprintf "Number of actives : %d" (List.length (fst actives)))); debug - (Printf.sprintf "Number of passives : %d" - (passive_set_cardinal passives)); - given_clause ~noinfer + (lazy(Printf.sprintf "Number of passives : %d" + (passive_set_cardinal passives))); + given_clause ~useage ~noinfer bag maxvar iterno weight_picks max_steps timeout actives passives g_actives g_passives ;; - let paramod ~max_steps ?timeout (bag,maxvar) ~g_passives ~passives = - let initial_timestamp = Unix.gettimeofday () in + let paramod ~useage ~max_steps ?timeout (bag,maxvar) ~g_passives ~passives = + let _initial_timestamp = Unix.gettimeofday () in let passives = add_passive_clauses ~no_weight:true passive_empty_set passives in @@ -335,7 +360,7 @@ module Paramod (B : Terms.Blob) = struct let g_actives = [] in let actives = [], IDX.DT.empty in try - given_clause ~noinfer:false + given_clause ~useage ~noinfer:false bag maxvar 0 0 max_steps timeout actives passives g_actives g_passives with | Sup.Success (bag, _, (i,_,_,_)) -> @@ -373,9 +398,6 @@ module Paramod (B : Terms.Blob) = struct (Printf.sprintf "Id : %d, selected at %d, weight %d by %s" id it (Order.compute_unit_clause_weight cl) (Pp.pp_proof_step proof))) l;*) - prerr_endline - (Printf.sprintf "Found proof, %fs" - (Unix.gettimeofday() -. initial_timestamp)); (* prerr_endline "Proof:"; List.iter (fun x ->