-let debug s = ()
-(* prerr_endline s *)
+let debug s =
+ () (* prerr_endline s *)
;;
-let nparamod metasenv subst context t table =
- let nb_iter = ref 100 in
- prerr_endline "========================================";
+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 rec given_clause bag maxvar actives
passives g_actives g_passives =
- decr nb_iter; if !nb_iter = 0 then raise (Failure "Timeout !");
+ decr nb_iter; if !nb_iter = 0 then
+ (*(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 !");
+
- (* 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 *)
+ (* superposition left, simplifications on goals *)
debug "infer_left step...";
let bag, maxvar, g_actives, g_passives =
match select g_passives with
bag, maxvar, g_current::g_actives,
(PassiveSet.union new_goals g_passives)
in
- prerr_endline
+ debug
(Printf.sprintf "Number of active goals : %d"
(List.length g_actives));
- prerr_endline
+ debug
(Printf.sprintf "Number of passive goals : %d"
(PassiveSet.cardinal g_passives));
| None -> assert false
| Some (current, passives) ->
debug ("Selected fact : " ^ Pp.pp_unit_clause current);
- match Sup.keep_simplified current actives bag with
+ 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
+ | Some x -> x,passives
in
- let (current, bag, actives) = aux_simplify passives
+ 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
PassiveSet.union new_clauses passives,
PassiveSet.union new_goals g_passives
in
- prerr_endline
+ debug
(Printf.sprintf "Number of actives : %d" (List.length (fst actives)));
- prerr_endline
+ debug
(Printf.sprintf "Number of passives : %d"
(PassiveSet.cardinal passives));
given_clause bag maxvar actives passives g_actives g_passives
in
let actives = [], IDX.DT.empty in
try given_clause bag maxvar actives passives g_actives g_passives
- with Sup.Success (bag, _, mp) ->
- prerr_endline "YES!";
- prerr_endline "Meeting point :"; prerr_endline (Pp.pp_unit_clause mp)
- (* prerr_endline "Bag :"; prerr_endline (Pp.pp_bag bag) *)
- | Failure _ -> prerr_endline "FAILURE"
+ 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 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
+ 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)))
+ 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
;;
projects / helm.git / blobdiff