X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fparamod.ml;h=e9726116e2fc44fa2029e71aeee45f3b27e304e7;hb=eca915d2656084f1e58149a476a2d305758b00f9;hp=4968d3290030c7e1b47441bf79d2b9242006db7f;hpb=cb1b4380e7133a0a7a0f22c667afbb6abd0de410;p=helm.git diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml index 4968d3290..e9726116e 100644 --- a/helm/software/components/ng_paramodulation/paramod.ml +++ b/helm/software/components/ng_paramodulation/paramod.ml @@ -1,12 +1,12 @@ (* LOOPING : COL057-1.ma *) let debug s = - () (* prerr_endline s *) + () (* prerr_endline s *) ;; let nparamod rdb metasenv subst context t table = let max_nb_iter = 999999999 in - let amount_of_time = 10.0 in + let amount_of_time = 300.0 in let module C = struct let metasenv = metasenv let subst = subst @@ -34,46 +34,118 @@ let nparamod rdb metasenv subst context t table = PassiveSet.add (Utils.mk_passive_clause cl) passives in let timeout = Unix.gettimeofday () +. amount_of_time in + (* TODO : fairness condition *) - let select passives = - if PassiveSet.is_empty passives then None + let select passives g_passives = + if PassiveSet.is_empty passives then begin + assert (not (PassiveSet.is_empty g_passives)); + let g_cl = PassiveSet.min_elt g_passives in + (true,snd g_cl,passives,PassiveSet.remove g_cl g_passives) + end else let cl = PassiveSet.min_elt passives in - Some (snd cl,PassiveSet.remove cl passives) + if PassiveSet.is_empty g_passives then + (false,snd cl,PassiveSet.remove cl passives,g_passives) + else + let g_cl = PassiveSet.min_elt g_passives in + if (fst cl <= fst g_cl) then + (false,snd cl,PassiveSet.remove cl passives,g_passives) + else + (true,snd g_cl,passives,PassiveSet.remove g_cl g_passives) + in + + 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"; + let new_goals = List.fold_left add_passive_clause + PassiveSet.empty new_goals + in + bag, maxvar, actives, passives, g_current::g_actives, + (PassiveSet.union new_goals g_passives) in - let rec given_clause bag maxvar actives - passives g_actives g_passives = + + let forward_infer_step bag maxvar actives passives g_actives + g_passives current = + (* forward step *) - incr nb_iter; if !nb_iter = max_nb_iter 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..."; + debug "Selected and simplified"; + (* 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 -> + 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 + 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, g_actives, + PassiveSet.union new_goals g_passives + in + + let rec given_clause bag maxvar 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));*) + (fst actives)); *) + incr nb_iter; if !nb_iter = max_nb_iter then raise (Failure "No iterations left !"); if Unix.gettimeofday () > timeout then raise (Failure "Timeout !"); - - (* 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 - debug "Simplified goal"; - let bag, maxvar, new_goals = - Sup.infer_left bag maxvar g_current actives - in - debug "Performed infer_left step"; - 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 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" @@ -81,62 +153,6 @@ let nparamod rdb metasenv subst context t table = 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 maxvar 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 debug (Printf.sprintf "Number of actives : %d" (List.length (fst actives))); debug @@ -198,7 +214,7 @@ let nparamod rdb metasenv subst context t table = let metasenv,i,_,_=NCicMetaSubst.mk_meta metasenv context `Term in metasenv, NCic.Meta (i,(k,NCic.Irl (List.length context))) | t -> NCicUntrusted.map_term_fold_a - (fun _ k -> k+1) k aux metasenv t + (fun _ k -> k+1) k aux metasenv t in aux 0 metasenv proofterm in @@ -208,6 +224,8 @@ let nparamod rdb metasenv subst context t table = metasenv subst context proofterm None in proofterm, metasenv, subst - | Failure _ -> prerr_endline + | Failure s -> + prerr_endline s; + prerr_endline (Printf.sprintf "FAILURE in %d iterations" !nb_iter); assert false ;;