let debug s = prerr_endline s ;;
let debug _ = ();;
-let monster = 500;;
+let monster = 100;;
module Paramod (B : Terms.Blob) = struct
exception Failure of string * B.t Terms.bag * int * int
WeightPassiveSet.add cl passives_w, AgePassiveSet.add cl passives_a
;;
+ let add_passive_goal ?(no_weight=false) (passives_w,passives_a) g =
+ let g = if no_weight then (0,g)
+ else Utils.mk_passive_goal g in
+ WeightPassiveSet.add g passives_w, AgePassiveSet.add g 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
AgePassiveSet.union new_clauses_a passives_a)
;;
+ let add_passive_goals ?(no_weight=false)
+ (passives_w,passives_a) new_clauses =
+ let new_clauses_w,new_clauses_a =
+ List.fold_left (add_passive_goal ~no_weight)
+ (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
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
+ let bag, c = Terms.add_to_bag c bag in
(bag, maxvar), c
;;
(false,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
+ let (id1,_,_,_),(id2,_,_,_) = snd cl, snd g_cl in
+ let cmp = if use_age then id1 <= id2
+ else fst cl <= fst g_cl
+ in
+ if cmp then
(false,cl,remove_passive_clause passives cl,g_passives)
else
(true,g_cl,passives,remove_passive_clause g_passives g_cl)
in
debug "Performed infer_left step";
bag, maxvar, actives, passives, g_current::g_actives,
- (add_passive_clauses g_passives new_goals)
+ (add_passive_goals g_passives new_goals)
;;
let forward_infer_step bag maxvar actives passives g_actives
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
+ 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
+ add_passive_goals g_passives new_goals
;;
let rec given_clause ~noinfer
end
else raise (Failure ("Timeout !",bag,maxvar,iterno));
- (* let use_age = iterno mod 10 = 0 in *)
+ let use_age = iterno mod 5 = 0 in
let rec aux_select bag passives g_passives =
let backward,(weight,current),passives,g_passives =
select ~use_age:false passives g_passives
in
+ if use_age && weight > monster then
+ let bag,cl = Terms.add_to_bag current bag in
+ if backward then
+ aux_select bag passives (add_passive_clause g_passives cl)
+ else
+ aux_select bag (add_passive_clause passives cl) g_passives
+ else
if backward then
+ let _ = debug ("Selected goal : " ^ Pp.pp_unit_clause current) in
match
if noinfer then
if weight > monster then None else Some (bag,current)
if weight > monster then bag,None
else bag, Some (current,actives)
else if Sup.orphan_murder bag (fst actives) current then
- let (id,_,_,_) = current in
- let bag = Terms.M.add id (current,true) bag in
+ let _ = debug "Orphan murdered" in
+ let bag = Terms.replace_in_bag (current,true) bag in
bag, None
else Sup.keep_simplified current actives bag maxvar
with
add_passive_clauses ~no_weight:true passive_empty_set passives
in
let g_passives =
- add_passive_clauses ~no_weight:true passive_empty_set g_passives
+ add_passive_goals ~no_weight:true passive_empty_set g_passives
in
let g_actives = [] in
let actives = [], IDX.DT.empty in
| Sup.Success (bag, _, (i,_,_,_)) ->
let l =
let rec traverse ongoal (accg,acce) i =
- match Terms.M.find i bag with
+ match Terms.get_from_bag i bag with
| (id,_,_,Terms.Exact _),_ ->
if ongoal then [i],acce else
if (List.mem i acce) then accg,acce else accg,acce@[i]