| Error of string
| Timeout of int * t Terms.bag
type bag = t Terms.bag * int
- val mk_passive : bag -> input * input -> bag * t Terms.unit_clause
- val mk_goal : bag -> input * input -> bag * t Terms.unit_clause
+ val mk_passive : bag -> input * input -> bag * t Terms.clause
+ val mk_goal : bag -> input * input -> bag * t Terms.clause
val paramod :
useage:bool ->
max_steps:int ->
?timeout:float ->
bag ->
- g_passives:t Terms.unit_clause list ->
- passives:t Terms.unit_clause list -> szsontology
+ g_passives:t Terms.clause list ->
+ passives:t Terms.clause list -> szsontology
end
module Paramod (B : Orderings.Blob) = struct
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 c, maxvar = Utils.mk_clause maxvar [] [ty] proof 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
- let (id1,_,_,_),(id2,_,_,_) = snd cl, snd g_cl in
+ let (id1,_,_,_,_),(id2,_,_,_,_) = snd cl, snd g_cl in
let cmp = if use_age then id1 <= id2
else fst cl <= fst g_cl
in
* new'= demod A'' new *
* P' = P + new' *)
debug "Forward infer step...";
- debug ("Number of actives : " ^ (string_of_int (List.length (fst actives))));
+ debug (lazy("Number of actives : " ^ (string_of_int (List.length (fst actives)))));
let bag, maxvar, actives, new_clauses =
Sup.infer_right bag maxvar current actives
in
| Some (bag,c1) -> bag,if c==c1 then c::acc else c::c1::acc)
(bag,[]) g_actives
in
- let ctable = IDX.index_unit_clause IDX.DT.empty current in
+ let ctable = IDX.index_clause IDX.DT.empty current in
let bag, maxvar, new_goals =
List.fold_left
(fun (bag,m,acc) g ->
add_passive_goals g_passives new_goals
;;
- let rec given_clause ~noinfer
+ let rec given_clause ~useage ~noinfer
bag maxvar iterno weight_picks max_steps timeout
actives passives g_actives g_passives
=
if noinfer then
begin
debug
- ("Last chance: all is indexed " ^ string_of_float
- (Unix.gettimeofday()));
+ (lazy("Last chance: all is indexed " ^ string_of_float
+ (Unix.gettimeofday())));
let maxgoals = 100 in
ignore(List.fold_left
(fun (acc,i) x ->
end
else if false then (* activates last chance strategy *)
begin
- debug("Last chance: "^string_of_float (Unix.gettimeofday()));
- given_clause ~noinfer:true bag maxvar iterno weight_picks max_steps
+ debug (lazy("Last chance: "^string_of_float (Unix.gettimeofday())));
+ given_clause ~useage ~noinfer:true bag maxvar iterno weight_picks max_steps
(Some (Unix.gettimeofday () +. 20.))
actives passives g_actives g_passives;
raise (Stop (Timeout (maxvar,bag)));
end
else raise (Stop (Timeout (maxvar,bag)));
- let use_age = weight_picks = (iterno / 6 + 1) in
+ let use_age = useage && (weight_picks = (iterno / 6 + 1)) in
let weight_picks = if use_age then 0 else weight_picks+1
in
else
let bag = Terms.replace_in_bag (current,false,iterno) bag in
if backward then
- let _ = debug ("Selected goal : " ^ Pp.pp_unit_clause current) in
+ let _ = debug (lazy("Selected goal : " ^ Pp.pp_clause current)) in
match
if noinfer then
if weight > monster then None else Some (bag,current)
backward_infer_step bag maxvar actives passives
g_actives g_passives g_current iterno
else
- let _ = debug ("Selected fact : " ^ Pp.pp_unit_clause current) in
+ let _ = debug (lazy("Selected fact : " ^ Pp.pp_clause current)) in
(*let is_orphan = Sup.orphan_murder bag (fst actives) current in*)
match
if noinfer then
if noinfer then
let actives =
current::fst actives,
- IDX.index_unit_clause (snd actives) current
+ IDX.index_clause (snd actives) current
in
bag,maxvar,actives,passives,g_actives,g_passives
else
aux_select bag passives g_passives
in
debug
- (Printf.sprintf "Number of active goals : %d"
- (List.length g_actives));
+ (lazy(Printf.sprintf "Number of active goals : %d"
+ (List.length g_actives)));
debug
- (Printf.sprintf "Number of passive goals : %d"
- (passive_set_cardinal g_passives));
+ (lazy(Printf.sprintf "Number of passive goals : %d"
+ (passive_set_cardinal g_passives)));
debug
- (Printf.sprintf "Number of actives : %d" (List.length (fst actives)));
+ (lazy(Printf.sprintf "Number of actives : %d" (List.length (fst actives))));
debug
- (Printf.sprintf "Number of passives : %d"
- (passive_set_cardinal passives));
+ (lazy(Printf.sprintf "Number of passives : %d"
+ (passive_set_cardinal passives)));
given_clause ~useage ~noinfer
bag maxvar iterno weight_picks max_steps timeout
actives passives g_actives g_passives
given_clause ~useage ~noinfer:false
bag maxvar 0 0 max_steps timeout actives passives g_actives g_passives
with
- | Sup.Success (bag, _, (i,_,_,_)) ->
+ | Sup.Success (bag, _, (i,_,_,_,_)) ->
let l =
let rec traverse ongoal (accg,acce) i =
match Terms.get_from_bag i bag with
- | (id,_,_,Terms.Exact _),_,_ ->
+ | (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,_,_,_)),_,_ ->
+ | (_,_,_,_,Terms.Step (_,i1,i2,_,_,_)),_,_ ->
if (not ongoal) && (List.mem i acce) then accg,acce
else
let accg,acce =
in
let max_w = List.fold_left (fun acc i ->
let (cl,_,_) = Terms.get_from_bag i bag in
- max acc (Order.compute_unit_clause_weight cl)) 0 l in
+ max acc (Order.compute_clause_weight cl)) 0 l in
prerr_endline "Statistics :";
prerr_endline ("Max weight : " ^ (string_of_int max_w));
(* List.iter (fun id -> let ((_,lit,_,proof as cl),d,it) =
projects / helm.git / blobdiff