X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fparamod.ml;h=4a1b2f6c72ea32be73696c725e225e22c604caf0;hb=1eb00eff3c3a5f67c3a200a82098c97f4fbe0c5e;hp=51bd67286f0dc498886df771a0ae18cd2f91a8a8;hpb=2701c980f48541dd5e8317b5a5661b439ced8b29;p=helm.git diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml index 51bd67286..4a1b2f6c7 100644 --- a/helm/software/components/ng_paramodulation/paramod.ml +++ b/helm/software/components/ng_paramodulation/paramod.ml @@ -11,8 +11,10 @@ (* $Id: orderings.ml 9869 2009-06-11 22:52:38Z denes $ *) -(* let debug s = prerr_endline s ;;*) -let debug _ = ();; +let debug s = prerr_endline s ;; +(* let debug _ = ();;*) + +let monster = 500;; module Paramod (B : Terms.Blob) = struct exception Failure of string * B.t Terms.bag * int * int @@ -24,14 +26,14 @@ module Paramod (B : Terms.Blob) = struct module Utils = FoUtils.Utils(B) module WeightOrderedPassives = struct - type t = B.t Terms.passive_clause - let compare = Utils.compare_passive_clauses_weight + type t = B.t Terms.passive_clause + let compare = Utils.compare_passive_clauses_weight end module AgeOrderedPassives = struct - type t = B.t Terms.passive_clause - let compare = Utils.compare_passive_clauses_age + type t = B.t Terms.passive_clause + let compare = Utils.compare_passive_clauses_age end module WeightPassiveSet = Set.Make(WeightOrderedPassives) @@ -43,6 +45,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 @@ -59,6 +67,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 @@ -93,17 +111,21 @@ module Paramod (B : Terms.Blob) = struct 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 - (true,snd g_cl,passives,remove_passive_clause g_passives g_cl) + (true,g_cl,passives,remove_passive_clause g_passives g_cl) end else let cl = pick_min_passive ~use_age:use_age passives in if is_passive_set_empty g_passives then - (false,snd cl,remove_passive_clause passives cl,g_passives) + (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 - (false,snd cl,remove_passive_clause passives cl,g_passives) - else - (true,snd g_cl,passives,remove_passive_clause g_passives g_cl) + let g_cl = pick_min_passive ~use_age:use_age g_passives in + 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 @@ -113,9 +135,9 @@ module Paramod (B : Terms.Blob) = struct let bag, maxvar, new_goals = Sup.infer_left bag maxvar g_current actives in - debug "Performed infer_left step"; + debug "Performed infer_left step"; 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 @@ -137,28 +159,29 @@ module Paramod (B : Terms.Blob) = struct debug "Demodulating goals with actives..."; (* keep goals demodulated w.r.t. actives and check if solved *) let bag, g_actives = - List.fold_left + List.fold_left (fun (bag,acc) c -> - match Sup.simplify_goal maxvar (snd actives) bag acc c with - | None -> bag, acc - | Some (bag,c) -> bag,c::acc) + match + Sup.simplify_goal ~no_demod:false maxvar (snd actives) bag acc c + with + | None -> bag, acc + | Some (bag,c) -> bag,c::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 - bag,m,ng@acc) - (bag,maxvar,[]) g_actives + List.fold_left + (fun (bag,m,acc) g -> + let bag, m, ng = Sup.infer_left bag m g ([current],ctable) in + bag,m,ng@acc) + (bag,maxvar,[]) g_actives in - bag, maxvar, actives, + 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 + let rec given_clause ~noinfer bag maxvar iterno max_steps timeout actives passives g_actives g_passives = @@ -166,54 +189,127 @@ module Paramod (B : Terms.Blob) = struct if iterno = max_steps then raise (Failure ("No iterations left !",bag,maxvar,iterno)); (* timeout check: gettimeofday called only if timeout set *) - (match timeout with - | None -> () - | Some timeout -> - if Unix.gettimeofday () > timeout then - raise (Failure ("Timeout !",bag,maxvar,iterno))); + if timeout <> None && + (match timeout with + | None -> assert false + | Some timeout -> Unix.gettimeofday () > timeout) then + if noinfer then + begin + debug + ("Last chance: all is indexed " ^ string_of_float + (Unix.gettimeofday())); + let maxgoals = 100 in + ignore(List.fold_left + (fun (acc,i) x -> + if i < maxgoals then + ignore(Sup.simplify_goal ~no_demod:true + maxvar (snd actives) bag acc x) + else + (); + 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)); + 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 + (Some (Unix.gettimeofday () +. 20.)) + actives passives g_actives g_passives; + raise (Failure ("Timeout !",bag,maxvar,iterno)) + end + else raise (Failure ("Timeout !",bag,maxvar,iterno)); - let use_age = iterno mod 10 = 0 in + let use_age = iterno mod 5 = 0 in let rec aux_select bag passives g_passives = - let backward,current,passives,g_passives = - select ~use_age:false passives g_passives + let backward,(weight,current),passives,g_passives = + select ~use_age passives g_passives in - if backward then - match Sup.simplify_goal maxvar (snd actives) bag g_actives current with - | None -> aux_select bag passives g_passives - | Some (bag,g_current) -> - backward_infer_step bag maxvar actives passives - g_actives g_passives g_current + if use_age && weight > monster then + let bag,cl = Utils.add_to_bag bag current 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 - (* debug ("Selected fact : " ^ Pp.pp_unit_clause current); *) - match Sup.keep_simplified current actives bag maxvar with - (* match Sup.one_pass_simplification current actives bag maxvar with*) - | bag,None -> aux_select bag passives g_passives - | bag,Some (current,actives) -> - forward_infer_step bag maxvar actives passives - g_actives g_passives current + 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) + else + Sup.simplify_goal + ~no_demod:false maxvar (snd actives) bag g_actives current + with + | None -> aux_select bag passives g_passives + | Some (bag,g_current) -> + if noinfer then + let g_actives = g_current :: g_actives in + bag,maxvar,actives,passives,g_actives,g_passives + else + backward_infer_step bag maxvar actives passives + g_actives g_passives g_current + else + let _ = debug ("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 (id,_,_,_) = current in + let bag = Terms.M.add id (current,true) bag in + bag, None + else Sup.keep_simplified current actives bag maxvar + with + (*match Sup.one_pass_simplification current actives bag maxvar with*) + | bag,None -> aux_select bag passives g_passives + | bag,Some (current,actives) -> +(* if is_orphan then prerr_endline + ("WRONG discarded: " ^ (Pp.pp_unit_clause current)); + List.iter (fun x -> + prerr_endline (Pp.pp_unit_clause x)) + (fst actives);*) + +(* List.iter (fun (id,_,_,_) -> let (cl,d) = + Terms.M.find id bag in + if d then prerr_endline + ("WRONG discarded: " ^ (Pp.pp_unit_clause cl))) + (current::fst actives);*) + if noinfer then + let actives = + current::fst actives, + IDX.index_unit_clause (snd actives) current + in + bag,maxvar,actives,passives,g_actives,g_passives + else + forward_infer_step bag maxvar actives passives + g_actives g_passives current in - (* prerr_endline "Bag :"; prerr_endline (Pp.pp_bag bag); - prerr_endline "Active table :"; + + (*prerr_endline "Active table :"; (List.iter (fun x -> prerr_endline (Pp.pp_unit_clause x)) - (fst actives)); *) + (fst actives)); *) let bag,maxvar,actives,passives,g_actives,g_passives = aux_select bag passives g_passives in debug - (Printf.sprintf "Number of active goals : %d" - (List.length g_actives)); + (Printf.sprintf "Number of active goals : %d" + (List.length g_actives)); debug - (Printf.sprintf "Number of passive goals : %d" - (passive_set_cardinal g_passives)); + (Printf.sprintf "Number of passive goals : %d" + (passive_set_cardinal g_passives)); debug - (Printf.sprintf "Number of actives : %d" (List.length (fst actives))); + (Printf.sprintf "Number of actives : %d" (List.length (fst actives))); debug - (Printf.sprintf "Number of passives : %d" - (passive_set_cardinal passives)); - given_clause + (Printf.sprintf "Number of passives : %d" + (passive_set_cardinal passives)); + given_clause ~noinfer bag maxvar iterno max_steps timeout actives passives g_actives g_passives ;; @@ -224,12 +320,12 @@ 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 + given_clause ~noinfer:false bag maxvar 0 max_steps timeout actives passives g_actives g_passives with | Sup.Success (bag, _, (i,_,_,_)) -> @@ -237,19 +333,22 @@ module Paramod (B : Terms.Blob) = struct let rec traverse ongoal (accg,acce) i = match Terms.M.find i bag with | (id,_,_,Terms.Exact _),_ -> - if ongoal then [i],acce else - if (List.mem i acce) then accg,acce else accg,acce@[i] + if ongoal then [i],acce else + if (List.mem i acce) then accg,acce else accg,acce@[i] | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),_ -> - if (not ongoal) && (List.mem i acce) then accg,acce - else + if (not ongoal) && (List.mem i acce) then accg,acce + else let accg,acce = - traverse false (traverse ongoal (accg,acce) i1) i2 - in - if ongoal then i::accg,acce else accg,i::acce + traverse false (traverse ongoal (accg,acce) i1) i2 + in + if ongoal then i::accg,acce else accg,i::acce in 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;*) prerr_endline (Printf.sprintf "Found proof, %fs" (Unix.gettimeofday() -. initial_timestamp));