From 3c4935c7c0c6774588af94c82307a960e58a1154 Mon Sep 17 00:00:00 2001 From: Andrew Reynolds Date: Fri, 31 Aug 2012 16:48:20 +0000 Subject: merge from fmf-devel branch. more updates to models: now with collectModelInfo with fullModel argument, most theory-specific implementation out of the model class, model printer relegated to printer classes. Also updates to finite mode finding, modifications to datatypes making them compatible with theory combination, support for theory-specific handling of user attributes, refactoring of uf models --- src/prop/minisat/core/Solver.cc | 1 + src/prop/options | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/prop') diff --git a/src/prop/minisat/core/Solver.cc b/src/prop/minisat/core/Solver.cc index 675bc8f4e..5e19eb776 100644 --- a/src/prop/minisat/core/Solver.cc +++ b/src/prop/minisat/core/Solver.cc @@ -407,6 +407,7 @@ Lit Solver::pickBranchLit() if(stopSearch) { return lit_Undef; } + Debug("propagateAsDecision") << "propagateAsDecision(): decide on another literal" << std::endl; Var next = var_Undef; diff --git a/src/prop/options b/src/prop/options index c3c2674c4..cda99538c 100644 --- a/src/prop/options +++ b/src/prop/options @@ -25,7 +25,7 @@ option satRestartInc --restart-int-inc=F double :default 3.0 :predicate greater_ option sat_refine_conflicts --refine-conflicts bool refine theory conflict clauses -option minisatUseElim --minisat-elimination bool :default true +option minisatUseElim --minisat-elimination bool :default true :read-write use Minisat elimination endmodule -- cgit v1.2.3