Changeset 220 for branches


Ignore:
Timestamp:
Oct 6, 2003 12:17:05 PM (16 years ago)
Author:
forrest
Message:

Stuff

Location:
branches/pre
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/pre/ClpPresolve.cpp

    r219 r220  
    479479#if 1
    480480    const bool slackd = true;
    481     const bool doubleton = false;
     481    const bool doubleton = true;
    482482    const bool tripleton = true;
    483483    const bool forcing = true;
  • branches/pre/ClpSolve.cpp

    r212 r220  
    102102      presolve=ClpSolve::presolveOff;
    103103    }
    104     // We may be better off using original
     104    // We may be better off using original (but if dual leave because of bounds)
    105105    if (presolve!=ClpSolve::presolveOff&&
    106         numberRows_<1.01*model2->numberRows_&&numberColumns_<1.01*model2->numberColumns_) {
     106        numberRows_<1.01*model2->numberRows_&&numberColumns_<1.01*model2->numberColumns_
     107        &&method!=ClpSolve::useDual) {
    107108      delete model2;
    108109      model2 = this;
  • branches/pre/Samples/sprint.cpp

    r210 r220  
    122122  for (int iRow=0;iRow<numberRows;iRow++)
    123123    whichRows[iRow]=iRow;
     124  double originalOffset;
     125  model2->getDblParam(ClpObjOffset,originalOffset);
    124126
    125127  for (iPass=0;iPass<maxPass;iPass++) {
     
    138140      fullSolution[kColumn]=0.0;
    139141    }
     142    // Get objective offset
     143    double offset=0.0;
     144    const double * objective = model2->objective();
     145    for (iColumn=0;iColumn<numberColumns_;iColumn++)
     146      offset += fullSolution[iColumn]*objective[iColumn];
     147    small.setDblParam(ClpObjOffset,originalOffset-offset);
    140148    model.times(1.0,fullSolution,rowSolution);
    141149
Note: See TracChangeset for help on using the changeset viewer.