new classes initializing in HighsMipSolver

ERGO-Code · Feb 13, 2025 · 54d338f · 54d338f
1 parent 057f653
commit 54d338f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/cmake/sources.cmake b/cmake/sources.cmake
@@ -212,6 +212,7 @@ set(highs_sources
     mip/HighsMipAnalysis.cpp
     mip/HighsMipSolver.cpp
     mip/HighsMipSolverData.cpp
+    mip/HighsMipWorker.cpp
     mip/HighsModkSeparator.cpp
     mip/HighsNodeQueue.cpp
     mip/HighsObjectiveFunction.cpp
@@ -220,6 +221,7 @@ set(highs_sources
     mip/HighsPseudocost.cpp
     mip/HighsRedcostFixing.cpp
     mip/HighsSearch.cpp
+    mip/HighsSearchWorker.cpp
     mip/HighsSeparation.cpp
     mip/HighsSeparator.cpp
     mip/HighsTableauSeparator.cpp
@@ -333,6 +335,7 @@ set(highs_headers
     mip/HighsMipAnalysis.h
     mip/HighsMipSolver.h
     mip/HighsMipSolverData.h
+    mip/HighsMipWorker.h
     mip/HighsModkSeparator.h
     mip/HighsNodeQueue.h
     mip/HighsObjectiveFunction.h
@@ -341,6 +344,7 @@ set(highs_headers
     mip/HighsPseudocost.h
     mip/HighsRedcostFixing.h
     mip/HighsSearch.h
+    mip/HighsSearchWorker.h
     mip/HighsSeparation.h
     mip/HighsSeparator.h
     mip/HighsTableauSeparator.h

diff --git a/src/mip/HighsMipWorker.cpp b/src/mip/HighsMipWorker.cpp
@@ -7,7 +7,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include "mip/HighsMipWorker.h"
 
-#include "mip/HighsSearch.h"
+#include "mip/HighsSearchWorker.h"
 #include "mip/HighsMipSolverData.h"
 
 HighsMipWorker::HighsMipWorker(const HighsMipSolver& mipsolver__, const HighsLpRelaxation& lprelax_)
@@ -38,7 +38,7 @@ HighsMipWorker::HighsMipWorker(const HighsMipSolver& mipsolver__, const HighsLpR
 
   // search_ptr_= std::unique_ptr<HighsSearch>(new HighsSearch(mipsolver_, pseudocost_));
 
-  search_ptr_= std::unique_ptr<HighsSearch>(new HighsSearch(*this, pseudocost_));
+  search_ptr_= std::unique_ptr<HighsSearchWorker>(new HighsSearchWorker(*this, pseudocost_));
   // search_ptr_shared_ = std::shared_ptr<HighsSearch>(new HighsSearch(*this, pseudocost_));
   // search_ptr = new HighsSearch(*this, pseudocost_);
 
@@ -97,6 +97,6 @@ HighsMipWorker::HighsMipWorker(const HighsMipSolver& mipsolver__, const HighsLpR
 
 const HighsMipSolver& HighsMipWorker::getMipSolver() { return mipsolver_; }
 
-HighsSearch& HighsMipWorker::getSearch() { return *search_ptr_; }
+HighsSearchWorker& HighsMipWorker::getSearch() { return *search_ptr_; }
 // HighsSearch& HighsMipWorker::getSearch() { return (*search_ptr); }
 // HighsSearch& HighsMipWorker::getSearch() { return (*search_ptr_shared_); }
diff --git a/src/mip/HighsMipWorker.h b/src/mip/HighsMipWorker.h
@@ -23,7 +23,7 @@
 // #include "presolve/HighsSymmetry.h"
 // #include "util/HighsHash.h"
 
-class HighsSearch;
+class HighsSearchWorker;
 
 class HighsMipWorker {
   const HighsMipSolver& mipsolver_;
@@ -37,7 +37,7 @@ class HighsMipWorker {
   // Not sure if this should be here or in HighsSearch.
   HighsPseudocost pseudocost_;
 
-  std::unique_ptr<HighsSearch> search_ptr_;
+  std::unique_ptr<HighsSearchWorker> search_ptr_;
   // std::shared_ptr<HighsSearch> search_ptr_shared_;
   // HighsSearch* search_ptr = nullptr;
 
@@ -54,7 +54,7 @@ class HighsMipWorker {
 
   const HighsMipSolver& getMipSolver();
 
-  HighsSearch& getSearch();
+  HighsSearchWorker& getSearch();
 
   HighsLpRelaxation lprelaxation_;