ANL-CEEESA
/
UnitCommitment.jl
mirror of https://github.com/ANL-CEEESA/UnitCommitment.jl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replaced Cbc with HiGHS

Browse Source
pull/44/head
Jun He 2 years ago
parent 7412b5f7e5
commit 547aba3b9b
9 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
test/src/instance/migrate_test.jl
Unescape View File

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details. # Released under the modified BSD license. See COPYING.md for more details.
using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip using UnitCommitment, LinearAlgebra, JuMP, JSON, GZip
function instance_migrate_test() function instance_migrate_test()
@testset "read v0.2" begin @testset "read v0.2" begin

2
test/src/instance/read_test.jl
Unescape View File

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details. # Released under the modified BSD license. See COPYING.md for more details.
using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip using UnitCommitment, LinearAlgebra, JuMP, JSON, GZip
function instance_read_test() function instance_read_test()
@testset "read_benchmark" begin @testset "read_benchmark" begin

6
test/src/lmp/aelmp_test.jl
Unescape View File

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details. # Released under the modified BSD license. See COPYING.md for more details.
using UnitCommitment, Cbc, HiGHS, JuMP using UnitCommitment, HiGHS, JuMP
import UnitCommitment: AELMP import UnitCommitment: AELMP
function lmp_aelmp_test() function lmp_aelmp_test()
@ -13,8 +13,8 @@ function lmp_aelmp_test()
model = UnitCommitment.build_model( model = UnitCommitment.build_model(
instance = instance, instance = instance,
optimizer = optimizer_with_attributes( optimizer = optimizer_with_attributes(
Cbc.Optimizer, HiGHS.Optimizer,
"logLevel" => 0, "log_to_console" => false,
), ),
variable_names = true, variable_names = true,
) )

7
test/src/lmp/conventional_test.jl
Unescape View File

@ -2,13 +2,16 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details. # Released under the modified BSD license. See COPYING.md for more details.
using UnitCommitment, Cbc, HiGHS, JuMP using UnitCommitment, HiGHS, JuMP
function solve_conventional_testcase(path::String) function solve_conventional_testcase(path::String)
instance = UnitCommitment.read(path) instance = UnitCommitment.read(path)
model = UnitCommitment.build_model( model = UnitCommitment.build_model(
instance = instance, instance = instance,
optimizer = optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0), optimizer = optimizer_with_attributes(
HiGHS.Optimizer,
"log_to_console" => false,
),
variable_names = true, variable_names = true,
) )
JuMP.set_silent(model) JuMP.set_silent(model)

