Changeset 1499
- Timestamp:
- Jan 29, 2010 5:03:06 AM (11 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpSimplex.cpp
r1494 r1499 11235 11235 } 11236 11236 if (problemStatus_==10) { 11237 // Say second call 11238 moreSpecialOptions_ |= 256; 11237 11239 //printf("Cleaning up with primal\n"); 11238 11240 //lastAlgorithm=1; … … 11299 11301 #endif 11300 11302 } 11303 // Say not second call 11304 moreSpecialOptions_ &= ~256; 11301 11305 intParam_[ClpMaxNumIteration] = saveMax; 11302 11306 -
trunk/Clp/src/ClpSimplexPrimal.cpp
r1464 r1499 1452 1452 if (numberIterations_>lastBadIteration_+100) 1453 1453 moreSpecialOptions_ &= ~16; // clear check accuracy flag 1454 if (goToDual) 1454 if (goToDual||numberIterations_>1000&&largestPrimalError_>1.0e6 1455 &&largestDualError_>1.0e6) { 1455 1456 problemStatus_=10; // try dual 1456 // If bad go to dual 1457 if (numberIterations_>1000&&largestPrimalError_>1.0e6 1458 &&largestDualError_>1.0e6) 1459 problemStatus_=10; // try dual 1457 // See if second call 1458 if ((moreSpecialOptions_&256)!=0) { 1459 numberPrimalInfeasibilities_ = nonLinearCost_->numberInfeasibilities(); 1460 sumPrimalInfeasibilities_ = nonLinearCost_->sumInfeasibilities(); 1461 // say infeasible 1462 if (numberPrimalInfeasibilities_) 1463 problemStatus_=1; 1464 } 1465 } 1460 1466 // make sure first free monotonic 1461 1467 if (firstFree_>=0&&saveFirstFree>=0) {
Note: See TracChangeset
for help on using the changeset viewer.