Split ColCutGenConquer run! method (#707)

* wip * split colcutgen conquer
atoptima · Aug 29, 2022 · 5ecd32d · 5ecd32d
1 parent eadee6a
commit 5ecd32d
Show file tree

Hide file tree

Showing 2 changed files with 194 additions and 135 deletions.
diff --git a/src/Algorithm/branchcutprice.jl b/src/Algorithm/branchcutprice.jl
@@ -67,9 +67,9 @@ function BranchCutAndPriceAlgorithm(;
         stbranch_phases_num_candidates::Vector{Int64} = Int[],
         stbranch_intrmphase_stages::Vector{NamedTuple{(:userstage, :solverid, :maxiters), Tuple{Int64, Int64, Int64}}} = [(userstage=1, solverid=1, maxiters=100)]
 )
-    heuristics = ParameterisedHeuristic[]
+    heuristics = ParameterizedHeuristic[]
     if restmastipheur_timelimit > 0
-        heuristic = ParameterisedHeuristic(
+        heuristic = ParameterizedHeuristic(
             SolveIpForm(moi_params = MoiOptimize(
                 get_dual_bound = false,
                 time_limit = restmastipheur_timelimit