Skip to content

Commit 15d36e7

Browse files
author
John
committed
minor tweak for old progress
1 parent 7edeb73 commit 15d36e7

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/ClpParameters.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -341,16 +341,17 @@ void ClpParameters::synchronizeModel() {
341341
printf("changing ? from %g to %g at line %d\n",modelDoubleValue,doubleValue,__LINE__+1);
342342
#endif
343343
model_->setDblParam(ClpPresolveTolerance, doubleValue);
344-
#if CLP_OLD_PROGRESS == 0
345-
// I dislike new way
346344
parameters_[ClpParam::PROGRESS]->getVal(doubleValue);
347345
#ifdef PRINT_CLP_CHANGES
348346
modelDoubleValue = model_->getMinIntervalProgressUpdate();
349347
if (doubleValue!=modelDoubleValue)
350348
printf("changing ? from %g to %g at line %d\n",modelDoubleValue,doubleValue,__LINE__+1);
351-
model_->setMinIntervalProgressUpdate(doubleValue);
352349
#endif
350+
#if CLP_OLD_PROGRESS
351+
// I dislike new way
352+
if (doubleValue < 0.0)
353353
#endif
354+
model_->setMinIntervalProgressUpdate(doubleValue);
354355
}
355356
}
356357
#endif

0 commit comments

Comments
 (0)