X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fparamod.ml;h=36adca45413def9a1fa5214571a84c92edcbfbca;hb=8de1a75899a83dd31e856804bd448c1bd87d9ab3;hp=1bd9bcf4f1e710273948013f02f9d6ce659e1d7b;hpb=637114791874df9ebc4e0f0936513c71886a913f;p=helm.git diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml index 1bd9bcf4f..36adca454 100644 --- a/helm/software/components/ng_paramodulation/paramod.ml +++ b/helm/software/components/ng_paramodulation/paramod.ml @@ -1,4 +1,10 @@ -let nparamod metasenv subst context t table = +let debug s = () +(* prerr_endline s *) +;; + +let nparamod rdb metasenv subst context t table = + let nb_iter = ref 100 in + prerr_endline "========================================"; let module C = struct let metasenv = metasenv let subst = subst @@ -11,43 +17,168 @@ let nparamod metasenv subst context t table = let module IDX = Index.Index(B) in let module Sup = Superposition.Superposition(B) in let module Utils = FoUtils.Utils(B) in -(* - let test_unification _ = function - | Terms.Node [_; _; lhs; rhs] -> - prerr_endline "Unification test :"; - prerr_endline (Pp.pp_foterm lhs); - prerr_endline (Pp.pp_foterm rhs); - FU.unification [] [] lhs rhs - | _ -> assert false - in - let subst,vars = test_unification [] res in - prerr_endline "Result :"; - prerr_endline (Pp.pp_foterm res); - prerr_endline "Substitution :"; - prerr_endline (Pp.pp_substitution subst) -*) - let mk_clause maxvar t = - let ty = B.embed t in - let proof = B.embed (NCic.Rel ~-1) in - Utils.mk_unit_clause maxvar ty proof - in - let clause, maxvar = mk_clause 0 t in - prerr_endline "Input clause :"; - prerr_endline (Pp.pp_unit_clause clause); - let bag = Utils.empty_bag in - let active_clauses, maxvar = - List.fold_left - (fun (cl,maxvar) t -> - let c, m = mk_clause maxvar t in - c::cl, m) - ([],maxvar) table + + let module OrderedPassives = + struct + type t = B.t Terms.passive_clause + + let compare = Utils.compare_passive_clauses + end + in + let module PassiveSet = Set.Make(OrderedPassives) + in + let add_passive_clause passives cl = + PassiveSet.add (Utils.mk_passive_clause cl) passives in - let table = - List.fold_left IDX.index_unit_clause IDX.DT.empty active_clauses + (* 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 bag, maxvar, newclauses = - Sup.superposition_right_with_table bag maxvar clause table + let rec given_clause bag maxvar actives + passives g_actives g_passives = + + decr nb_iter; if !nb_iter = 0 then raise (Failure "Timeout !"); + + (* keep goals demodulated w.r.t. actives and check if solved *) + (* we may move this at the end of infer_right *) + 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 + + (* 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) + in + prerr_endline + (Printf.sprintf "Number of active goals : %d" + (List.length g_actives)); + prerr_endline + (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 with + | None -> aux_simplify passives + | Some x -> x + in + let (current, bag, actives) = 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 + 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 + prerr_endline + (Printf.sprintf "Number of actives : %d" (List.length (fst actives))); + prerr_endline + (Printf.sprintf "Number of passives : %d" + (PassiveSet.cardinal passives)); + given_clause bag maxvar actives passives g_actives g_passives + in + + 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 - prerr_endline "Output clauses :"; - List.iter (fun c -> prerr_endline (Pp.pp_unit_clause c)) newclauses; + 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 rec traverse acc i = + match Terms.M.find i bag with + | (_,_,_,Terms.Exact _) -> acc + | (_,_,_,Terms.Step (_,i1,i2,_,_,_)) -> + traverse (traverse (C.add i1 (C.add i2 acc)) i1) i2 + in + C.elements (traverse C.empty id) + in + S.topological_sort (all i) all + in + prerr_endline "YES!"; + prerr_endline "Proof:"; + List.iter (fun x -> + prerr_endline (Pp.pp_unit_clause (Terms.M.find x bag))) l; + let proofterm = B.mk_proof bag l in + prerr_endline + (NCicPp.ppterm ~metasenv:C.metasenv ~subst:C.subst ~context:C.context + proofterm); + let _metasenv, _subst, _proofterm, _prooftype = + NCicRefiner.typeof rdb C.metasenv C.subst C.context proofterm None + in + () + | Failure _ -> prerr_endline "FAILURE"; ;;