Changeset 371


Ignore:
Timestamp:
May 19, 2004 10:29:46 AM (16 years ago)
Author:
forrest
Message:

change to restoreModel

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpMessage.cpp

    r348 r371  
    8383  {CLP_BARRIER_END,46,1,"At end primal/dual infeasibilities %g/%g, complementarity gap %g, objective %g"},
    8484  {CLP_BARRIER_ACCURACY,47,2,"Relative error in phase %d, refinement %d is %g"},
    85   {CLP_BARRIER_SAFE,48,3,"Initial safe primal value %g, objective norm %g"},
     85  {CLP_BARRIER_SAFE,48,2,"Initial safe primal value %g, objective norm %g"},
    8686  {CLP_BARRIER_NEGATIVE_GAPS,49,3,"%d negative gaps summing to %g"},
    8787  {CLP_BARRIER_REDUCING,50,2,"Reducing %s step from %g to %g"},
  • trunk/ClpSimplex.cpp

    r358 r371  
    38203820  if (fp) {
    38213821    // Get rid of current model
     3822    // save event handler in case already set
     3823    ClpEventHandler * handler = eventHandler_->clone();
    38223824    ClpModel::gutsOfDelete();
     3825    eventHandler_ = handler;
    38233826    gutsOfDelete(0);
    38243827    int i;
Note: See TracChangeset for help on using the changeset viewer.