Changeset 1815 for stable/2.8

Timestamp:

Nov 24, 2012 10:45:00 AM (8 years ago)

Author:

stefan

Message:

merge r1813 from trunk

Location:

stable/2.8/Cbc

Files:

• . (modified) (1 prop)
• src/CbcHeuristic.cpp (modified) (1 diff)
• src/CbcHeuristicFPump.cpp (modified) (1 diff)
• src/CbcModel.cpp (modified) (6 diffs)
• src/CbcModel.hpp (modified) (2 diffs)
• src/CbcSolver.cpp (modified) (1 diff)
• src/CbcTree.cpp (modified) (3 diffs)
• src/CbcTree.hpp (modified) (3 diffs)

stable/2.8/Cbc/src/CbcHeuristic.cpp

@@ -453 +453 @@
 CbcHeuristic::setSeed(int value)
 {
+    if (value==0) {
+      double time = fabs(CoinGetTimeOfDay());
+      while (time>=COIN_INT_MAX)
+        time *= 0.5;
+      value = static_cast<int>(time);
+      char printArray[100];
+      sprintf(printArray, "using time of day seed was changed from %d to %d",
+              randomNumberGenerator_.getSeed(), value);
+      if (model_)
+        model_->messageHandler()->message(CBC_FPUMP1, model_->messages())
+          << printArray
+          << CoinMessageEol;
+    }
     randomNumberGenerator_.setSeed(value);
 }

stable/2.8/Cbc/src/CbcHeuristicFPump.cpp

@@ -488 +488 @@
     int maximumPasses = maximumPasses_;
 #ifdef COIN_HAS_CLP
-    if (maximumPasses == 30) {
-        OsiClpSolverInterface * clpSolver
+    {
+      OsiClpSolverInterface * clpSolver
         = dynamic_cast<OsiClpSolverInterface *> (model_->solver());
-        if (clpSolver && clpSolver->fakeObjective())
+      if (clpSolver ) {
+        if (maximumPasses == 30) {
+          if (clpSolver->fakeObjective())
             maximumPasses = 100; // feasibility problem?
+        }
+        if (model_->getRandomSeed()!=-1)
+          clpSolver->getModelPtr()->setRandomSeed(randomNumberGenerator_.getSeed());
+      }
     }
 #endif

stable/2.8/Cbc/src/CbcModel.cpp

@@ -4536 +4536 @@
         maximumWhich_(1000),
         maximumRows_(0),
+        randomSeed_(-1),
         currentDepth_(0),
         whichGenerator_(NULL),
@@ -4693 +4694 @@
         maximumWhich_(1000),
         maximumRows_(0),
+        randomSeed_(-1),
         currentDepth_(0),
         whichGenerator_(NULL),
@@ -4937 +4939 @@
         maximumWhich_(rhs.maximumWhich_),
         maximumRows_(0),
+        randomSeed_(rhs.randomSeed_),
         currentDepth_(0),
         whichGenerator_(NULL),
@@ -5281 +5284 @@
         maximumCutPassesAtRoot_ = rhs.maximumCutPassesAtRoot_;
         maximumCutPasses_ = rhs.maximumCutPasses_;
+        randomSeed_ = rhs.randomSeed_;
         preferredWay_ = rhs.preferredWay_;
         currentPassNumber_ = rhs.currentPassNumber_;
@@ -5687 +5691 @@
     maximumCutPassesAtRoot_ = rhs.maximumCutPassesAtRoot_;
     maximumCutPasses_ =  rhs.maximumCutPasses_;
+    randomSeed_ = rhs.randomSeed_;
     preferredWay_ = rhs.preferredWay_;
     resolveAfterTakeOffCuts_ = rhs.resolveAfterTakeOffCuts_;
@@ -5981 +5986 @@
         heuristic_[where]->setHeuristicName(name) ;
     heuristic_[where]->setSeed(987654321 + where);
+    if (randomSeed_!=-1)
+      heuristic_[where]->setSeed(randomSeed_);
     numberHeuristics_++ ;
 }

stable/2.8/Cbc/src/CbcModel.hpp

@@ -1745 +1745 @@
     inline int specialOptions() const {
         return specialOptions_;
+    }
+    /// Set random seed
+    inline void setRandomSeed(int value) {
+        randomSeed_ = value;
+    }
+    /// Get random seed
+    inline int getRandomSeed() const {
+        return randomSeed_;
     }
     /// Tell model to stop on event
@@ -2650 +2658 @@
     /// Maximum number of rows
     int maximumRows_;
+    /// Random seed
+    int randomSeed_;
     /// Current depth
     int currentDepth_;

stable/2.8/Cbc/src/CbcSolver.cpp

@@ -1131 +1131 @@
 }
 
-#define CBCMAXPARAMETERS 200
 static CbcOrClpParam parameters[CBCMAXPARAMETERS];
 static int numberParameters = 0 ;

stable/2.8/Cbc/src/CbcTree.cpp

@@ -316 +316 @@
 }
 
-
 #ifndef CBC_DUBIOUS_HEAP
 /*
@@ -530 +529 @@
         best->setOnTree(false);
     return best;
-}
-
-double
-CbcTree::getBestPossibleObjective()
-{
-    double r_val = 1e100;
-    for (int i = 0 ; i < static_cast<int> (nodes_.size()) ; i++) {
-        if (nodes_[i] && nodes_[i]->objectiveValue() < r_val) {
-            r_val = nodes_[i]->objectiveValue();
-        }
-    }
-    return r_val;
 }
 /*! \brief Prune the tree using an objective function cutoff
@@ -1406 +1393 @@
 #endif
 
+double
+CbcTree::getBestPossibleObjective()
+{
+    double r_val = 1e100;
+    for (int i = 0 ; i < static_cast<int> (nodes_.size()) ; i++) {
+        if (nodes_[i] && nodes_[i]->objectiveValue() < r_val) {
+            r_val = nodes_[i]->objectiveValue();
+        }
+    }
+    return r_val;
+}
+

stable/2.8/Cbc/src/CbcTree.hpp

@@ -31 +31 @@
 //#define CBC_DUBIOUS_HEAP
 #endif
-#ifndef CBC_DUBIOUS_HEAP
+#if 1 //ndef CBC_DUBIOUS_HEAP
 
 /*! \brief Controls search tree debugging
@@ -114 +114 @@
     /// Return a node pointer
     inline CbcNode * nodePointer (int i) const { return nodes_[i]; }
+    void realpop();
+    /** After changing data in the top node, fix the heap */
+    void fixTop();
+    void realpush(CbcNode * node);
 //@}
 
@@ -452 +456 @@
         maximumNodeNumber_ = 0;
     }
+
+    /// Get maximum node number
+    inline int maximumNodeNumber() const { return maximumNodeNumber_; }
 //@}
 protected: