Removed useless argument to Th.assume

This commit is contained in:
Guillaume Bury 2014-11-11 15:34:10 +01:00
parent b50246d55d
commit 9b733851c6
3 changed files with 7 additions and 4 deletions

View file

@ -72,7 +72,7 @@ module Tsat = struct
let dummy = () let dummy = ()
let empty () = () let empty () = ()
let assume ~cs:_ _ _ _ = () let assume _ _ _ = ()
end end
module Make(Dummy : sig end) = struct module Make(Dummy : sig end) = struct

View file

@ -381,7 +381,7 @@ module Make (F : Formula_intf.S)
let full_model = nb_assigns() = env.nb_init_vars in let full_model = nb_assigns() = env.nb_init_vars in
env.tenv <- env.tenv <-
List.fold_left List.fold_left
(fun t (a,ex) -> let t = Th.assume ~cs:true a ex t in t) (fun t (a,ex) -> let t = Th.assume a ex t in t)
env.tenv !facts; env.tenv !facts;
if full_model then expensive_theory_propagate () if full_model then expensive_theory_propagate ()
else None else None
@ -561,6 +561,7 @@ module Make (F : Formula_intf.S)
var_decay_activity (); var_decay_activity ();
clause_decay_activity () clause_decay_activity ()
(*
let check_inconsistency_of dep = let check_inconsistency_of dep =
try try
let env = ref (Th.empty()) in (); let env = ref (Th.empty()) in ();
@ -572,6 +573,7 @@ module Make (F : Formula_intf.S)
(* ignore (Th.expensive_processing !env); *) (* ignore (Th.expensive_processing !env); *)
assert false assert false
with Th.Inconsistent _ -> () with Th.Inconsistent _ -> ()
*)
let theory_analyze dep = let theory_analyze dep =
let atoms, sz, max_lvl, c_hist = let atoms, sz, max_lvl, c_hist =
@ -701,9 +703,11 @@ module Make (F : Formula_intf.S)
let check_vec vec = let check_vec vec =
for i = 0 to Vec.size vec - 1 do check_clause (Vec.get vec i) done for i = 0 to Vec.size vec - 1 do check_clause (Vec.get vec i) done
(*
let check_model () = let check_model () =
check_vec env.clauses; check_vec env.clauses;
check_vec env.learnts check_vec env.learnts
*)
(* fixpoint of propagation and decisions until a model is found, or a (* fixpoint of propagation and decisions until a model is found, or a
conflict is reached *) conflict is reached *)

View file

@ -37,10 +37,9 @@ module type S = sig
val empty : unit -> t val empty : unit -> t
(** A function to create an empty theory. *) (** A function to create an empty theory. *)
val assume : cs:bool -> formula -> explanation -> t -> t val assume : formula -> explanation -> t -> t
(** Return a new theory state with the formula as assumption. (** Return a new theory state with the formula as assumption.
@raise Inconsistent if the new state would be inconsistent. *) @raise Inconsistent if the new state would be inconsistent. *)
(* TODO: remove (apparently) useless [cs] parameter *)
end end