Merge pull request #1238 from ERGO-Code/fix-1213

Fix 1213
ERGO-Code · Mar 31, 2023 · 30171da · 30171da
2 parents f44b6d6 + 4c50816
commit 30171da
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/io/Filereader.cpp b/src/io/Filereader.cpp
@@ -42,14 +42,14 @@ Filereader* Filereader::getFilereader(const HighsLogOptions& log_options,
     reader = NULL;
 #endif
     //  } else if (extension == "zip") {
-    //#ifdef ZLIB_FOUND
+    // #ifdef ZLIB_FOUND
     //    extension = getFilenameExt(filename.substr(0, filename.size() - 4));
-    //#else
+    // #else
     //    highsLogUser(log_options, HighsLogType::kError,
     //                 "HiGHS build without zlib support. Cannot read .zip
     //                 file.\n", filename.c_str());
     //    reader = NULL;
-    //#endif
+    // #endif
   }
   if (extension.compare("mps") == 0) {
     reader = new FilereaderMps();

diff --git a/src/mip/HighsDomain.cpp b/src/mip/HighsDomain.cpp
@@ -1106,7 +1106,7 @@ void HighsDomain::ObjectivePropagation::propagate() {
   debugCheckObjectiveLower();
 
   const double upperLimit = domain->mipsolver->mipdata_->upper_limit;
-  if (objectiveLower > upperLimit) {
+  if (numInfObjLower == 0 && objectiveLower > upperLimit) {
     domain->infeasible_ = true;
     domain->infeasible_pos = domain->domchgstack_.size();
     domain->infeasible_reason = Reason::objective();

diff --git a/src/mip/HighsMipSolverData.cpp b/src/mip/HighsMipSolverData.cpp
@@ -1583,6 +1583,9 @@ void HighsMipSolverData::evaluateRootNode() {
 }
 
 bool HighsMipSolverData::checkLimits(int64_t nodeOffset) const {
+  // ToDo Add user termination callback here -
+  // if (!mipsolver.submip) Callbackfor termination
+
   const HighsOptions& options = *mipsolver.options_mip_;
 
   if (options.mip_max_nodes != kHighsIInf &&

diff --git a/src/parallel/HighsSpinMutex.h b/src/parallel/HighsSpinMutex.h
@@ -32,6 +32,7 @@ class HighsSpinMutex {
 #ifdef HIGHS_HAVE_MM_PAUSE
     _mm_pause();
 #else
+    // ToDo: See if this is OK on Mac M1
     std::this_thread::yield();
 #endif
   }
@@ -49,4 +50,4 @@ class HighsSpinMutex {
   void unlock() { flag.store(false, std::memory_order_release); }
 };
 
-#endif
+#endif