diff options
Diffstat (limited to 'src/theory/arith/fc_simplex.h')
| -rw-r--r-- | src/theory/arith/fc_simplex.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/theory/arith/fc_simplex.h b/src/theory/arith/fc_simplex.h index 0dafa83ff..51514bcfb 100644 --- a/src/theory/arith/fc_simplex.h +++ b/src/theory/arith/fc_simplex.h @@ -146,9 +146,11 @@ private: LinearEqualityModule::UpdatePreferenceFunction selectLeavingFunction(ArithVar x){ bool useBlands = d_leavingCountSinceImprovement.isKey(x) && d_leavingCountSinceImprovement[x] >= s_maxDegeneratePivotsBeforeBlandsOnEntering; - return useBlands ? - &LinearEqualityModule::preferWitness<false>: - &LinearEqualityModule::preferWitness<true>; + if(useBlands) { + return &LinearEqualityModule::preferWitness<false>; + } else { + return &LinearEqualityModule::preferWitness<true>; + } } bool debugDualLike(WitnessImprovement w, std::ostream& out, @@ -183,9 +185,12 @@ private: UpdateInfo selectUpdateForPrimal(ArithVar basic, bool useBlands){ TimerStat::CodeTimer codeTimer(d_statistics.d_selectUpdateForPrimal); - 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 : |