diff --git a/benchmarks/benchmark.jl b/benchmarks/benchmark.jl index 23c6c7182..c9bd885bd 100644 --- a/benchmarks/benchmark.jl +++ b/benchmarks/benchmark.jl @@ -30,7 +30,8 @@ function benchmark(; kwargs...) # Precompile to avoid polluting the results! benchmark_file(joinpath(model_dir, models[1]); kwargs...) solutions = Dict{String,Any}( - benchmark_file(joinpath(model_dir, file); kwargs...) for file in models + file => benchmark_file(joinpath(model_dir, file); kwargs...) for + file in models ) time = Dates.format(Dates.now(), "Y_mm_dd_HHMM_SS") data = Dict("date" => time, "solutions" => solutions) @@ -114,7 +115,7 @@ filename_A = benchmark( filename_B = benchmark( time_limit = 60, stopping_rules = [SDDP.BoundStalling(10, 1e-6)], - duality_handler = SDDP.BanditDuality(), + duality_handler = SDDP.LagrangianDuality(), ) report(filename_A, filename_B) diff --git a/benchmarks/models/generation_expansion.sof.json.gz b/benchmarks/models/generation_expansion.sof.json.gz index df3b2ef5c..a0cab84db 100644 Binary files a/benchmarks/models/generation_expansion.sof.json.gz and b/benchmarks/models/generation_expansion.sof.json.gz differ diff --git a/benchmarks/models/sldp_example_two_2.sof.json.gz b/benchmarks/models/sldp_example_two_2.sof.json.gz index 5a2c2e288..bb2ef379d 100644 Binary files a/benchmarks/models/sldp_example_two_2.sof.json.gz and b/benchmarks/models/sldp_example_two_2.sof.json.gz differ diff --git a/benchmarks/models/sldp_example_two_3.sof.json.gz b/benchmarks/models/sldp_example_two_3.sof.json.gz index 0367765d2..c01a0b1a9 100644 Binary files a/benchmarks/models/sldp_example_two_3.sof.json.gz and b/benchmarks/models/sldp_example_two_3.sof.json.gz differ diff --git a/benchmarks/models/sldp_example_two_6.sof.json.gz b/benchmarks/models/sldp_example_two_6.sof.json.gz index df347a892..370bedce5 100644 Binary files a/benchmarks/models/sldp_example_two_6.sof.json.gz and b/benchmarks/models/sldp_example_two_6.sof.json.gz differ diff --git a/benchmarks/models/user_0001.sof.json.gz b/benchmarks/models/user_0001.sof.json.gz index 27607961d..7ec021e89 100644 Binary files a/benchmarks/models/user_0001.sof.json.gz and b/benchmarks/models/user_0001.sof.json.gz differ diff --git a/benchmarks/models/vehicle_location.sof.json.gz b/benchmarks/models/vehicle_location.sof.json.gz index 806605fb3..03e104038 100644 Binary files a/benchmarks/models/vehicle_location.sof.json.gz and b/benchmarks/models/vehicle_location.sof.json.gz differ diff --git a/benchmarks/update.sh b/benchmarks/update.sh old mode 100644 new mode 100755 diff --git a/docs/src/examples/sldp_example_two.jl b/docs/src/examples/sldp_example_two.jl index 9b84cfc5e..45a2be4dc 100644 --- a/docs/src/examples/sldp_example_two.jl +++ b/docs/src/examples/sldp_example_two.jl @@ -53,7 +53,7 @@ function sldp_example_two(; first_stage_integer::Bool = true, N = 2) joinpath(model_dir, "sldp_example_two_$(N).sof.json.gz"); test_scenarios = 30, ) - exit(0) + return end SDDP.train(model, iteration_limit = 100, log_frequency = 10) bound = SDDP.calculate_bound(model)