diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-04-29 10:50:43 -0400 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-04-29 12:11:41 -0400 |
commit | bb32f230b1bf822a422efe89f35ac92c8d17c50f (patch) | |
tree | 34ed1ddaf1660691fed58900f837b7f676fb3fca /src/theory/arith/soi_simplex.cpp | |
parent | d0514a37c2bf753ae5da35b2c350f2d681f9a752 (diff) |
Fixes to FCSimplex for some versions of compilers
Diffstat (limited to 'src/theory/arith/soi_simplex.cpp')
-rw-r--r-- | src/theory/arith/soi_simplex.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/theory/arith/soi_simplex.cpp b/src/theory/arith/soi_simplex.cpp index f19b13fa5..7255d92ef 100644 --- a/src/theory/arith/soi_simplex.cpp +++ b/src/theory/arith/soi_simplex.cpp @@ -674,9 +674,12 @@ WitnessImprovement SumOfInfeasibilitiesSPD::soiRound() { Assert(d_soiVar != ARITHVAR_SENTINEL); bool useBlands = degeneratePivotsInARow() >= s_maxDegeneratePivotsBeforeBlandsOnLeaving; - LinearEqualityModule::UpdatePreferenceFunction upf = useBlands ? - &LinearEqualityModule::preferWitness<false>: - &LinearEqualityModule::preferWitness<true>; + LinearEqualityModule::UpdatePreferenceFunction upf; + if(useBlands) { + upf = &LinearEqualityModule::preferWitness<false>; + } else { + upf = &LinearEqualityModule::preferWitness<true>; + } LinearEqualityModule::VarPreferenceFunction bpf = useBlands ? &LinearEqualityModule::minVarOrder : |