Changeset 1724 for stable

Timestamp:

Sep 12, 2011 3:15:28 AM (9 years ago)

Author:

forrest

Message:

more control over message handling in mini bab

Location:

stable/2.7/Cbc/src

Files:

• CbcHeuristic.cpp (modified) (1 diff)
• CbcModel.cpp (modified) (1 diff)
• CbcModel.hpp (modified) (2 diffs)

stable/2.7/Cbc/src/CbcHeuristic.cpp

@@ -1176 +1176 @@
 #endif
                     model.passInEventHandler(model_->getEventHandler());
+                    // say model_ is sitting there
+                    int saveOptions = model_->specialOptions();
+                    model_->setSpecialOptions(saveOptions|1048576);
                     model.branchAndBound();
+                    model_->setSpecialOptions(saveOptions);
 #ifdef ALWAYS_DUAL
                     solver = model.solver();

stable/2.7/Cbc/src/CbcModel.cpp

@@ -12047 +12047 @@
     delete eventHandler_;
     eventHandler_ = NULL ;
-    if (eventHandler)
+    if (eventHandler) {
         eventHandler_ = eventHandler->clone();
+        eventHandler_->setModel(this);
+    }
 }
 

stable/2.7/Cbc/src/CbcModel.hpp

@@ -1718 +1718 @@
         18 bit (262144) - donor CbcModel
         19 bit (524288) - recipient CbcModel
+        20 bit (1048576) - waiting for sub model to return
     */
     inline void setSpecialOptions(int value) {
@@ -1729 +1730 @@
     inline bool normalSolver() const {
         return (specialOptions_&16) == 0;
+    }
+    /** Says if model is sitting there waiting for mini branch and bound to finish
+        This is because an event handler may only have access to parent model in
+        mini branch and bound
+    */
+    inline bool waitingForMiniBranchAndBound() const {
+        return (specialOptions_&1048576) != 0;
     }
     /** Set more special options