Changeset 1778 for trunk

Timestamp:

May 18, 2012 8:51:08 AM (7 years ago)

Author:

forrest

Message:

change ctrl-c actions

Location:

trunk/Cbc/src

Files:

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

trunk/Cbc/src/CbcModel.cpp

@@ -3935 +3935 @@
             secondaryStatus_ = 2;
             status_ = 0 ;
+        } else if (eventHappened_) {
+            handler_->message(CBC_EVENT, messages_) << CoinMessageEol ;
+            secondaryStatus_ = 5;
+            status_ = 5 ;
         } else if (isNodeLimitReached()) {
             handler_->message(CBC_MAXNODES, messages_) << CoinMessageEol ;
@@ -3943 +3947 @@
             secondaryStatus_ = 4;
             status_ = 1 ;
-        } else if (eventHappened_) {
-            handler_->message(CBC_EVENT, messages_) << CoinMessageEol ;
-            secondaryStatus_ = 5;
-            status_ = 5 ;
         } else {
             handler_->message(CBC_MAXSOLS, messages_) << CoinMessageEol ;

trunk/Cbc/src/CbcModel.hpp

@@ -1735 +1735 @@
         return specialOptions_;
     }
+    /// Tell model to stop on event
+    inline void sayEventHappened()
+    { eventHappened_=true;}
     /// Says if normal solver i.e. has well defined CoinPackedMatrix
     inline bool normalSolver() const {

trunk/Cbc/src/CbcSolver.cpp

@@ -831 +831 @@
             currentBranchModel->setMaximumNodes(0); // stop at next node
             currentBranchModel->setMaximumSeconds(0.0); // stop
+            currentBranchModel->sayEventHappened(); // say why stopped
         }
         return;