Changeset 957
 Timestamp:
 May 30, 2008 7:17:45 AM (11 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

stable/2.1/Cbc/src/CbcSolver.cpp
r904 r957 16 16 #include "CoinHelperFunctions.hpp" 17 17 // Version 18 #define CBCVERSION "2. 00.00"18 #define CBCVERSION "2.10.00" 19 19 20 20 #include "CoinMpsIO.hpp" … … 3542 3542 int statistics_nprocessedrows=0, statistics_nprocessedcols=0; 3543 3543 std::string statistics_result; 3544 int * statistics_number_cuts=NULL;3545 const char * * statistics_name_generators=NULL;3544 int statistics_number_cuts [120]; 3545 const char * statistics_name_generators[120]; 3546 3546 int statistics_number_generators=0; 3547 3547 memset(statusUserFunction_,0,numberUserFunctions_*sizeof(int)); … … 6343 6343 assert (originalColumns); 6344 6344 int n = originalColumns[numberColumns1]+1; 6345 n = CoinMax(n,CoinMax(numberColumns,numberOriginalColumns)); 6345 6346 int * newColumn = new int[CoinMax(n,numberColumns)]; 6346 6347 int i; … … 6370 6371 } 6371 6372 babModel_>setNumberObjects(n); 6373 numberOldObjects=n; 6372 6374 babModel_>zapIntegerInformation(); 6373 6375 } … … 7294 7296 7295 7297 numberGenerators = babModel_>numberCutGenerators(); 7296 statistics_number_cuts=new int [numberGenerators];;7297 7298 statistics_number_generators=numberGenerators; 7298 statistics_name_generators=new const char *[numberGenerators]; 7299 assert (numberGenerators<100); 7300 statistics_number_generators=numberGenerators; 7299 7301 char timing[30]; 7300 7302 for (iGenerator=0;iGenerator<numberGenerators;iGenerator++) { … … 9333 9335 OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (model_.solver()); 9334 9336 ClpSimplex * lpSolver = clpSolver>getModelPtr(); 9335 if (lpSolver0!=lpSolver )9337 if (lpSolver0!=lpSolver&&lpSolver!=originalSolver>getModelPtr()) 9336 9338 lpSolver>moveInfo(*lpSolver0); 9337 9339 //babModel_>setModelOwnsSolver(false);
Note: See TracChangeset
for help on using the changeset viewer.