Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc/src/CbcModel.cpp

    r2199 r2193  
    16441644    dblParam_[CbcLargestChange] = 0.0;
    16451645    intParam_[CbcNumberBranches] = 0;
    1646     double lastBestPossibleObjective=-COIN_DBL_MAX;
    16471646    // when to check for restart
    16481647    int nextCheckRestart=50;
     
    24532452      that produced a given cut.
    24542453    */
    2455 #define INITIAL_MAXIMUM_WHICH 1000
    2456     maximumWhich_ = INITIAL_MAXIMUM_WHICH ;
     2454    maximumWhich_ = 1000 ;
    24572455    delete [] whichGenerator_;
    24582456    whichGenerator_ = new int[maximumWhich_] ;
     
    36173615      // mark all cuts as globally valid
    36183616      int numberCuts=cuts.sizeRowCuts();
    3619       resizeWhichGenerator(0,numberCuts);
    36203617      for (int i=0;i<numberCuts;i++) {
    36213618        cuts.rowCutPtr(i)->setGloballyValid();
     
    46574654#endif
    46584655            if (!intParam_[CbcPrinting]) {
    4659                 // Parallel may not have any nodes
    4660                 if (!nNodes)
    4661                   bestPossibleObjective_ = lastBestPossibleObjective;
    4662                 else
    4663                   lastBestPossibleObjective = bestPossibleObjective_;
    46644656                messageHandler()->message(CBC_STATUS, messages())
    4665                   << numberNodes_ << CoinMax(nNodes,1) << bestObjective_ << bestPossibleObjective_
     4657                << numberNodes_ << nNodes << bestObjective_ << bestPossibleObjective_
    46664658                << getCurrentSeconds()
    46674659                << CoinMessageEol ;
     
    55175509        preferredWay_(0),
    55185510        currentPassNumber_(0),
    5519         maximumWhich_(INITIAL_MAXIMUM_WHICH),
     5511        maximumWhich_(1000),
    55205512        maximumRows_(0),
    55215513        randomSeed_(-1),
     
    56875679        preferredWay_(0),
    56885680        currentPassNumber_(0),
    5689         maximumWhich_(INITIAL_MAXIMUM_WHICH),
     5681        maximumWhich_(1000),
    56905682        maximumRows_(0),
    56915683        randomSeed_(-1),
     
    71507142        }
    71517143    }
    7152     resizeWhichGenerator(currentNumberCuts_,currentNumberCuts);
    71537144    currentNumberCuts_ = currentNumberCuts;
    71547145    if (currentNumberCuts > maximumNumberCuts_) {
     
    73417332                           numberRowsAtContinuous_ + numberToAdd);
    73427333#         endif
    7343                     assert (i<maximumWhich_);
    73447334                    whichGenerator_[numberToAdd] = whichGenerator_[i];
    73457335                    addCuts[numberToAdd++] = addedCuts_[i];
     
    76557645{
    76567646    if (numberAfter > maximumWhich_) {
    7657 #define MAXIMUM_WHICH_INCREMENT 100
    7658 #define MAXIMUM_WHICH_MULTIPLIER 2
    7659       //printf("maximumWhich from %d to %d (%d needed)\n",maximumWhich_,
    7660       //     CoinMax(maximumWhich_ * MAXIMUM_WHICH_MULTIPLIER + MAXIMUM_WHICH_INCREMENT, numberAfter),
    7661       //     numberAfter);
    7662         maximumWhich_ = CoinMax(maximumWhich_ * MAXIMUM_WHICH_MULTIPLIER + MAXIMUM_WHICH_INCREMENT, numberAfter) ;
    7663         //maximumWhich_ = numberAfter ;
     7647        maximumWhich_ = CoinMax(maximumWhich_ * 2 + 100, numberAfter) ;
    76647648        int * temp = new int[2*maximumWhich_] ;
    76657649        memcpy(temp, whichGenerator_, numberNow*sizeof(int)) ;
     
    1793517919                delete [] newSolution;
    1793617920                // Space for type of cuts
    17937                 maximumWhich_ = INITIAL_MAXIMUM_WHICH;
     17921                maximumWhich_ = 1000;
    1793817922                delete [] whichGenerator_ ;
    1793917923                whichGenerator_ = new int[maximumWhich_];
     
    1850818492      that produced a given cut.
    1850918493    */
    18510     maximumWhich_ = INITIAL_MAXIMUM_WHICH ;
     18494    maximumWhich_ = 1000 ;
    1851118495    delete [] whichGenerator_ ;
    1851218496    whichGenerator_ = new int[maximumWhich_] ;
Note: See TracChangeset for help on using the changeset viewer.