X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fparamod.ml;h=105f5c86b11ad6ecb0a2f46d8d5f8b11f795684f;hb=51f49e56206b6b2388a8b30dc35e1011491966ee;hp=b32a5b1be43bdeb5b13444903d9573f88aadeff8;hpb=c091ca7a030a85a529543de98e45c54284028b63;p=helm.git diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml index b32a5b1be..105f5c86b 100644 --- a/helm/software/components/ng_paramodulation/paramod.ml +++ b/helm/software/components/ng_paramodulation/paramod.ml @@ -1,206 +1,254 @@ -let debug s = - () (* prerr_endline s *) -;; - -let nparamod rdb metasenv subst context t table = - let nb_iter = ref 200 in - let module C = struct - let metasenv = metasenv - let subst = subst - let context = context - end - in - let module B = NCicBlob.NCicBlob(C) in - let module Pp = Pp.Pp (B) in - let module FU = FoUnif.Founif(B) in - let module IDX = Index.Index(B) in - let module Sup = Superposition.Superposition(B) in - let module Utils = FoUtils.Utils(B) in +(* + ||M|| This file is part of HELM, an Hypertextual, Electronic + ||A|| Library of Mathematics, developed at the Computer Science + ||T|| Department, University of Bologna, Italy. + ||I|| + ||T|| HELM is free software; you can redistribute it and/or + ||A|| modify it under the terms of the GNU General Public License + \ / version 2 or (at your option) any later version. + \ / This software is distributed as is, NO WARRANTY. + V_______________________________________________________________ *) + +(* $Id: orderings.ml 9869 2009-06-11 22:52:38Z denes $ *) + +(* let debug s = prerr_endline s ;;*) + let debug _ = ();; - let module OrderedPassives = +let max_nb_iter = 999999999 ;; +let amount_of_time = 300.0 ;; + +module Paramod (B : Terms.Blob) = struct + exception Failure of string * B.t Terms.bag * int * int + 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 WeightOrderedPassives = + struct + 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 + let compare = Utils.compare_passive_clauses_age end - in - let module PassiveSet = Set.Make(OrderedPassives) - in - let add_passive_clause passives cl = - PassiveSet.add (Utils.mk_passive_clause cl) passives - in - (* TODO : fairness condition *) - let select passives = - if PassiveSet.is_empty passives then None - else let cl = PassiveSet.min_elt passives in - Some (snd cl,PassiveSet.remove cl passives) - in - let rec given_clause bag maxvar actives - passives g_actives g_passives = + + module WeightPassiveSet = Set.Make(WeightOrderedPassives) + module AgePassiveSet = Set.Make(AgeOrderedPassives) + + let add_passive_clause ?(no_weight=false) (passives_w,passives_a) cl = + let cl = if no_weight then (0,cl) + else Utils.mk_passive_clause cl in + WeightPassiveSet.add cl passives_w, AgePassiveSet.add cl 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 + (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 + end else begin + assert (not (AgePassiveSet.is_empty passives_a)); false + end + ;; + + let passive_set_cardinal (passives_w,_) = WeightPassiveSet.cardinal passives_w + + let passive_empty_set = + (WeightPassiveSet.empty,AgePassiveSet.empty) + ;; + + let pick_min_passive ~use_age (passives_w,passives_a) = + if use_age then AgePassiveSet.min_elt passives_a + else WeightPassiveSet.min_elt passives_w + ;; + + 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 + (bag, maxvar), c + ;; + + let mk_passive (bag,maxvar) = mk_clause bag maxvar;; + let mk_goal (bag,maxvar) = mk_clause bag maxvar;; + + (* 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 + (true,snd 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) + 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 backward_infer_step bag maxvar actives passives + g_actives g_passives g_current = + (* 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"; + bag, maxvar, actives, passives, g_current::g_actives, + (add_passive_clauses g_passives new_goals) + ;; + + let forward_infer_step bag maxvar actives passives g_actives + g_passives current = + (* forward step *) - decr nb_iter; if !nb_iter = 0 then - (*(prerr_endline "Bag :"; prerr_endline (Pp.pp_bag bag); + (* e = select P * + * e' = demod A e * + * A' = demod [e'] A * + * A'' = A' + e' * + * e'' = fresh e' * + * new = supright e'' A'' * + * new'= demod A'' new * + * P' = P + new' *) + debug "Forward infer step..."; + let bag, maxvar, actives, new_clauses = + Sup.infer_right bag maxvar current actives + in + debug "Demodulating goals with actives..."; + (* keep goals demodulated w.r.t. actives and check if solved *) + let bag, g_actives = + 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) + (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 + in + bag, maxvar, actives, + add_passive_clauses passives new_clauses, g_actives, + add_passive_clauses 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));*) - raise (Failure "Timeout !"); + (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 - - (* superposition left, simplifications on goals *) - debug "infer_left step..."; - let bag, maxvar, g_actives, g_passives = - match select g_passives with - | None -> bag, maxvar, g_actives, g_passives - | Some (g_current, g_passives) -> - debug ("Selected goal : " ^ Pp.pp_unit_clause g_current); - let bag, g_current = - Sup.simplify_goal maxvar (snd actives) bag g_current - in - let bag, maxvar, new_goals = - Sup.infer_left bag maxvar g_current actives - in - let new_goals = List.fold_left add_passive_clause - PassiveSet.empty new_goals - in - bag, maxvar, g_current::g_actives, - (PassiveSet.union new_goals g_passives) + let rec aux_select passives g_passives = + let backward,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 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 + in + + let bag,maxvar,actives,passives,g_actives,g_passives = + aux_select passives g_passives in debug (Printf.sprintf "Number of active goals : %d" (List.length g_actives)); debug (Printf.sprintf "Number of passive goals : %d" - (PassiveSet.cardinal g_passives)); - - (* forward step *) - - (* e = select P * - * e' = demod A e * - * A' = demod [e'] A * - * A'' = A' + e' * - * e'' = fresh e' * - * new = supright e'' A'' * - * new'= demod A'' new * - * P' = P + new' *) - debug "Forward infer step..."; - let bag, maxvar, actives, passives, g_passives = - let rec aux_simplify passives = - match select passives with - | None -> assert false - | Some (current, passives) -> - 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 with *) - | None -> aux_simplify passives - | Some x -> x,passives - in - let (current, bag, actives),passives = aux_simplify passives - in - debug ("Fact after simplification :" - ^ Pp.pp_unit_clause current); - let bag, maxvar, actives, new_clauses = - Sup.infer_right bag maxvar current actives - in - debug "Demodulating goals with actives..."; - (* keep goals demodulated w.r.t. actives and check if solved *) - let bag, g_actives = - List.fold_left - (fun (bag,acc) c -> - let bag, c = Sup.simplify_goal maxvar (snd actives) bag c in - 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 maxvar g - ([current],ctable) in - bag,m,ng@acc) - (bag,maxvar,[]) g_actives - in - let new_clauses = List.fold_left add_passive_clause - PassiveSet.empty new_clauses in - let new_goals = List.fold_left add_passive_clause - PassiveSet.empty new_goals in - bag, maxvar, actives, - PassiveSet.union new_clauses passives, - PassiveSet.union new_goals g_passives - in + (passive_set_cardinal g_passives)); debug (Printf.sprintf "Number of actives : %d" (List.length (fst actives))); debug (Printf.sprintf "Number of passives : %d" - (PassiveSet.cardinal passives)); - given_clause bag maxvar actives passives g_actives g_passives - in + (passive_set_cardinal passives)); + given_clause + bag maxvar nb_iter timeout actives passives g_actives g_passives + ;; - 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 - bag, maxvar, c - in - let bag, maxvar, goal = mk_clause Terms.M.empty 0 t in - let g_actives = [] in - let g_passives = PassiveSet.singleton (Utils.mk_passive_clause goal) in - let passives, bag, maxvar = - List.fold_left - (fun (cl, bag, maxvar) t -> - let bag, maxvar, c = mk_clause bag maxvar t in - (add_passive_clause cl c), bag, maxvar) - (PassiveSet.empty, bag, maxvar) table - in - let actives = [], IDX.DT.empty in - try given_clause bag maxvar actives passives g_actives g_passives - with - | Sup.Success (bag, _, (i,_,_,_)) -> - let l = - let module S = - HTopoSort.Make(struct type t=int let compare=Pervasives.compare end) - in - let module C : Set.S with type elt = int = - Set.Make(struct type t=int let compare=Pervasives.compare end) - in - let all id = + 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 g_actives = [] in + let actives = [], IDX.DT.empty in + try + given_clause + bag maxvar 0 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 - | (_,_,_,Terms.Exact _) -> accg, acce - | (_,_,_,Terms.Step (_,i1,i2,_,_,_)) -> - let accg, acce = - if ongoal then C.add i1 accg, acce - else accg, C.add i1 acce - in - let acce = C.add i2 acce in - traverse false (traverse ongoal (accg,acce) i1) i2 + | (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 in - traverse true (C.empty,C.empty) id - in - let esteps = - S.topological_sort (C.elements (snd (all i))) - (fun i -> C.elements (C.union (snd (all i)) (fst (all i)) )) - in - let gsteps = - S.topological_sort (C.elements (fst (all i))) - (fun i -> C.elements (fst (all i))) + let gsteps,esteps = traverse true ([],[]) i in + (List.rev esteps)@gsteps in - let gsteps = List.rev gsteps in - esteps@(i::gsteps) - in - debug "YES!"; - debug ("Meeting point : " ^ (string_of_int i)); - debug "Proof:"; - (*List.iter (fun x -> prerr_endline (string_of_int x); - prerr_endline (Pp.pp_unit_clause (Terms.M.find x bag))) l; *) - let proofterm = B.mk_proof bag i l in - prerr_endline (NCicPp.ppterm ~metasenv:C.metasenv - ~subst:C.subst ~context:C.context proofterm); - let metasenv, subst, proofterm, _prooftype = - NCicRefiner.typeof - (rdb#set_coerc_db NCicCoercion.empty_db) - C.metasenv C.subst C.context proofterm None - in - proofterm, metasenv, subst - | Failure _ -> prerr_endline "FAILURE"; assert false -;; + prerr_endline + (Printf.sprintf "Found proof, %fs" + (Unix.gettimeofday() -. timeout +. amount_of_time)); + 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; + [ bag, i, l ] + | Failure (msg,_bag,_maxvar,nb_iter) -> + prerr_endline msg; + prerr_endline (Printf.sprintf "FAILURE in %d iterations" nb_iter); + [] + ;; + +end