X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fparamod.ml;h=6c3c5118d62362eadc982fa63ecfbd9672b635cc;hb=94ec1bb0fcb0a82bfaaf965aed6993de3a9e658a;hp=105f5c86b11ad6ecb0a2f46d8d5f8b11f795684f;hpb=51f49e56206b6b2388a8b30dc35e1011491966ee;p=helm.git diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml index 105f5c86b..6c3c5118d 100644 --- a/helm/software/components/ng_paramodulation/paramod.ml +++ b/helm/software/components/ng_paramodulation/paramod.ml @@ -11,12 +11,11 @@ (* $Id: orderings.ml 9869 2009-06-11 22:52:38Z denes $ *) -(* let debug s = prerr_endline s ;;*) - let debug _ = ();; - -let max_nb_iter = 999999999 ;; -let amount_of_time = 300.0 ;; +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 type bag = B.t Terms.bag * int @@ -27,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) @@ -46,14 +45,32 @@ 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 passives_w,passives_a ;; - let add_passive_clauses (passives_w,passives_a) new_clauses = - let new_clauses_w,new_clauses_a = List.fold_left add_passive_clause + let add_passive_clauses ?(no_weight=false) + (passives_w,passives_a) new_clauses = + let new_clauses_w,new_clauses_a = + List.fold_left (add_passive_clause ~no_weight) + (WeightPassiveSet.empty,AgePassiveSet.empty) new_clauses + in + (WeightPassiveSet.union new_clauses_w passives_w, + 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, @@ -94,17 +111,17 @@ 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 + if (fst cl <= fst g_cl) 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 @@ -114,9 +131,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 @@ -138,116 +155,200 @@ 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 bag maxvar nb_iter timeout actives passives g_actives g_passives = - (* prerr_endline "Bag :"; prerr_endline (Pp.pp_bag bag); - prerr_endline "Active table :"; - (List.iter (fun x -> prerr_endline (Pp.pp_unit_clause x)) - (fst actives)); *) - let nb_iter = nb_iter + 1 in - if nb_iter = max_nb_iter then - raise (Failure ("No iterations left !",bag,maxvar,nb_iter)); - if Unix.gettimeofday () > timeout then - raise (Failure ("Timeout !",bag,maxvar,nb_iter)); - - let use_age = nb_iter mod 10 = 0 in - - let rec aux_select passives g_passives = - let backward,current,passives,g_passives = - select ~use_age passives g_passives + let rec given_clause ~noinfer + bag maxvar iterno 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)); + (* timeout check: gettimeofday called only if timeout set *) + 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 rec aux_select bag passives g_passives = + let backward,(weight,current),passives,g_passives = + select ~use_age:false passives g_passives in - if backward then - match Sup.simplify_goal maxvar (snd actives) bag g_actives current with - | None -> aux_select passives g_passives - | Some x -> let bag,g_current = x in - backward_infer_step bag maxvar actives passives - g_actives g_passives g_current - 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*) - | None -> aux_select passives g_passives - | Some x -> let (current, bag, actives) = x in - forward_infer_step bag maxvar actives passives - g_actives g_passives current + if backward then + 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 "Active table :"; + (List.iter (fun x -> prerr_endline (Pp.pp_unit_clause x)) + (fst actives)); *) let bag,maxvar,actives,passives,g_actives,g_passives = - aux_select passives 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 - bag maxvar nb_iter timeout actives passives g_actives g_passives + (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 ;; - let paramod (bag,maxvar) ~g_passives ~passives = - let timeout = Unix.gettimeofday () +. amount_of_time in - let passives = add_passive_clauses passive_empty_set passives in - let g_passives = add_passive_clauses passive_empty_set g_passives in + let paramod ~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 + let 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 - bag maxvar 0 timeout actives passives g_actives g_passives + given_clause ~noinfer:false + bag maxvar 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 _) -> - 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 + | (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,_,_,_)),_ -> + 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() -. timeout +. amount_of_time)); + (Unix.gettimeofday() -. initial_timestamp)); + (* prerr_endline "Proof:"; - List.iter (fun x -> prerr_endline (string_of_int x); - prerr_endline (Pp.pp_unit_clause (Terms.M.find x bag))) l; + List.iter (fun x -> + prerr_endline (Pp.pp_unit_clause (fst(Terms.M.find x bag)))) l; + *) [ bag, i, l ] - | Failure (msg,_bag,_maxvar,nb_iter) -> + | Failure (msg,_bag,_maxvar,iterno) -> prerr_endline msg; - prerr_endline (Printf.sprintf "FAILURE in %d iterations" nb_iter); + prerr_endline (Printf.sprintf "FAILURE in %d iterations" iterno); [] ;;