Changeset 1733

Timestamp:

Sep 25, 2011 11:40:30 AM (9 years ago)

Author:

stefan

Message:

merge chgset 1732 from stable/2.7: add CbcModel::getExtraNodeCount

Location:

trunk/Cbc

Files:

• . (modified) (1 prop)
• src/CbcModel.hpp (modified) (2 diffs)

trunk/Cbc/src/CbcModel.hpp

@@ -895 +895 @@
         numberIterations_ += value;
     }
-    /// Get how many Nodes it took to solve the problem.
+    /// Get how many Nodes it took to solve the problem (including those in complete fathoming B&B inside CLP).
     inline int getNodeCount() const {
         return numberNodes_;
@@ -902 +902 @@
     inline void incrementNodeCount(int value) {
         numberNodes_ += value;
+    }
+    /// Get how many Nodes were enumerated in complete fathoming B&B inside CLP
+    inline int getExtraNodeCount() const {
+       return numberExtraNodes_;
     }
     /** Final status of problem