Finished pattern enumeration and tests

atoptima · Dec 24, 2024 · 5e7e7c9 · 5e7e7c9
1 parent 86af31b
commit 5e7e7c9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/Algorithm/colgen/default.jl b/src/Algorithm/colgen/default.jl
@@ -404,6 +404,9 @@ end
 function ColGen.optimize_master_lp_problem!(master, ctx::ColGenContext, env)
     rm_input = OptimizationState(master, ip_primal_bound=ctx.current_ip_primal_bound)
     opt_state = run!(ctx.restr_master_solve_alg, env, master, rm_input, ctx.restr_master_optimizer_id)
+    # print(get_best_lp_primal_sol(opt_state))
+    # print(IOContext(stdout, :user_only => true), get_best_lp_dual_sol(opt_state))
+    # print(master)
     return ColGenMasterResult(opt_state)
 end
 
@@ -754,8 +757,9 @@ function ColGen.optimize_pricing_problem!(ctx::ColGenContext, sp::Formulation{Dw
     generated_columns = GeneratedColumn[]
     for col in get_ip_primal_sols(opt_state)
         # `subprob_var_contrib` includes contribution of non-robust cuts.
-        subprob_var_contrib = _subprob_var_contrib(ctx, col, stab_changes_mast_dual_sol, master_dual_sol)
+        subprob_var_contrib = _subprob_var_contrib(ctx, col, stab_changes_mast_dual_sol, master_dual_sol)       
         red_cost = subprob_var_contrib - lb_dual - ub_dual
+        #@show subprob_var_contrib, red_cost
         push!(generated_columns, GeneratedColumn(col, red_cost))
         if sc * best_red_cost > sc * red_cost
             best_red_cost = red_cost

diff --git a/src/optimize.jl b/src/optimize.jl
@@ -87,7 +87,7 @@ function optimize!(
     # initialize all the units used by the algorithm and its child algorithms
     Algorithm.initialize_storage_units!(reform, algorithm)    
 
-    # print(IOContext(stdout, :user_only => true), reform)
+    print(IOContext(stdout, :user_only => true), reform)
 
     algstate = Algorithm.run!(algorithm, env, reform, initstate)
 
@@ -104,6 +104,7 @@ function optimize!(
     ip_primal_sols = get_ip_primal_sols(algstate)
     if !isnothing(ip_primal_sols)
         for sol in ip_primal_sols
+            #print(IOContext(stdout, :user_only => true), sol)
             add_ip_primal_sol!(outstate, proj_cols_on_rep(sol))
         end
     end

diff --git a/test/revise.jl b/test/revise.jl
@@ -80,7 +80,7 @@ include("e2e_extra/run.jl")
 
 listen_to_tests([
     run_unit_tests,
-    run_integration_tests,
-    run_e2e_tests,
-    run_e2e_extra_tests
+    # run_integration_tests,
+    # run_e2e_tests,
+    # run_e2e_extra_tests
 ])