14
test/src/market/market_test.jl
Unescape View File

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details. # Released under the modified BSD license. See COPYING.md for more details.
using UnitCommitment, Cbc, HiGHS, JuMP using UnitCommitment, HiGHS, JuMP
import UnitCommitment: MarketSettings import UnitCommitment: MarketSettings
function simple_market_test() function simple_market_test()
@ -20,8 +20,8 @@ function simple_market_test()
rt_paths, rt_paths,
MarketSettings(), # keep everything default MarketSettings(), # keep everything default
optimizer = optimizer_with_attributes( optimizer = optimizer_with_attributes(
Cbc.Optimizer, HiGHS.Optimizer,
"logLevel" => 0, "log_to_console" => false,
), ),
lp_optimizer = optimizer_with_attributes( lp_optimizer = optimizer_with_attributes(
HiGHS.Optimizer, HiGHS.Optimizer,
@ -52,8 +52,8 @@ function simple_market_test()
rt_paths, rt_paths,
MarketSettings(lmp_method = nothing), # no lmp MarketSettings(lmp_method = nothing), # no lmp
optimizer = optimizer_with_attributes( optimizer = optimizer_with_attributes(
Cbc.Optimizer, HiGHS.Optimizer,
"logLevel" => 0, "log_to_console" => false,
), ),
) )
@ -115,8 +115,8 @@ function stochastic_market_test()
rt_paths, rt_paths,
MarketSettings(), # keep everything default MarketSettings(), # keep everything default
optimizer = optimizer_with_attributes( optimizer = optimizer_with_attributes(
Cbc.Optimizer, HiGHS.Optimizer,
"logLevel" => 0, "log_to_console" => false,
), ),
lp_optimizer = optimizer_with_attributes( lp_optimizer = optimizer_with_attributes(
HiGHS.Optimizer, HiGHS.Optimizer,

4
test/src/model/formulations_test.jl
Unescape View File

@ -4,7 +4,7 @@
using UnitCommitment using UnitCommitment
using JuMP using JuMP
using Cbc using HiGHS
using JSON using JSON
import UnitCommitment: import UnitCommitment:
ArrCon2000, ArrCon2000,
@ -28,7 +28,7 @@ function _test(
model = UnitCommitment.build_model( model = UnitCommitment.build_model(
instance = instance, instance = instance,
formulation = formulation, formulation = formulation,
optimizer = Cbc.Optimizer, optimizer = HiGHS.Optimizer,
variable_names = true, variable_names = true,
) )
set_silent(model) set_silent(model)

14
test/src/solution/methods/TimeDecomposition/optimize_test.jl
Unescape View File

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details. # Released under the modified BSD license. See COPYING.md for more details.
using UnitCommitment, DataStructures, Cbc, HiGHS using UnitCommitment, DataStructures, HiGHS
import UnitCommitment: TimeDecomposition, ConventionalLMP import UnitCommitment: TimeDecomposition, ConventionalLMP
function solution_methods_TimeDecomposition_optimize_test() function solution_methods_TimeDecomposition_optimize_test()
@ -13,8 +13,8 @@ function solution_methods_TimeDecomposition_optimize_test()
instance, instance,
TimeDecomposition(time_window = 3, time_increment = 2), TimeDecomposition(time_window = 3, time_increment = 2),
optimizer = optimizer_with_attributes( optimizer = optimizer_with_attributes(
Cbc.Optimizer, HiGHS.Optimizer,
"logLevel" => 0, "log_to_console" => false,
), ),
) )
@test length(solution["Thermal production (MW)"]["g1"]) == 4 @test length(solution["Thermal production (MW)"]["g1"]) == 4
@ -47,8 +47,8 @@ function solution_methods_TimeDecomposition_optimize_test()
instance, instance,
TimeDecomposition(time_window = 3, time_increment = 2), TimeDecomposition(time_window = 3, time_increment = 2),
optimizer = optimizer_with_attributes( optimizer = optimizer_with_attributes(
Cbc.Optimizer, HiGHS.Optimizer,
"logLevel" => 0, "log_to_console" => false,
), ),
after_build = after_build, after_build = after_build,
after_optimize = after_optimize, after_optimize = after_optimize,
@ -68,8 +68,8 @@ function solution_methods_TimeDecomposition_optimize_test()
instance, instance,
TimeDecomposition(time_window = 3, time_increment = 2), TimeDecomposition(time_window = 3, time_increment = 2),
optimizer = optimizer_with_attributes( optimizer = optimizer_with_attributes(
Cbc.Optimizer, HiGHS.Optimizer,
"logLevel" => 0, "log_to_console" => false,
), ),
) )
@test length(solution["case14"]["Thermal production (MW)"]["g3"]) == 4 @test length(solution["case14"]["Thermal production (MW)"]["g3"]) == 4

2
test/src/transform/randomize/XavQiuAhm2021_test.jl
Unescape View File

@ -7,7 +7,7 @@ import UnitCommitment: XavQiuAhm2021
using Distributions using Distributions
using Random using Random
using UnitCommitment, Cbc, JuMP using UnitCommitment, JuMP
function get_scenario() function get_scenario()
return UnitCommitment.read_benchmark( return UnitCommitment.read_benchmark(

14
test/src/usage.jl
Unescape View File

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved. # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details. # Released under the modified BSD license. See COPYING.md for more details.
using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON using UnitCommitment, LinearAlgebra, HiGHS, JuMP, JSON
function _set_flow_limits!(instance) function _set_flow_limits!(instance)
for sc in instance.scenarios for sc in instance.scenarios
@ -18,8 +18,10 @@ function usage_test()
@testset "deterministic" begin @testset "deterministic" begin
instance = UnitCommitment.read(fixture("case14.json.gz")) instance = UnitCommitment.read(fixture("case14.json.gz"))
_set_flow_limits!(instance) _set_flow_limits!(instance)
optimizer = optimizer = optimizer_with_attributes(
optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0) HiGHS.Optimizer,
"log_to_console" => false,
)
model = UnitCommitment.build_model( model = UnitCommitment.build_model(
instance = instance, instance = instance,
optimizer = optimizer, optimizer = optimizer,
@ -53,8 +55,10 @@ function usage_test()
]) ])
_set_flow_limits!(instance) _set_flow_limits!(instance)
@test length(instance.scenarios) == 2 @test length(instance.scenarios) == 2
optimizer = optimizer = optimizer_with_attributes(
optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0) HiGHS.Optimizer,
"log_to_console" => false,
)
model = UnitCommitment.build_model( model = UnitCommitment.build_model(
instance = instance, instance = instance,
optimizer = optimizer, optimizer = optimizer,

Write Preview
Loading…
Cancel
Save