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/fc_simplex.cpp | |
| 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/fc_simplex.cpp')
| -rw-r--r-- | src/theory/arith/fc_simplex.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/theory/arith/fc_simplex.cpp b/src/theory/arith/fc_simplex.cpp index c0bffdf07..70a322959 100644 --- a/src/theory/arith/fc_simplex.cpp +++ b/src/theory/arith/fc_simplex.cpp @@ -536,7 +536,7 @@ void FCSimplexDecisionProcedure::updateAndSignal(const UpdateInfo& selected, Wit } if(selected.describesPivot()){ - Constraint limiting = selected.limiting(); + ConstraintP limiting = selected.limiting(); ArithVar basic = limiting->getVariable(); Assert(d_linEq.basicIsTracked(basic)); d_linEq.pivotAndUpdate(basic, nonbasic, limiting->getValue()); |