split into files

src/cpp/benders/benders_core/CMakeLists.txt

@@ -27,8 +27,8 @@ add_library (benders_core STATIC
 	${CMAKE_CURRENT_SOURCE_DIR}/LastIterationPrinter.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/StartUp.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/CutsManagement.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/OuterLoopCriterion.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/BendersMathLogger.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/OuterLoop.cpp
 	)
 
 get_target_property(JSON_INC_PATH jsoncpp_lib INTERFACE_INCLUDE_DIRECTORIES)

src/cpp/benders/benders_core/OuterLoopCriterion.cpp → src/cpp/benders/benders_core/OuterLoop.cpp

@@ -1,4 +1,4 @@
-#include "OuterLoopCriterion.h"
+#include "OuterLoop.h"
 
 OuterLoop::OuterLoop(std::shared_ptr<IOuterLoopCriterion> criterion,
                      std::shared_ptr<IMasterUpdate> master_updater,
@@ -8,5 +8,5 @@ OuterLoop::OuterLoop(std::shared_ptr<IOuterLoopCriterion> criterion,
       benders_(std::move(benders)) {}
 
 void OuterLoop::Run() {
-  // master_updater_->
+  //   master_updater_->Update();
 }

src/cpp/benders/benders_core/include/MasterUpdate.h

@@ -0,0 +1,5 @@
+#pragma once
+class IMasterUpdate {
+ public:
+  virtual void Update() = 0;
+};

src/cpp/benders/benders_core/include/OuterLoop.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "MasterUpdate.h"
+#include "OuterLoopCriterion.h"
+
+class OuterLoop {
+ public:
+  explicit OuterLoop(std::shared_ptr<IOuterLoopCriterion> criterion,
+                     std::shared_ptr<IMasterUpdate> master_updater,
+                     pBendersBase benders);
+  void Run();
+
+ private:
+  std::shared_ptr<IOuterLoopCriterion> criterion_;
+  std::shared_ptr<IMasterUpdate> master_updater_;
+  pBendersBase benders_;
+};

src/cpp/benders/benders_core/include/OuterLoopCriterion.h

@@ -13,21 +13,3 @@ class OuterloopCriterionLOL : public IOuterLoopCriterion {
   explicit OuterloopCriterionLOL(double threshold, double epsilon){};
   bool Check() override { return true; };
 };
-
-class IMasterUpdate {
- public:
-  virtual void Update() = 0;
-};
-
-class OuterLoop {
- public:
-  explicit OuterLoop(std::shared_ptr<IOuterLoopCriterion> criterion,
-                     std::shared_ptr<IMasterUpdate> master_updater,
-                     pBendersBase benders);
-  void Run();
-
- private:
-  std::shared_ptr<IOuterLoopCriterion> criterion_;
-  std::shared_ptr<IMasterUpdate> master_updater_;
-  pBendersBase benders_;
-};