Add hyperplanes immediately

Author: andreaslundell

src/Tasks/TaskPerformConvexBounding.cpp

@@ -51,7 +51,7 @@ TaskPerformConvexBounding::TaskPerformConvexBounding(EnvironmentPtr envPtr, bool
         if(static_cast<ES_HyperplaneCutStrategy>(env->settings->getSetting<int>("CutStrategy", "Dual"))
             == ES_HyperplaneCutStrategy::ESH)
         {
-            tUpdateInteriorPoint = std::make_shared<TaskUpdateInteriorPoint>(env);
+            taskUpdateInteriorPoint = std::make_shared<TaskUpdateInteriorPoint>(env);
             taskSelectHPPts = std::make_shared<TaskSelectHyperplanePointsESH>(env);
         }
         else
@@ -95,6 +95,8 @@ TaskPerformConvexBounding::TaskPerformConvexBounding(EnvironmentPtr envPtr, bool
     taskCreateMIPProblem = std::make_shared<TaskCreateMIPProblem>(env, MIPSolver, env->reformulatedProblem);
     taskCreateMIPProblem->run();
 
+    taskAddHyperplanes = std::make_shared<TaskAddHyperplanes>(env);
+
     env->timing->stopTimer("ConvexBounding");
 }
 
@@ -211,19 +213,22 @@ void TaskPerformConvexBounding::run()
             if(static_cast<ES_HyperplaneCutStrategy>(env->settings->getSetting<int>("CutStrategy", "Dual"))
                 == ES_HyperplaneCutStrategy::ESH)
             {
-                tUpdateInteriorPoint->run();
+                taskUpdateInteriorPoint->run();
                 static_cast<TaskSelectHyperplanePointsESH*>(taskSelectHPPts.get())->run(solutionPoints);
             }
             else
             {
                 static_cast<TaskSelectHyperplanePointsECP*>(taskSelectHPPts.get())->run(solutionPoints);
             }
+
+            taskAddHyperplanes->run();
         }
 
         if(env->reformulatedProblem->objectiveFunction->properties.classification
             > E_ObjectiveFunctionClassification::Quadratic)
         {
             taskSelectHPPtsByObjectiveRootsearch->run(solutionPoints);
+            taskAddHyperplanes->run();
         }
 
         int hyperplanesAfter = env->solutionStatistics.numberOfHyperplanesWithConvexSource

src/Tasks/TaskPerformConvexBounding.h

@@ -16,6 +16,7 @@
 
 #include "TaskCreateMIPProblem.h"
 
+#include "TaskAddHyperplanes.h"
 #include "TaskSelectHyperplanePointsObjectiveFunction.h"
 #include "TaskSelectHyperplanePointsESH.h"
 #include "TaskSelectHyperplanePointsECP.h"
@@ -43,7 +44,8 @@ class TaskPerformConvexBounding : public TaskBase
 
     std::shared_ptr<TaskBase> taskSelectHPPts;
     std::shared_ptr<TaskSelectHyperplanePointsObjectiveFunction> taskSelectHPPtsByObjectiveRootsearch;
-    std::shared_ptr<TaskUpdateInteriorPoint> tUpdateInteriorPoint;
+    std::shared_ptr<TaskUpdateInteriorPoint> taskUpdateInteriorPoint;
+    std::shared_ptr<TaskAddHyperplanes> taskAddHyperplanes;
 
     MIPSolverPtr MIPSolver;
 };