diff options
| author | Tim King <taking@cs.nyu.edu> | 2014-03-07 18:00:37 -0500 |
|---|---|---|
| committer | Tim King <taking@cs.nyu.edu> | 2014-03-07 18:00:52 -0500 |
| commit | 9ccdea06edbc72e3ecd282e9e015f6fc4b2e7173 (patch) | |
| tree | cde6138cb9ab6ef0b7c15edf42e3e8cc53637002 /src/theory/arith/simplex.h | |
| parent | 42be934ef4d4430944ae9074c7202a7d130c75bb (diff) | |
Merging a squash of the branch timothy-king/CVC4/glpknecfix c95bf7d4f1 into master. See the CAV14 submission for an explanation of the changes to the integer solver's behavior. If compiled against the our custom extension of glpk, https://github.com/timothy-king/glpk-cut-log, this should have substantial differences in behavior. This should have moderate performance differences for linear real and integer arithmetic even if these features are disabled.
Diffstat (limited to 'src/theory/arith/simplex.h')
| -rw-r--r-- | src/theory/arith/simplex.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/theory/arith/simplex.h b/src/theory/arith/simplex.h index b61cadaf8..f545da51e 100644 --- a/src/theory/arith/simplex.h +++ b/src/theory/arith/simplex.h @@ -157,16 +157,16 @@ protected: * If a conflict is discovered a node summarizing the conflict is returned. * Otherwise, Node::null() is returned. */ - Node maybeGenerateConflictForBasic(ArithVar basic) const; + bool maybeGenerateConflictForBasic(ArithVar basic) const; /** Returns true if a tracked basic variable has a conflict on it. */ bool checkBasicForConflict(ArithVar b) const; /** * If a basic variable has a conflict on its row, - * this produces a minimized row. + * this produces a minimized row on the conflict channel. */ - Node generateConflictForBasic(ArithVar basic) const; + void generateConflictForBasic(ArithVar basic, RaiseConflict& rc) const; /** Gets a fresh variable from TheoryArith. */ |