Changeset 897 for branches/heur

Timestamp:

Mar 12, 2008 4:57:55 PM (11 years ago)

Author:

ladanyi

Message:

evenly distributed heur invocation doesn't crash

Location:

branches/heur/Cbc/src

Files:

• CbcBranchBase.hpp (modified) (1 diff)
• CbcHeuristic.cpp (modified) (4 diffs)
• CbcModel.cpp (modified) (2 diffs)
• CbcNode.cpp (modified) (7 diffs)
• CbcNode.hpp (modified) (2 diffs)

branches/heur/Cbc/src/CbcBranchBase.hpp

@@ -308 +308 @@
   virtual double branch(OsiSolverInterface * solver)
   { return branch();}
+
+  /** Reset every information so that the branching object appears to point to
+      the previous child. This method does not need to modify anything in any
+      solver. */
+  virtual void previousBranch() {
+    assert(branchIndex_ > 0);
+    branchIndex_--;
+    way_ = -way_;
+  }
 
   using OsiBranchingObject::print ;

branches/heur/Cbc/src/CbcHeuristic.cpp

@@ -168 +168 @@
 }
 
-void
-CbcHeuristic::debugNodes()
+void CbcHeurDebugNodes(CbcModel* model_)
 {
   CbcNode* node = model_->currentNode();
@@ -219 +218 @@
 }
 
+void
+CbcHeuristic::debugNodes()
+{
+  CbcHeurDebugNodes(model_);
+}
+
 bool
 CbcHeuristic::shouldHeurRun()
@@ -228 +233 @@
   }
 
-  debugNodes();
-  return false;
+//   debugNodes();
+//   return false;
 
   const int depth = currentNode->depth();
@@ -693 +698 @@
 CbcHeuristicNode::gutsOfConstructor(CbcModel& model)
 {
+  //  CbcHeurDebugNodes(&model);
   CbcNode* node = model.currentNode();
-  brObj_ = new CbcBranchingObject*[node->depth()-1];
+  brObj_ = new CbcBranchingObject*[node->depth()];
   CbcNodeInfo* nodeInfo = node->nodeInfo();
   int cnt = 0;

branches/heur/Cbc/src/CbcModel.cpp

@@ -2265 +2265 @@
       if (branchesLeft) {
         // set nodenumber correctly
+#ifdef CBC_DEBUG_NODENUMBER
+        printf("CbcModel: numberNodes2_: %i,  node->nodeNumber(): %i\n",
+               numberNodes2_, node->nodeNumber());
+#endif
         node->nodeInfo()->setNodeNumber(numberNodes2_);
         tree_->push(node) ;
@@ -11890 +11894 @@
       if (branchesLeft) {
         // set nodenumber correctly
-        if (node->nodeInfo())
+        if (node->nodeInfo()) {
+#ifdef CBC_DEBUG_NODENUMBER
+          printf("CbcModel: numberNodes2_: %i,  node->nodeNumber(): %i\n",
+                 numberNodes2_, node->nodeNumber());
+#endif
           node->nodeInfo()->setNodeNumber(numberNodes2_);
+        }
 #ifndef CBC_DETERMINISTIC_THREAD
 #ifdef PUSH_LATER

branches/heur/Cbc/src/CbcNode.cpp

@@ -71 +71 @@
       assert(cbcbr);
       parentBranch_ = cbcbr->clone();
+      parentBranch_->previousBranch();
     }
   }
 }
 
+#if 0
 // Constructor given parent
 CbcNodeInfo::CbcNodeInfo (CbcNodeInfo * parent)
@@ -94 +96 @@
   setParentBasedData();
 }
+#endif
+
 // Copy Constructor 
 CbcNodeInfo::CbcNodeInfo (const CbcNodeInfo & rhs)
@@ -179 +183 @@
     if (!numberLinks) delete parent_;
   }
+  delete parentBranch_;
 }
 
@@ -497 +502 @@
 CbcFullNodeInfo::CbcFullNodeInfo(CbcModel * model,
                                  int numberRowsAtContinuous) :
-  CbcNodeInfo()
+  CbcNodeInfo(NULL, model->currentNode())
 {
   OsiSolverInterface * solver = model->solver();
@@ -672 +677 @@
 CbcPartialNodeInfo::CbcPartialNodeInfo (const CbcPartialNodeInfo & rhs)
 
-  : CbcNodeInfo(rhs.parent_)
+  : CbcNodeInfo(rhs)
 
 { basisDiff_ = rhs.basisDiff_->clone() ;
@@ -1114 +1119 @@
   }
   // Set node number
+#ifdef CBC_DEBUG_NODENUMBER
+  printf("CbcNode: model->getNodeCount2(): %i,     this->nodeNumber_: %i\n",
+         model->getNodeCount2(), nodeNumber_);
+#endif
   nodeInfo_->setNodeNumber(model->getNodeCount2());
   state_ |= 2; // say active
@@ -1297 +1306 @@
   }
   // Set node number
+#ifdef CBC_DEBUG_NODENUMBER
+  printf("CbcNode: model->getNodeCount2(): %i,     this->nodeNumber_: %i\n",
+         model->getNodeCount2(), nodeNumber_);
+#endif
   nodeInfo_->setNodeNumber(model->getNodeCount2());
   state_ |= 2; // say active

branches/heur/Cbc/src/CbcNode.hpp

@@ -74 +74 @@
   CbcNodeInfo ( const CbcNodeInfo &);
    
-
+#if 0
   /** Construct with parent
 
@@ -81 +81 @@
   */
   CbcNodeInfo (CbcNodeInfo * parent);
+#endif
    
   /** Construct with parent and owner