Changeset 1366 for branches

Timestamp:

Dec 5, 2009 1:34:51 PM (11 years ago)

Author:

EdwinStraver

Message:

Added Lou's comments

File:

• branches/sandbox/Cbc/src/CbcNode.cpp (modified) (3 diffs)

branches/sandbox/Cbc/src/CbcNode.cpp

@@ -3528 +3528 @@
     double objMax = -1.0e50;
     bool needResolve = false;
+/*
+  Now calculate the cost forcing the variable up and down.
+*/
     int iDo;
     for (iDo = 0; iDo < numberToDo; iDo++) {
@@ -3539 +3542 @@
         int iColumn = dynamicObject->columnNumber();
         int preferredWay;
+/*
+  Update the information held in the object.
+*/
         object->infeasibility(&usefulInfo, preferredWay);
         double value = currentSolution[iColumn];
@@ -3980 +3986 @@
    the up arm. But see OsiBranchingObject::way()
    Use nodeInfo--.numberBranchesLeft_ to see how active
+
+   Except that there is no OsiBranchingObject::way(), and this'll fail in any
+   event because we have various OsiXXXBranchingObjects which aren't descended
+   from CbcBranchingObjects. I think branchIndex() is the appropriate
+   equivalent, but could be wrong. (lh, 061220)
+
+   071212: I'm finally getting back to cbc-generic and rescuing a lot of my
+   annotation from branches/devel (which was killed in summer). I'm going to
+   put back an assert(obj) just to see what happens. It's still present as of
+   the most recent change to CbcNode (r833).
+
+   080104: Yep, we can arrive here with an OsiBranchingObject. Removed the
+   assert, it's served its purpose.
+
+   080226: John finally noticed this problem and added a way() method to the
+   OsiBranchingObject hierarchy. Removing my workaround.
+
 */
 int