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
+module type Paramod =
+ sig
+ type t
+ type input
+ type szsontology =
+ | Unsatisfiable of (t Terms.bag * int * int list) list
+ | GaveUp
+ | Error of string
+ | Timeout of int * t Terms.bag
+ type bag = t Terms.bag * int
+ 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.clause list ->
+ passives:t Terms.clause list -> szsontology
+ end
+
+module Paramod (B : Orderings.Blob) = struct
+ type t = B.t
+ type input = B.input
+ type szsontology =
+ | Unsatisfiable of (B.t Terms.bag * int * int list) list
+ | GaveUp
+ | Error of string
+ | Timeout of int * B.t Terms.bag
+ exception Stop of szsontology
type bag = B.t Terms.bag * int
module Pp = Pp.Pp (B)
module FU = FoUnif.Founif(B)
module IDX = Index.Index(B)
module Sup = Superposition.Superposition(B)
module Utils = FoUtils.Utils(B)
+ module Order = B
module WeightOrderedPassives =
struct
type t = B.t Terms.passive_clause
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 c, maxvar = Utils.mk_clause maxvar [] [ty] proof in
+ let bag, c = Terms.add_to_bag c bag in
(bag, maxvar), c
;;
(* TODO : global age over facts and goals (without comparing weights) *)
let select ~use_age passives g_passives =
if is_passive_set_empty passives then begin
- assert (not (is_passive_set_empty g_passives));
- let g_cl = pick_min_passive ~use_age:use_age g_passives in
+ if (is_passive_set_empty g_passives) then
+ raise (Stop GaveUp) (* we say we are incomplete *)
+ else
+ let g_cl = pick_min_passive ~use_age:use_age g_passives in
(true,g_cl,passives,remove_passive_clause g_passives g_cl)
end
else let cl = pick_min_passive ~use_age:use_age passives in
(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)
;;
let backward_infer_step bag maxvar actives passives
- g_actives g_passives g_current =
+ g_actives g_passives g_current iterno =
(* 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 bag = Terms.replace_in_bag (g_current,false,iterno) bag in
bag, maxvar, actives, passives, g_current::g_actives,
(add_passive_goals g_passives new_goals)
;;
let forward_infer_step bag maxvar actives passives g_actives
- g_passives current =
+ g_passives current iterno =
(* forward step *)
(* e = select P *
* new'= demod A'' new *
* P' = P + new' *)
debug "Forward infer step...";
+ 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
Sup.simplify_goal ~no_demod:false maxvar (snd actives) bag acc c
with
| None -> bag, acc
- | Some (bag,c) -> bag,c::acc)
+ | 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 ->
bag,m,ng@acc)
(bag,maxvar,[]) g_actives
in
+ let bag = Terms.replace_in_bag (current,false,iterno) bag in
bag, maxvar, actives,
add_passive_clauses passives new_clauses, g_actives,
add_passive_goals g_passives new_goals
;;
- let rec given_clause ~noinfer
- bag maxvar iterno max_steps timeout
+ let rec given_clause ~useage ~noinfer
+ bag maxvar iterno weight_picks max_steps timeout
actives passives g_actives g_passives
=
let iterno = iterno + 1 in
- if iterno = max_steps then
- raise (Failure ("No iterations left !",bag,maxvar,iterno));
+ if iterno = max_steps then raise (Stop (Timeout (maxvar,bag)));
(* timeout check: gettimeofday called only if timeout set *)
if timeout <> None &&
(match timeout with
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 ->
();
x::acc,i+1)
([],0) g_actives);
- raise (Failure (("Last chance: failed over " ^
- string_of_int maxgoals^ " goal " ^
- string_of_float (Unix.gettimeofday())),bag,maxvar,0));
+ raise (Stop (Timeout (maxvar,bag)))
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 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 (Failure ("Timeout !",bag,maxvar,iterno))
+ raise (Stop (Timeout (maxvar,bag)));
end
- else raise (Failure ("Timeout !",bag,maxvar,iterno));
+ else raise (Stop (Timeout (maxvar,bag)));
- (* let use_age = iterno mod 10 = 0 in *)
+ let use_age = useage && (weight_picks = (iterno / 6 + 1)) in
+ let weight_picks = if use_age then 0 else weight_picks+1
+ in
let rec aux_select bag passives g_passives =
let backward,(weight,current),passives,g_passives =
- select ~use_age:false passives g_passives
+ select ~use_age 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
+ let bag = Terms.replace_in_bag (current,false,iterno) bag in
if backward then
+ let _ = debug (lazy("Selected goal : " ^ Pp.pp_clause current)) in
match
if noinfer then
if weight > monster then None else Some (bag,current)
bag,maxvar,actives,passives,g_actives,g_passives
else
backward_infer_step bag maxvar actives passives
- g_actives g_passives g_current
+ 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 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,iterno) bag in
bag, None
else Sup.keep_simplified current actives bag maxvar
with
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
forward_infer_step bag maxvar actives passives
- g_actives g_passives current
+ g_actives g_passives current iterno
in
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));
- given_clause ~noinfer
- bag maxvar iterno max_steps timeout
+ (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
;;
- let paramod ~max_steps ?timeout (bag,maxvar) ~g_passives ~passives =
+ let paramod ~useage ~max_steps ?timeout (bag,maxvar) ~g_passives ~passives =
let initial_timestamp = Unix.gettimeofday () in
let passives =
add_passive_clauses ~no_weight:true passive_empty_set passives
let g_actives = [] in
let actives = [], IDX.DT.empty in
try
- given_clause ~noinfer:false
- bag maxvar 0 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.M.find i bag with
- | (id,_,_,Terms.Exact _),_ ->
+ 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]
- | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),_ ->
+ | (_,_,_,_,Terms.Step (_,i1,i2,_,_,_)),_,_ ->
if (not ongoal) && (List.mem i acce) then accg,acce
else
let accg,acce =
let gsteps,esteps = traverse true ([],[]) i in
(List.rev esteps)@gsteps
in
-(* List.iter (fun id -> let (cl,d) =
- Terms.M.find id bag in
- if d then prerr_endline (Pp.pp_unit_clause cl)) l;*)
+ let max_w = List.fold_left (fun acc i ->
+ let (cl,_,_) = Terms.get_from_bag i bag 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) =
+ Terms.get_from_bag id bag in
+ if d then
+ prerr_endline
+ (Printf.sprintf "Id : %d, selected at %d, weight %d,disc, by %s"
+ id it (Order.compute_unit_clause_weight cl)
+ (Pp.pp_proof_step proof))
+ else
+ prerr_endline
+ (Printf.sprintf "Id : %d, selected at %d, weight %d by %s"
+ id it (Order.compute_unit_clause_weight cl)
+ (Pp.pp_proof_step proof))) l;*)
prerr_endline
(Printf.sprintf "Found proof, %fs"
(Unix.gettimeofday() -. initial_timestamp));
List.iter (fun x ->
prerr_endline (Pp.pp_unit_clause (fst(Terms.M.find x bag)))) l;
*)
- [ bag, i, l ]
- | Failure (msg,_bag,_maxvar,iterno) ->
- prerr_endline msg;
- prerr_endline (Printf.sprintf "FAILURE in %d iterations" iterno);
- []
+ Unsatisfiable [ bag, i, l ]
+ | Stop (Unsatisfiable _) -> Error "stop bug solution found!"
+ | Stop o -> o
;;
end
projects / helm.git / blobdiff