@@ -1263,7 +1263,6 @@ void HighsDomain::computeMinActivity(HighsInt start, HighsInt end,
12631263 activitymin += contributionmin;
12641264 }
12651265
1266- activitymin.renormalize ();
12671266 } else {
12681267 activitymin = 0.0 ;
12691268 ninfmin = 0 ;
@@ -1281,9 +1280,8 @@ void HighsDomain::computeMinActivity(HighsInt start, HighsInt end,
12811280 else
12821281 activitymin += contributionmin;
12831282 }
1284-
1285- activitymin.renormalize ();
12861283 }
1284+ activitymin.renormalize ();
12871285}
12881286
12891287void HighsDomain::computeMaxActivity (HighsInt start, HighsInt end,
@@ -1309,8 +1307,6 @@ void HighsDomain::computeMaxActivity(HighsInt start, HighsInt end,
13091307 else
13101308 activitymax += contributionmin;
13111309 }
1312-
1313- activitymax.renormalize ();
13141310 } else {
13151311 activitymax = 0.0 ;
13161312 ninfmax = 0 ;
@@ -1328,9 +1324,8 @@ void HighsDomain::computeMaxActivity(HighsInt start, HighsInt end,
13281324 else
13291325 activitymax += contributionmin;
13301326 }
1331-
1332- activitymax.renormalize ();
13331327 }
1328+ activitymax.renormalize ();
13341329}
13351330
13361331double HighsDomain::adjustedUb (HighsInt col, HighsCDouble boundVal,
@@ -1339,12 +1334,9 @@ double HighsDomain::adjustedUb(HighsInt col, HighsCDouble boundVal,
13391334
13401335 if (mipsolver->variableType (col) != HighsVarType::kContinuous ) {
13411336 bound = std::floor (double (boundVal + mipsolver->mipdata_ ->feastol ));
1342- if (bound < col_upper_[col] &&
1343- col_upper_[col] - bound >
1344- 1000.0 * mipsolver->mipdata_ ->feastol * std::fabs (bound))
1345- accept = true ;
1346- else
1347- accept = false ;
1337+ accept = bound < col_upper_[col] &&
1338+ col_upper_[col] - bound >
1339+ 1000.0 * mipsolver->mipdata_ ->feastol * std::fabs (bound);
13481340 } else {
13491341 if (std::fabs (double (boundVal) - col_lower_[col]) <=
13501342 mipsolver->mipdata_ ->epsilon )
@@ -1374,12 +1366,9 @@ double HighsDomain::adjustedLb(HighsInt col, HighsCDouble boundVal,
13741366
13751367 if (mipsolver->variableType (col) != HighsVarType::kContinuous ) {
13761368 bound = std::ceil (double (boundVal - mipsolver->mipdata_ ->feastol ));
1377- if (bound > col_lower_[col] &&
1378- bound - col_lower_[col] >
1379- 1000.0 * mipsolver->mipdata_ ->feastol * std::fabs (bound))
1380- accept = true ;
1381- else
1382- accept = false ;
1369+ accept = bound > col_lower_[col] &&
1370+ bound - col_lower_[col] >
1371+ 1000.0 * mipsolver->mipdata_ ->feastol * std::fabs (bound);
13831372 } else {
13841373 if (std::fabs (col_upper_[col] - double (boundVal)) <=
13851374 mipsolver->mipdata_ ->epsilon )
0 commit comments