Changeset 2187

Timestamp:

May 5, 2015 9:04:34 AM (6 years ago)

Author:

stefan

Message:

more sync with trunk

Location:

stable/2.9/Cbc

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/CbcHeuristicDive.cpp (modified) (4 diffs)
• src/CbcMipStartIO.cpp (modified) (1 diff)
• src/CbcModel.cpp (modified) (1 diff)
• src/CbcNode.cpp (modified) (1 diff)
• src/CbcSolver.cpp (modified) (2 diffs)

stable/2.9/Cbc/src/CbcHeuristicDive.cpp

@@ -74 +74 @@
     decayFactor_ = 1.0;
     smallObjective_ = 1.0e-10;
-    setPriorities();
 }
 
@@ -234 +233 @@
   if (gotPriorities || priority1>priority2) {
     priority_ = new PriorityType [numberIntegers];
+    int nInteger=0;
     for (int i = 0; i < numberObjects; i++) {
       OsiObject * object = model_->modifiableObject(i);
@@ -241 +241 @@
       int level=thisOne->priority()-priority2;
       assert (level<(1<<29));
-      priority_[i].priority=static_cast<unsigned int>(level);
+      assert (nInteger<numberIntegers);
+      priority_[nInteger].priority=static_cast<unsigned int>(level);
       int direction=0;
       if (thisOne->preferredWay()<0) 
@@ -248 +249 @@
         direction=1|1;
         // at present don't try other way is not used
-      priority_[i].direction=static_cast<unsigned char>(direction);
-    }
+      priority_[nInteger++].direction=static_cast<unsigned char>(direction);
+    }
+    assert (nInteger==numberIntegers);
   }
 }

stable/2.9/Cbc/src/CbcMipStartIO.cpp

@@ -111 +111 @@
                              double *sol, double &obj )
 {
+   if (!model->getNumCols())
+       return 0;
+   
    int status = 0;
    double compObj = COIN_DBL_MAX;

stable/2.9/Cbc/src/CbcModel.cpp

@@ -13993 +13993 @@
 CbcModel::makeGlobalCut(const OsiColCut * cut)
 {
-  abort(); // need to think about top of tree
   const double * lower;
   const double * upper;

stable/2.9/Cbc/src/CbcNode.cpp

@@ -2718 +2718 @@
                     if (20*numberInfeasible + 4*numberFixed < numberNodes) {
                         // Say never do
-                        if (numberBeforeTrust == 5)
+                        if (numberBeforeTrust == 10)
                           skipAll = -1;
                     }

stable/2.9/Cbc/src/CbcSolver.cpp

@@ -5436 +5436 @@
                                 //if (model.getMIPStart().size())
                                 // mipStart = model.getMIPStart();
-                                if (mipStart.size() && !mipStartBefore.size())
+                                if (mipStart.size() && !mipStartBefore.size() && babModel_->getNumCols())
                                 {
                                    std::vector< std::string > colNames;
@@ -7237 +7237 @@
                                           osiclp->getModelPtr()->checkUnscaledSolution();
                                     }
+
                                     assert (saveSolver->isProvenOptimal());
 #ifndef CBC_OTHER_SOLVER