Changeset 957 for stable


Ignore:
Timestamp:
May 30, 2008 7:17:45 AM (11 years ago)
Author:
forrest
Message:

fix few bugs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.1/Cbc/src/CbcSolver.cpp

    r904 r957  
    1616#include "CoinHelperFunctions.hpp"
    1717// Version
    18 #define CBCVERSION "2.00.00"
     18#define CBCVERSION "2.10.00"
    1919
    2020#include "CoinMpsIO.hpp"
     
    35423542  int statistics_nprocessedrows=0, statistics_nprocessedcols=0;
    35433543  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];
    35463546  int statistics_number_generators=0;
    35473547  memset(statusUserFunction_,0,numberUserFunctions_*sizeof(int));
     
    63436343                    assert (originalColumns);
    63446344                    int n = originalColumns[numberColumns-1]+1;
     6345                    n = CoinMax(n,CoinMax(numberColumns,numberOriginalColumns));
    63456346                    int * newColumn = new int[CoinMax(n,numberColumns)];
    63466347                    int i;
     
    63706371                      }
    63716372                      babModel_->setNumberObjects(n);
     6373                      numberOldObjects=n;
    63726374                      babModel_->zapIntegerInformation();
    63736375                    }
     
    72947296               
    72957297                numberGenerators = babModel_->numberCutGenerators();
    7296                 statistics_number_cuts=new int [numberGenerators];;
    72977298                statistics_number_generators=numberGenerators;
    7298                 statistics_name_generators=new const char *[numberGenerators];
     7299                assert (numberGenerators<100);
     7300                statistics_number_generators=numberGenerators;
    72997301                char timing[30];
    73007302                for (iGenerator=0;iGenerator<numberGenerators;iGenerator++) {
     
    93339335    OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (model_.solver());
    93349336    ClpSimplex * lpSolver = clpSolver->getModelPtr();
    9335     if (lpSolver0!=lpSolver)
     9337    if (lpSolver0!=lpSolver&&lpSolver!=originalSolver->getModelPtr())
    93369338      lpSolver->moveInfo(*lpSolver0);
    93379339    //babModel_->setModelOwnsSolver(false);
Note: See TracChangeset for help on using the changeset viewer.