diff options
| author | Clifford Wolf <clifford@clifford.at> | 2014-07-21 01:49:59 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-07-21 02:01:32 +0200 |
| commit | b1d520949bdb5357f31f43d9dc4f4579dda9f269 (patch) | |
| tree | 83b0774721024d166b5c710514a4efcbf530a69b /libs/ezsat/ezminisat.cc | |
| parent | ade659e617922171ad1b678a51765ba2046c27d8 (diff) | |
Added ezSAT::keep_cnf() and ezSAT::non_incremental()
Diffstat (limited to 'libs/ezsat/ezminisat.cc')
| -rw-r--r-- | libs/ezsat/ezminisat.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ezsat/ezminisat.cc b/libs/ezsat/ezminisat.cc index 6a6c075f..3f43f3ec 100644 --- a/libs/ezsat/ezminisat.cc +++ b/libs/ezsat/ezminisat.cc @@ -63,7 +63,8 @@ void ezMiniSAT::clear() #if EZMINISAT_SIMPSOLVER && EZMINISAT_INCREMENTAL void ezMiniSAT::freeze(int id) { - cnfFrozenVars.insert(bind(id)); + if (!mode_non_incremental()) + cnfFrozenVars.insert(bind(id)); } bool ezMiniSAT::eliminated(int idx) @@ -89,6 +90,8 @@ void ezMiniSAT::alarmHandler(int) bool ezMiniSAT::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions) { + preSolverCallback(); + solverTimoutStatus = false; if (0) { |