Changeset 464


Ignore:
Timestamp:
Oct 4, 2004 3:14:53 PM (15 years ago)
Author:
forrest
Message:

trying to get rid of loop

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSimplexPrimal.cpp

    r460 r464  
    989989      }
    990990    } else {
    991       if(type==3&&problemStatus_!=-5)
    992         unflag(); // odd
    993991      // carry on
    994992      problemStatus_ = -1;
     993      if(type==3&&problemStatus_!=-5) {
     994        //bool unflagged =
     995        unflag();
     996        if (sumDualInfeasibilities_<1.0e-3&&!numberPrimalInfeasibilities_) {
     997          if (numberTimesOptimal_<4) {
     998            numberTimesOptimal_++;
     999            changeMade_++; // say change made
     1000          } else {
     1001            problemStatus_=0;
     1002            secondaryStatus_=5;
     1003          }
     1004        }
     1005      }
    9951006    }
    9961007  }
  • trunk/include/ClpModel.hpp

    r438 r464  
    267267       3 - scaled problem optimal - unscaled problem has dual infeasibilities
    268268       4 - scaled problem optimal - unscaled problem has primal and dual infeasibilities
     269       5 - giving up in primal with flagged variables
    269270       100 up - translation of enum from ClpEventHandler
    270271   */
Note: See TracChangeset for help on using the changeset viewer.