removed is_max_bsp

Author: tonibohnlein

include/osp/bsp/model/BspScheduleCS.hpp

@@ -472,8 +472,6 @@ class BspScheduleCS : public BspSchedule<Graph_t> {
             }
         }
     }
-
-    virtual bool isMaxBsp() const { return false; }
 };
 
 } // namespace osp

include/osp/bsp/model/MaxBspScheduleCS.hpp

@@ -117,8 +117,6 @@ class MaxBspScheduleCS : public BspScheduleCS<Graph_t> {
         }
         return costs;
     }
-
-    virtual bool isMaxBsp() const override { return true; }
 };
 
 } // namespace osp

include/osp/bsp/scheduler/IlpSchedulers/CoptFullScheduler.hpp

@@ -782,6 +782,41 @@ class CoptFullScheduler : public Scheduler<Graph_t> {
         model.SetObjective(expr - instance.synchronisationCosts(), COPT_MINIMIZE);
     }
 
+    RETURN_STATUS run_scheduler(BspScheduleCS<Graph_t> &schedule) {
+        auto &instance = schedule.getInstance();
+        Envr env;
+        Model model = env.CreateModel("bsp_schedule");
+
+        setupVariablesConstraintsObjective(instance, model);
+
+        if (use_initial_schedule) {
+            loadInitialSchedule(model, instance);
+        }
+
+        computeScheduleBase(schedule, model);
+
+        if (model.GetIntAttr(COPT_INTATTR_MIPSTATUS) == COPT_MIPSTATUS_OPTIMAL) {
+
+            constructBspScheduleFromSolution(schedule, true);
+            return RETURN_STATUS::OSP_SUCCESS;
+
+        } else if (model.GetIntAttr(COPT_INTATTR_MIPSTATUS) == COPT_MIPSTATUS_INF_OR_UNB) {
+
+            return RETURN_STATUS::ERROR;
+
+        } else {
+
+            if (model.GetIntAttr(COPT_INTATTR_HASMIPSOL)) {
+
+                constructBspScheduleFromSolution(schedule, true);
+                return RETURN_STATUS::BEST_FOUND;
+
+            } else {
+                return RETURN_STATUS::TIMEOUT;
+            }
+        }
+    }
+
   public:
     CoptFullScheduler(unsigned steps = 5)
         : allow_recomputation(false), use_memory_constraint(false), use_initial_schedule(false), initial_schedule(0),
@@ -831,62 +866,34 @@ class CoptFullScheduler : public Scheduler<Graph_t> {
             return status;
         }
     }
-    virtual RETURN_STATUS computeSchedule(MaxBspSchedule<Graph_t> &schedule) {
+    virtual RETURN_STATUS computeMaxBspSchedule(MaxBspSchedule<Graph_t> &schedule) {
 
         MaxBspScheduleCS<Graph_t> schedule_cs(schedule.getInstance());
-        RETURN_STATUS status = computeScheduleCS(schedule_cs);
+        RETURN_STATUS status = computeMaxBspScheduleCS(schedule_cs);
         if (status == RETURN_STATUS::OSP_SUCCESS || status == RETURN_STATUS::BEST_FOUND) {
             schedule = std::move(schedule_cs);
             return status;
         } else {
             return status;
         }
     }
-    virtual RETURN_STATUS computeScheduleCS(BspScheduleCS<Graph_t> &schedule) override {
-
-        auto &instance = schedule.getInstance();
-
+    
+    virtual RETURN_STATUS computeMaxBspScheduleCS(MaxBspScheduleCS<Graph_t> &schedule) {
         allow_recomputation = false;
+        is_max_bsp = true;
+        return run_scheduler(schedule);
+    }
 
-        is_max_bsp = schedule.isMaxBsp();
-
-        Envr env;
-        Model model = env.CreateModel("bsp_schedule_cs");
-
-        setupVariablesConstraintsObjective(instance, model);
-
-        if (use_initial_schedule) {
-            loadInitialSchedule(model, instance);
-        }
-
-        computeScheduleBase(schedule, model);
-
-        if (model.GetIntAttr(COPT_INTATTR_MIPSTATUS) == COPT_MIPSTATUS_OPTIMAL) {
-
-            constructBspScheduleFromSolution(schedule, true);
-            return RETURN_STATUS::OSP_SUCCESS;
-
-        } else if (model.GetIntAttr(COPT_INTATTR_MIPSTATUS) == COPT_MIPSTATUS_INF_OR_UNB) {
-
-            return RETURN_STATUS::ERROR;
-
-        } else {
-
-            if (model.GetIntAttr(COPT_INTATTR_HASMIPSOL)) {
-
-                constructBspScheduleFromSolution(schedule, true);
-                return RETURN_STATUS::BEST_FOUND;
 
-            } else {
-                return RETURN_STATUS::TIMEOUT;
-            }
-        }
+    virtual RETURN_STATUS computeScheduleCS(BspScheduleCS<Graph_t> &schedule) override { 
+        allow_recomputation = false;
+        is_max_bsp = false;
+        return run_scheduler(schedule);
     }
 
     virtual RETURN_STATUS computeScheduleRecomp(BspScheduleRecomp<Graph_t> &schedule) {
 
         allow_recomputation = true;
-
         is_max_bsp = false;
 
         Envr env;

tests/ilp_bsp_scheduler.cpp

@@ -173,13 +173,13 @@ BOOST_AUTO_TEST_CASE(test_full) {
     CoptFullScheduler<graph> scheduler_max;
     MaxBspScheduleCS<graph> schedule_max(instance);
     scheduler_max.setTimeLimitSeconds(10);
-    const auto result_max = scheduler_max.computeScheduleCS(schedule_max);
+    const auto result_max = scheduler_max.computeMaxBspScheduleCS(schedule_max);
     BOOST_CHECK_EQUAL(RETURN_STATUS::BEST_FOUND, result_max);
     BOOST_CHECK(schedule_max.satisfiesPrecedenceConstraints());
     BOOST_CHECK(schedule_max.hasValidCommSchedule());
 
     scheduler_max.setInitialSolutionFromBspSchedule(schedule_max);
-    const auto result_max2 = scheduler_max.computeScheduleCS(schedule_max);
+    const auto result_max2 = scheduler_max.computeMaxBspScheduleCS(schedule_max);
     BOOST_CHECK_EQUAL(RETURN_STATUS::BEST_FOUND, result_max2);
     BOOST_CHECK(schedule_max.satisfiesPrecedenceConstraints());
     BOOST_CHECK(schedule_max.hasValidCommSchedule());