Changeset 2187 for stable/2.9/Cbc/src


Ignore:
Timestamp:
May 5, 2015 9:04:34 AM (5 years ago)
Author:
stefan
Message:

more sync with trunk

Location:
stable/2.9/Cbc
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc

  • stable/2.9/Cbc/src

  • stable/2.9/Cbc/src/CbcHeuristicDive.cpp

    r2127 r2187  
    7474    decayFactor_ = 1.0;
    7575    smallObjective_ = 1.0e-10;
    76     setPriorities();
    7776}
    7877
     
    234233  if (gotPriorities || priority1>priority2) {
    235234    priority_ = new PriorityType [numberIntegers];
     235    int nInteger=0;
    236236    for (int i = 0; i < numberObjects; i++) {
    237237      OsiObject * object = model_->modifiableObject(i);
     
    241241      int level=thisOne->priority()-priority2;
    242242      assert (level<(1<<29));
    243       priority_[i].priority=static_cast<unsigned int>(level);
     243      assert (nInteger<numberIntegers);
     244      priority_[nInteger].priority=static_cast<unsigned int>(level);
    244245      int direction=0;
    245246      if (thisOne->preferredWay()<0)
     
    248249        direction=1|1;
    249250        // at present don't try other way is not used
    250       priority_[i].direction=static_cast<unsigned char>(direction);
    251     }
     251      priority_[nInteger++].direction=static_cast<unsigned char>(direction);
     252    }
     253    assert (nInteger==numberIntegers);
    252254  }
    253255}
  • stable/2.9/Cbc/src/CbcMipStartIO.cpp

    r2186 r2187  
    111111                             double *sol, double &obj )
    112112{
     113   if (!model->getNumCols())
     114       return 0;
     115   
    113116   int status = 0;
    114117   double compObj = COIN_DBL_MAX;
  • stable/2.9/Cbc/src/CbcModel.cpp

    r2186 r2187  
    1399313993CbcModel::makeGlobalCut(const OsiColCut * cut)
    1399413994{
    13995   abort(); // need to think about top of tree
    1399613995  const double * lower;
    1399713996  const double * upper;
  • stable/2.9/Cbc/src/CbcNode.cpp

    r2182 r2187  
    27182718                    if (20*numberInfeasible + 4*numberFixed < numberNodes) {
    27192719                        // Say never do
    2720                         if (numberBeforeTrust == 5)
     2720                        if (numberBeforeTrust == 10)
    27212721                          skipAll = -1;
    27222722                    }
  • stable/2.9/Cbc/src/CbcSolver.cpp

    r2186 r2187  
    54365436                                //if (model.getMIPStart().size())
    54375437                                // mipStart = model.getMIPStart();
    5438                                 if (mipStart.size() && !mipStartBefore.size())
     5438                                if (mipStart.size() && !mipStartBefore.size() && babModel_->getNumCols())
    54395439                                {
    54405440                                   std::vector< std::string > colNames;
     
    72377237                                          osiclp->getModelPtr()->checkUnscaledSolution();
    72387238                                    }
     7239
    72397240                                    assert (saveSolver->isProvenOptimal());
    72407241#ifndef CBC_OTHER_SOLVER
Note: See TracChangeset for help on using the changeset viewer.