diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2006-11-22 08:01:00 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2006-11-22 08:01:00 -0800 |
| commit | 6ad22b4d3b0446652919d95b15fefb374bddfac0 (patch) | |
| tree | eb525005c9827e844464c4e787c5907c7edc1d5c /src/sat | |
| parent | da5e0785dfb98335bd49a13bf9e86e736fb931be (diff) | |
| download | abc-6ad22b4d3b0446652919d95b15fefb374bddfac0.tar.gz abc-6ad22b4d3b0446652919d95b15fefb374bddfac0.tar.bz2 abc-6ad22b4d3b0446652919d95b15fefb374bddfac0.zip | |
Version abc61122
Diffstat (limited to 'src/sat')
| -rw-r--r-- | src/sat/bsat/satSolver.c | 4 | ||||
| -rw-r--r-- | src/sat/fraig/fraigMan.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/sat/bsat/satSolver.c b/src/sat/bsat/satSolver.c index a84c82ef..2a6c17bf 100644 --- a/src/sat/bsat/satSolver.c +++ b/src/sat/bsat/satSolver.c @@ -1132,9 +1132,9 @@ int sat_solver_solve(sat_solver* s, lit* begin, lit* end, sint64 nConfLimit, sin s->nConfLimit = s->stats.conflicts + nConfLimit; if ( nInsLimit ) s->nInsLimit = s->stats.inspects + nInsLimit; - if ( nConfLimitGlobal && s->nConfLimit > nConfLimitGlobal ) + if ( nConfLimitGlobal && (s->nConfLimit == 0 || s->nConfLimit > nConfLimitGlobal) ) s->nConfLimit = nConfLimitGlobal; - if ( nInsLimitGlobal && s->nInsLimit > nInsLimitGlobal ) + if ( nInsLimitGlobal && (s->nInsLimit == 0 || s->nInsLimit > nInsLimitGlobal) ) s->nInsLimit = nInsLimitGlobal; //printf("solve: "); printlits(begin, end); printf("\n"); diff --git a/src/sat/fraig/fraigMan.c b/src/sat/fraig/fraigMan.c index b43f1093..4e188cf0 100644 --- a/src/sat/fraig/fraigMan.c +++ b/src/sat/fraig/fraigMan.c @@ -68,6 +68,7 @@ void Prove_ParamsSetDefault( Prove_Params_t * pParams ) // global SAT solver limits pParams->nTotalBacktrackLimit = 0; // global limit on the number of backtracks pParams->nTotalInspectLimit = 0; // global limit on the number of clause inspects +// pParams->nTotalInspectLimit = 100000000; // global limit on the number of clause inspects } /**Function************************************************************* |