+(* LOOPING : COL057-1.ma *)
+
let debug s =
() (* prerr_endline s *)
;;
let nparamod rdb metasenv subst context t table =
- let nb_iter = ref 200 in
+ let max_nb_iter = 999999999 in
+ let amount_of_time = 300.0 in
let module C = struct
let metasenv = metasenv
let subst = subst
let context = context
end
in
+ let nb_iter = ref 0 in
let module B = NCicBlob.NCicBlob(C) in
let module Pp = Pp.Pp (B) in
let module FU = FoUnif.Founif(B) in
let add_passive_clause passives cl =
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
in
let rec given_clause bag maxvar actives
passives g_actives g_passives =
-
- decr nb_iter; if !nb_iter = 0 then
- (*(prerr_endline "Bag :"; prerr_endline (Pp.pp_bag bag);
+ (* 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)); *)
+ incr nb_iter; if !nb_iter = max_nb_iter then
+ raise (Failure "No iterations left !");
+ if Unix.gettimeofday () > timeout then
+ raise (Failure "Timeout !");
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
| 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 *)
+ 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 bag, maxvar, new_goals =
List.fold_left
(fun (bag,m,acc) g ->
- let bag, m, ng = Sup.infer_left bag maxvar g
+ let bag, m, ng = Sup.infer_left bag m g
([current],ctable) in
bag,m,ng@acc)
(bag,maxvar,[]) g_actives
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
+ 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
+ let accg,acce =
+ traverse false (traverse ongoal (accg,acce) i1) i2
+ in
+ if ongoal then i::accg,acce else accg,i::acce
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)
+ let gsteps,esteps = traverse true ([],[]) i in
+ (List.rev esteps)@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; *)
+ prerr_endline (Printf.sprintf "Found proof in %d iterations, %fs"
+ !nb_iter
+ (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;*)
let proofterm = B.mk_proof bag i l in
- prerr_endline (NCicPp.ppterm ~metasenv:C.metasenv
- ~subst:C.subst ~context:C.context proofterm);
+ prerr_endline (Printf.sprintf "Got proof term, %fs"
+ (Unix.gettimeofday() -. timeout +. amount_of_time));
+ let metasenv, proofterm =
+ let rec aux k metasenv = function
+ | NCic.Meta _ as t -> metasenv, t
+ | NCic.Implicit _ ->
+ 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
+ in
+ aux 0 metasenv proofterm
+ in
let metasenv, subst, proofterm, _prooftype =
NCicRefiner.typeof
(rdb#set_coerc_db NCicCoercion.empty_db)
- C.metasenv C.subst C.context proofterm None
+ metasenv subst context proofterm None
in
proofterm, metasenv, subst
- | Failure _ -> prerr_endline "FAILURE"; assert false
+ | Failure _ -> prerr_endline
+ (Printf.sprintf "FAILURE in %d iterations" !nb_iter); assert false
;;
projects / helm.git / blobdiff