Changeset 817 for stable/2.0/Cbc


Ignore:
Timestamp:
Oct 5, 2007 4:59:23 AM (12 years ago)
Author:
forrest
Message:

so CbcLinked? will compile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.0/Cbc/src/CbcLinked.cpp

    r789 r817  
    80278027  assert (solver);
    80288028  int numberObjects = solver->numberObjects();
    8029   if (numberObjects>numberObjects_) {
     8029  //if (numberObjects>numberObjects_) {
    80308030    // redo useful arrays
    8031     delete [] upTotalChange_;
    8032     delete [] downTotalChange_;
    8033     delete [] upNumber_;
    8034     delete [] downNumber_;
    8035     numberObjects_ = solver->numberObjects();
    8036     upTotalChange_ = new double [numberObjects_];
    8037     downTotalChange_ = new double [numberObjects_];
    8038     upNumber_ = new int [numberObjects_];
    8039     downNumber_ = new int [numberObjects_];
    8040     CoinZeroN(upTotalChange_,numberObjects_);
    8041     CoinZeroN(downTotalChange_,numberObjects_);
    8042     CoinZeroN(upNumber_,numberObjects_);
    8043     CoinZeroN(downNumber_,numberObjects_);
    8044   }
     8031    abort();
     8032    //pseudoCosts_->initialize(numberObjects);
     8033    //}
     8034  int numObj = numberObjects;
    80458035  if (numberObjectsToUse_<0) {
    80468036    // Sort objects so bilinear at end
    80478037    OsiObject ** sorted = new OsiObject * [numberObjects];
    80488038    OsiObject ** objects = solver->objects();
    8049     numberObjects_=0;
     8039    numObj=0;
    80508040    int numberBiLinear=0;
    80518041    int i;
     
    80548044      OsiBiLinear * objB = dynamic_cast<OsiBiLinear *> (obj);
    80558045      if (!objB)
    8056         objects[numberObjects_++]=obj;
     8046        objects[numObj++]=obj;
    80578047      else
    80588048        sorted[numberBiLinear++]=obj;
    80598049    }
    8060     numberObjectsToUse_ = numberObjects_;
     8050    numberObjectsToUse_ = numObj;
    80618051    for (i=0;i<numberBiLinear;i++)
    8062       objects[numberObjects_++]=sorted[i];
     8052      objects[numObj++]=sorted[i];
    80638053    delete [] sorted;
    80648054    // See if any master objects
     
    80708060  }
    80718061  solver->setNumberObjects(numberObjectsToUse_);
    8072   numberObjects_=numberObjectsToUse_;
     8062  numObj=numberObjectsToUse_;
    80738063  // Use shadow prices
    80748064  //info->defaultDual_=0.0;
    80758065  int numberUnsatisfied=OsiChooseStrong::setupList ( info, initialize);
    80768066  solver->setNumberObjects(numberObjects);
    8077   numberObjects_=numberObjects;
     8067  numObj=numberObjects;
    80788068  return numberUnsatisfied;
    80798069}
Note: See TracChangeset for help on using the changeset viewer.