diff options
| author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-04-17 17:20:37 +0000 |
|---|---|---|
| committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2012-04-17 17:20:37 +0000 |
| commit | 7742c4211f765c2ba2637a211265c20789b861ee (patch) | |
| tree | 05622a9df5dc2c900608b8e2ac5611d70e3208c6 /src/theory/arith/simplex.cpp | |
| parent | ccd77233892ace44fd4852999e66534d1c2283ea (diff) | |
A dummy decision engine. Expected performance impact: none.
Adds DecisionEngine and an abstract class DecisionStrategy
which other strategies will derive from eventually.
Full revision summary of merged commits:
r3241 merge from trunk
r3240 fix
r3239 WIP
r3238 JH, CVC3 code: 5% done -- 5% translated
r3237 JH groundwork
r3236 make make regrss pass
r3234 hueristic->heuristic
r3229 JustificationHeuristic: EOD-WIP
r3228 DecisionEngine: hookup assetions
r3227 move ITE outside simplifyAssertions
r3226 DecisionStrategy abstract class
r3222 DecisionEngine: begin
Diffstat (limited to 'src/theory/arith/simplex.cpp')
| -rw-r--r-- | src/theory/arith/simplex.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/theory/arith/simplex.cpp b/src/theory/arith/simplex.cpp index 5837d4793..9f48dad77 100644 --- a/src/theory/arith/simplex.cpp +++ b/src/theory/arith/simplex.cpp @@ -254,9 +254,9 @@ bool SimplexDecisionProcedure::findModel(){ foundConflict = findConflictOnTheQueue(BeforeDiffSearch); } if(!foundConflict){ - uint32_t numHueristicPivots = d_numVariables + 1; - uint32_t pivotsRemaining = numHueristicPivots; - uint32_t pivotsPerCheck = (numHueristicPivots/NUM_CHECKS) + (NUM_CHECKS-1); + uint32_t numHeuristicPivots = d_numVariables + 1; + uint32_t pivotsRemaining = numHeuristicPivots; + uint32_t pivotsPerCheck = (numHeuristicPivots/NUM_CHECKS) + (NUM_CHECKS-1); while(!d_queue.empty() && !foundConflict && pivotsRemaining > 0){ |