Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 1213 #1238

Merged
merged 2 commits into from
Mar 31, 2023
Merged

Fix 1213 #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d25472
Fixed 1213
jajhall Mar 31, 2023
4c50816
Formatted
jajhall Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/io/Filereader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/mip/HighsDomain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 3 additions & 0 deletions src/mip/HighsMipSolverData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
3 changes: 2 additions & 1 deletion src/parallel/HighsSpinMutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -49,4 +50,4 @@ class HighsSpinMutex {
void unlock() { flag.store(false, std::memory_order_release); }
};

#endif
#endif