Changeset 1717
- Timestamp:
- Mar 30, 2011 4:48:54 AM (10 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpFactorization.cpp
r1665 r1717 2820 2820 double pivotValue) 2821 2821 { 2822 double newValue; 2822 2823 // better to have small tolerance even if slower 2824 if (zeroValue > 0.0) 2825 newValue = zeroValue; 2826 else 2827 newValue = -zeroTolerance() * zeroValue; 2823 2828 zeroTolerance(CoinMin(zeroTolerance(), zeroValue)); 2824 2829 // better to have large tolerance even if slower 2825 double newValue;2826 2830 if (pivotValue > 0.0) 2827 2831 newValue = pivotValue; -
trunk/Clp/src/ClpSimplexDual.cpp
r1710 r1717 535 535 // Do iterations 536 536 int returnCode = whileIterating(saveDuals, ifValuesPass); 537 if (problemStatus_ == 1 && (progressFlag_&8) != 0 && 538 fabs(objectiveValue_) > 1.0e10 ) 539 problemStatus_ = 10; // infeasible - but has looked feasible 537 540 #ifdef CLP_INVESTIGATE_SERIAL 538 541 nPivots = factorization_->pivots(); … … 1366 1369 printf("flag a %g %g\n", btranAlpha, alpha_); 1367 1370 #endif 1368 1369 #if def FEB_TRY1371 //#define FEB_TRY 1372 #if 1 //def FEB_TRY 1370 1373 // Make safer? 1371 factorization_->saferTolerances ( 1.0e-15, -1.03);1374 factorization_->saferTolerances (-0.99, -1.03); 1372 1375 #endif 1373 1376 setFlagged(sequenceOut_); … … 4976 4979 CoinMemcpyN(savedSolution_ , 4977 4980 numberColumns_, columnActivityWork_); 4978 //numberDualInfeasibilities_=1;4979 4981 problemStatus_ = 10; 4980 4982 situationChanged = 0; 4981 //numberPrimalInfeasibilities_=1;4982 4983 } 4983 4984 //assert(numberDualInfeasibilitiesWithoutFree_==0); 4984 4985 if (numberDualInfeasibilities_) { 4985 if (numberPrimalInfeasibilities_ || numberPivots) { 4986 if ((numberPrimalInfeasibilities_ || numberPivots) 4987 && problemStatus_!=10) { 4986 4988 problemStatus_ = -1; // carry on as normal 4987 4989 } else { -
trunk/Clp/src/ClpSimplexPrimal.cpp
r1707 r1717 2892 2892 << CoinMessageEol; 2893 2893 setFlagged(sequenceIn_); 2894 #if def FEB_TRY2894 #if 1 //def FEB_TRY 2895 2895 // Make safer? 2896 factorization_->saferTolerances ( 1.0e-15, -1.03);2896 factorization_->saferTolerances (-0.99, -1.03); 2897 2897 #endif 2898 2898 progress_.clearBadTimes();
Note: See TracChangeset
for help on using the changeset viewer.