Skip to content

Commit

Permalink
comment out offending code, find another way to init first worker
Browse files Browse the repository at this point in the history
  • Loading branch information
galabovaa committed Feb 24, 2025
1 parent 89ee858 commit 0d4d922
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/mip/HighsDomain.h
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,10 @@ class HighsDomain {
void recomputeCapacityThreshold();
};

// public:
std::vector<uint8_t> changedcolsflags_;

// private:
std::vector<HighsInt> changedcols_;

std::vector<std::pair<HighsInt, HighsInt>> propRowNumChangedBounds_;
Expand Down
3 changes: 3 additions & 0 deletions src/mip/HighsMipSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ void HighsMipSolver::run() {
fopen(options_mip_->mip_improving_solution_file.c_str(), "w");

mipdata_ = decltype(mipdata_)(new HighsMipSolverData(*this));

// todo:ig mipdata_. initialize worker

analysis_.mipTimerStart(kMipClockPresolve);
analysis_.mipTimerStart(kMipClockInit);

Expand Down
2 changes: 1 addition & 1 deletion src/mip/HighsMipSolverData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ HighsMipSolverData::HighsMipSolverData(HighsMipSolver& mipsolver)

// ig:here
// workers.emplace_back(std::move(HighsMipWorker(mipsolver, lp)));
workers.emplace_back(mipsolver, lp);
// workers.emplace_back(mipsolver, lp);

}

Expand Down
1 change: 1 addition & 0 deletions src/mip/HighsMipWorker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ HighsMipWorker::HighsMipWorker(const HighsMipSolver& mipsolver__,
pseudocost_(mipsolver__)
{

// std::cout << mipdata_.domain.changedcolsflags_.size() << std::endl;
search_ptr_ =
std::unique_ptr<HighsSearch>(new HighsSearch(*this, pseudocost_));

Expand Down

0 comments on commit 0d4d922

Please sign in to comment.