for improvements? to fathomMany

coin-or · Jun 20, 2024 · a7fe6ad · a7fe6ad
1 parent 7a9efea
commit a7fe6ad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/ClpNode.cpp b/src/ClpNode.cpp
@@ -704,6 +704,7 @@ ClpNodeStuff::ClpNodeStuff()
   , nNodes_(0)
   , numberNodesExplored_(0)
   , numberIterations_(0)
+  , maximumIterations_(1000000)
   , presolveType_(0)
 #ifndef NO_FATHOM_PRINT
   , startingDepth_(-1)
@@ -746,6 +747,7 @@ ClpNodeStuff::ClpNodeStuff(const ClpNodeStuff &rhs)
   , nNodes_(rhs.nNodes_)
   , numberNodesExplored_(rhs.numberNodesExplored_)
   , numberIterations_(rhs.numberIterations_)
+  , maximumIterations_(rhs.maximumIterations_)
   , presolveType_(rhs.presolveType_)
 #ifndef NO_FATHOM_PRINT
   , startingDepth_(rhs.startingDepth_)
@@ -792,6 +794,7 @@ ClpNodeStuff::operator=(const ClpNodeStuff &rhs)
     nNodes_ = rhs.nNodes_;
     numberNodesExplored_ = rhs.numberNodesExplored_;
     numberIterations_ = rhs.numberIterations_;
+    maximumIterations_ = rhs.maximumIterations_;
     presolveType_ = rhs.presolveType_;
 #ifndef NO_FATHOM_PRINT
     handler_ = rhs.handler_;

diff --git a/src/ClpNode.hpp b/src/ClpNode.hpp
@@ -286,6 +286,8 @@ class CLPLIB_EXPORT ClpNodeStuff {
   int numberNodesExplored_;
   /// Number of iterations
   int numberIterations_;
+  /// Maximum iterations
+  int maximumIterations_;
   /// Type of presolve - 0 none, 1 crunch
   int presolveType_;
 #ifndef NO_FATHOM_PRINT

diff --git a/src/ClpSimplex.cpp b/src/ClpSimplex.cpp
@@ -12123,6 +12123,7 @@ int ClpSimplex::fathomMany(void *stuff)
   assert(stuff);
   ClpNodeStuff *info = reinterpret_cast< ClpNodeStuff * >(stuff);
   int nNodes = info->maximumNodes();
+  int maximumIterations = info->maximumIterations_;
   int putNode = info->maximumSpace();
   int goodNodes = 0;
   info->nNodes_ = 0;
@@ -12453,6 +12454,8 @@ int ClpSimplex::fathomMany(void *stuff)
       fastDual2(info);
       forceFactorization_ = save;
     }
+    if (numberIterations>=maximumIterations)
+      stopAtOnce = true;
     if (problemStatus_ == 1 || (problemStatus_ == 0 && objectiveValue() * optimizationDirection_ > bestObjective)) {
       backtrack = true;
       if (printing)