X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fparamod.ml;h=983dd53e84bd28e567904e2c51c74fe8209db52a;hb=772def9075b7b62870ebf4cecec6bcd37a549b1d;hp=43b57b6cd0b8da83f116eda2b4c6fc6a827782ec;hpb=a232a59672817abd3d6ec07db0b20d8b3fe5ad3b;p=helm.git diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml index 43b57b6cd..983dd53e8 100644 --- a/helm/software/components/ng_paramodulation/paramod.ml +++ b/helm/software/components/ng_paramodulation/paramod.ml @@ -14,16 +14,22 @@ let debug s = prerr_endline s ;; let debug _ = ();; -let monster = 500;; +let monster = 100;; module Paramod (B : Terms.Blob) = struct - exception Failure of string * B.t Terms.bag * int * int + type szsontology = + | Unsatisfiable of (B.t Terms.bag * int * int list) list + | GaveUp + | Error of string + | Timeout of int * B.t Terms.bag + exception Stop of szsontology type bag = B.t Terms.bag * int module Pp = Pp.Pp (B) module FU = FoUnif.Founif(B) module IDX = Index.Index(B) module Sup = Superposition.Superposition(B) module Utils = FoUtils.Utils(B) + module Order = Orderings.Orderings(B) module WeightOrderedPassives = struct type t = B.t Terms.passive_clause @@ -45,6 +51,12 @@ module Paramod (B : Terms.Blob) = struct WeightPassiveSet.add cl passives_w, AgePassiveSet.add cl passives_a ;; + let add_passive_goal ?(no_weight=false) (passives_w,passives_a) g = + let g = if no_weight then (0,g) + else Utils.mk_passive_goal g in + WeightPassiveSet.add g passives_w, AgePassiveSet.add g passives_a + ;; + let remove_passive_clause (passives_w,passives_a) cl = let passives_w = WeightPassiveSet.remove cl passives_w in let passives_a = AgePassiveSet.remove cl passives_a in @@ -61,6 +73,16 @@ module Paramod (B : Terms.Blob) = struct AgePassiveSet.union new_clauses_a passives_a) ;; + let add_passive_goals ?(no_weight=false) + (passives_w,passives_a) new_clauses = + let new_clauses_w,new_clauses_a = + List.fold_left (add_passive_goal ~no_weight) + (WeightPassiveSet.empty,AgePassiveSet.empty) new_clauses + in + (WeightPassiveSet.union new_clauses_w passives_w, + AgePassiveSet.union new_clauses_a passives_a) + ;; + let is_passive_set_empty (passives_w,passives_a) = if (WeightPassiveSet.is_empty passives_w) then begin assert (AgePassiveSet.is_empty passives_a); true @@ -83,7 +105,7 @@ module Paramod (B : Terms.Blob) = struct 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 = Utils.add_to_bag bag c in + let bag, c = Terms.add_to_bag c bag in (bag, maxvar), c ;; @@ -93,8 +115,10 @@ module Paramod (B : Terms.Blob) = struct (* TODO : global age over facts and goals (without comparing weights) *) let select ~use_age passives g_passives = if is_passive_set_empty passives then begin - assert (not (is_passive_set_empty g_passives)); - let g_cl = pick_min_passive ~use_age:use_age g_passives in + if (is_passive_set_empty g_passives) then + raise (Stop GaveUp) (* we say we are incomplete *) + else + let g_cl = pick_min_passive ~use_age:use_age g_passives in (true,g_cl,passives,remove_passive_clause g_passives g_cl) end else let cl = pick_min_passive ~use_age:use_age passives in @@ -102,26 +126,31 @@ module Paramod (B : Terms.Blob) = struct (false,cl,remove_passive_clause passives cl,g_passives) else let g_cl = pick_min_passive ~use_age:use_age g_passives in - if (fst cl <= fst g_cl) then + let (id1,_,_,_),(id2,_,_,_) = snd cl, snd g_cl in + let cmp = if use_age then id1 <= id2 + else fst cl <= fst g_cl + in + if cmp then (false,cl,remove_passive_clause passives cl,g_passives) else (true,g_cl,passives,remove_passive_clause g_passives g_cl) ;; let backward_infer_step bag maxvar actives passives - g_actives g_passives g_current = + g_actives g_passives g_current iterno = (* superposition left, simplifications on goals *) debug "infer_left step..."; let bag, maxvar, new_goals = Sup.infer_left bag maxvar g_current actives in debug "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_clauses g_passives new_goals) + (add_passive_goals g_passives new_goals) ;; let forward_infer_step bag maxvar actives passives g_actives - g_passives current = + g_passives current iterno = (* forward step *) (* e = select P * @@ -145,30 +174,29 @@ module Paramod (B : Terms.Blob) = struct Sup.simplify_goal ~no_demod:false maxvar (snd actives) bag acc c with | None -> bag, acc - | Some (bag,c) -> bag,c::acc) + | 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 bag, maxvar, new_goals = List.fold_left (fun (bag,m,acc) g -> - let bag, m, ng = Sup.infer_left bag m g - ([current],ctable) in + let bag, m, ng = Sup.infer_left bag m g ([current],ctable) in bag,m,ng@acc) (bag,maxvar,[]) g_actives in + let bag = Terms.replace_in_bag (current,false,iterno) bag in bag, maxvar, actives, add_passive_clauses passives new_clauses, g_actives, - add_passive_clauses g_passives new_goals + add_passive_goals g_passives new_goals ;; let rec given_clause ~noinfer - bag maxvar iterno max_steps timeout + bag maxvar iterno weight_picks max_steps timeout actives passives g_actives g_passives = let iterno = iterno + 1 in - if iterno = max_steps then - raise (Failure ("No iterations left !",bag,maxvar,iterno)); + if iterno = max_steps then raise (Stop (Timeout (maxvar,bag))); (* timeout check: gettimeofday called only if timeout set *) if timeout <> None && (match timeout with @@ -189,27 +217,36 @@ module Paramod (B : Terms.Blob) = struct (); x::acc,i+1) ([],0) g_actives); - raise (Failure (("Last chance: failed over " ^ - string_of_int maxgoals^ " goal " ^ - string_of_float (Unix.gettimeofday())),bag,maxvar,0)); + raise (Stop (Timeout (maxvar,bag))) 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 max_steps + given_clause ~noinfer:true bag maxvar iterno weight_picks max_steps (Some (Unix.gettimeofday () +. 20.)) actives passives g_actives g_passives; - raise (Failure ("Timeout !",bag,maxvar,iterno)) + raise (Stop (Timeout (maxvar,bag))); end - else raise (Failure ("Timeout !",bag,maxvar,iterno)); + else raise (Stop (Timeout (maxvar,bag))); - (* let use_age = iterno mod 10 = 0 in *) + let use_age = weight_picks = (iterno / 10 + 1) in + let weight_picks = if use_age then 0 else weight_picks+1 + in let rec aux_select bag passives g_passives = let backward,(weight,current),passives,g_passives = - select ~use_age:false passives g_passives + select ~use_age passives g_passives in + if use_age && weight > monster then + let bag,cl = Terms.add_to_bag current bag in + if backward then + aux_select bag passives (add_passive_clause g_passives cl) + else + aux_select bag (add_passive_clause passives cl) g_passives + 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 match if noinfer then if weight > monster then None else Some (bag,current) @@ -224,7 +261,7 @@ module Paramod (B : Terms.Blob) = struct bag,maxvar,actives,passives,g_actives,g_passives else backward_infer_step bag maxvar actives passives - g_actives g_passives g_current + g_actives g_passives g_current iterno else let _ = debug ("Selected fact : " ^ Pp.pp_unit_clause current) in (*let is_orphan = Sup.orphan_murder bag (fst actives) current in*) @@ -233,8 +270,8 @@ module Paramod (B : Terms.Blob) = struct if weight > monster then bag,None else bag, Some (current,actives) else if Sup.orphan_murder bag (fst actives) current then - let (id,_,_,_) = current in - let bag = Terms.M.add id (current,true) bag in + let _ = debug "Orphan murdered" in + let bag = Terms.replace_in_bag (current,true,iterno) bag in bag, None else Sup.keep_simplified current actives bag maxvar with @@ -260,7 +297,7 @@ module Paramod (B : Terms.Blob) = struct bag,maxvar,actives,passives,g_actives,g_passives else forward_infer_step bag maxvar actives passives - g_actives g_passives current + g_actives g_passives current iterno in @@ -283,7 +320,7 @@ module Paramod (B : Terms.Blob) = struct (Printf.sprintf "Number of passives : %d" (passive_set_cardinal passives)); given_clause ~noinfer - bag maxvar iterno max_steps timeout + bag maxvar iterno weight_picks max_steps timeout actives passives g_actives g_passives ;; @@ -293,22 +330,22 @@ module Paramod (B : Terms.Blob) = struct add_passive_clauses ~no_weight:true passive_empty_set passives in let g_passives = - add_passive_clauses ~no_weight:true passive_empty_set g_passives + add_passive_goals ~no_weight:true passive_empty_set g_passives in let g_actives = [] in let actives = [], IDX.DT.empty in try given_clause ~noinfer:false - bag maxvar 0 max_steps timeout actives passives g_actives g_passives + bag maxvar 0 0 max_steps timeout actives passives g_actives g_passives with | Sup.Success (bag, _, (i,_,_,_)) -> let l = let rec traverse ongoal (accg,acce) i = - match Terms.M.find i bag with - | (id,_,_,Terms.Exact _),_ -> + match Terms.get_from_bag i bag with + | (id,_,_,Terms.Exact _),_,_ -> if ongoal then [i],acce else if (List.mem i acce) then accg,acce else accg,acce@[i] - | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),_ -> + | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),_,_ -> if (not ongoal) && (List.mem i acce) then accg,acce else let accg,acce = @@ -319,9 +356,23 @@ module Paramod (B : Terms.Blob) = struct let gsteps,esteps = traverse true ([],[]) i in (List.rev esteps)@gsteps in -(* List.iter (fun id -> let (cl,d) = - Terms.M.find id bag in - if d then prerr_endline (Pp.pp_unit_clause cl)) l;*) + let max_w = List.fold_left (fun acc i -> + let (cl,_,_) = Terms.get_from_bag i bag in + max acc (Order.compute_unit_clause_weight cl)) 0 l in + prerr_endline "Statistics :"; + prerr_endline ("Max weight : " ^ (string_of_int max_w)); +(* List.iter (fun id -> let ((_,lit,_,proof as cl),d,it) = + Terms.get_from_bag id bag in + if d then + prerr_endline + (Printf.sprintf "Id : %d, selected at %d, weight %d,disc, by %s" + id it (Order.compute_unit_clause_weight cl) + (Pp.pp_proof_step proof)) + else + prerr_endline + (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)); @@ -330,11 +381,9 @@ module Paramod (B : Terms.Blob) = struct List.iter (fun x -> prerr_endline (Pp.pp_unit_clause (fst(Terms.M.find x bag)))) l; *) - [ bag, i, l ] - | Failure (msg,_bag,_maxvar,iterno) -> - prerr_endline msg; - prerr_endline (Printf.sprintf "FAILURE in %d iterations" iterno); - [] + Unsatisfiable [ bag, i, l ] + | Stop (Unsatisfiable _) -> Error "stop bug solution found!" + | Stop o -> o ;; end