Changeset 1018
 Timestamp:
 Jun 12, 2007 12:10:10 PM (12 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

branches/devel/Clp/src/ClpNonLinearCost.cpp
r843 r1018 609 609 // possibly below 610 610 lowerValue = lower_[iRange+1]; 611 if (value <lowerValueprimalTolerance) {611 if (valuelowerValue<primalTolerance) { 612 612 value = lowerValuevalue; 613 613 #ifndef NDEBUG … … 626 626 // possibly above 627 627 upperValue = lower_[iRange]; 628 if (value >upperValue+primalTolerance) {628 if (valueupperValue>primalTolerance) { 629 629 value = valueupperValue; 630 630 #ifndef NDEBUG … … 805 805 case ClpSimplex::basic: 806 806 case ClpSimplex::superBasic: 807 if (value <upperValue+primalTolerance) {808 if (value >lowerValueprimalTolerance) {807 if (valueupperValue<=primalTolerance) { 808 if (valuelowerValue>=primalTolerance) { 809 809 // feasible 810 810 //newWhere=CLP_FEASIBLE; … … 1265 1265 // get correct place 1266 1266 int newWhere=CLP_FEASIBLE; 1267 if (value <upperValue+primalTolerance) {1268 if (value >lowerValueprimalTolerance) {1267 if (valueupperValue<=primalTolerance) { 1268 if (valuelowerValue>=primalTolerance) { 1269 1269 // feasible 1270 1270 //newWhere=CLP_FEASIBLE; … … 1378 1378 // get correct place 1379 1379 int newWhere=CLP_FEASIBLE; 1380 if (value <upperValue+primalTolerance) {1381 if (value >lowerValueprimalTolerance) {1380 if (valueupperValue<=primalTolerance) { 1381 if (valuelowerValue>=primalTolerance) { 1382 1382 // feasible 1383 1383 //newWhere=CLP_FEASIBLE; … … 1521 1521 // get correct place 1522 1522 int newWhere=CLP_FEASIBLE; 1523 if (value <upperValue+primalTolerance) {1524 if (value >lowerValueprimalTolerance) {1523 if (valueupperValue<=primalTolerance) { 1524 if (valuelowerValue>=primalTolerance) { 1525 1525 // feasible 1526 1526 //newWhere=CLP_FEASIBLE; … … 1600 1600 cost_[start+2] = costValue+infeasibilityCost; 1601 1601 double primalTolerance = model_>currentPrimalTolerance(); 1602 if (solutionValue >=lowerValueprimalTolerance) {1603 if (solutionValue <=upperValue+primalTolerance) {1602 if (solutionValuelowerValue>=primalTolerance) { 1603 if (solutionValueupperValue<=primalTolerance) { 1604 1604 iRange=start+1; 1605 1605 } else { … … 1734 1734 value=lowerValue; 1735 1735 int newWhere=CLP_FEASIBLE; 1736 if (value <upperValue+primalTolerance) {1737 if (value >lowerValueprimalTolerance) {1736 if (valueupperValue<=primalTolerance) { 1737 if (valuelowerValue>=primalTolerance) { 1738 1738 // feasible 1739 1739 //newWhere=CLP_FEASIBLE;
Note: See TracChangeset
for help on using the changeset viewer.