- Timestamp:
- Oct 1, 2007 9:48:10 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcLinked.cpp
r789 r812 8027 8027 assert (solver); 8028 8028 int numberObjects = solver->numberObjects(); 8029 if (numberObjects>numberObjects _) {8029 if (numberObjects>numberObjects()) { 8030 8030 // 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 pseudoCosts_->initialize(numberObjects); 8032 } 8033 int numObj = numberObjects; 8045 8034 if (numberObjectsToUse_<0) { 8046 8035 // Sort objects so bilinear at end 8047 8036 OsiObject ** sorted = new OsiObject * [numberObjects]; 8048 8037 OsiObject ** objects = solver->objects(); 8049 num berObjects_=0;8038 numObj=0; 8050 8039 int numberBiLinear=0; 8051 8040 int i; … … 8054 8043 OsiBiLinear * objB = dynamic_cast<OsiBiLinear *> (obj); 8055 8044 if (!objB) 8056 objects[num berObjects_++]=obj;8045 objects[numObj++]=obj; 8057 8046 else 8058 8047 sorted[numberBiLinear++]=obj; 8059 8048 } 8060 numberObjectsToUse_ = num berObjects_;8049 numberObjectsToUse_ = numObj; 8061 8050 for (i=0;i<numberBiLinear;i++) 8062 objects[num berObjects_++]=sorted[i];8051 objects[numObj++]=sorted[i]; 8063 8052 delete [] sorted; 8064 8053 // See if any master objects … … 8070 8059 } 8071 8060 solver->setNumberObjects(numberObjectsToUse_); 8072 num berObjects_=numberObjectsToUse_;8061 numObj=numberObjectsToUse_; 8073 8062 // Use shadow prices 8074 8063 //info->defaultDual_=0.0; 8075 8064 int numberUnsatisfied=OsiChooseStrong::setupList ( info, initialize); 8076 8065 solver->setNumberObjects(numberObjects); 8077 num berObjects_=numberObjects;8066 numObj=numberObjects; 8078 8067 return numberUnsatisfied; 8079 8068 }
Note: See TracChangeset
for help on using the changeset viewer.