replaced Cbc with HiGHS

pull/44/head
Jun He 2 years ago
parent 7412b5f7e5
commit 547aba3b9b

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# 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()
@testset "read v0.2" begin

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# 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()
@testset "read_benchmark" begin

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

@ -2,13 +2,16 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# 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)
instance = UnitCommitment.read(path)
model = UnitCommitment.build_model(
instance = instance,
optimizer = optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0),
optimizer = optimizer_with_attributes(
HiGHS.Optimizer,
"log_to_console" => false,
),
variable_names = true,
)
JuMP.set_silent(model)

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

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

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# 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
function solution_methods_TimeDecomposition_optimize_test()
@ -13,8 +13,8 @@ function solution_methods_TimeDecomposition_optimize_test()
instance,
TimeDecomposition(time_window = 3, time_increment = 2),
optimizer = optimizer_with_attributes(
Cbc.Optimizer,
"logLevel" => 0,
HiGHS.Optimizer,
"log_to_console" => false,
),
)
@test length(solution["Thermal production (MW)"]["g1"]) == 4
@ -47,8 +47,8 @@ function solution_methods_TimeDecomposition_optimize_test()
instance,
TimeDecomposition(time_window = 3, time_increment = 2),
optimizer = optimizer_with_attributes(
Cbc.Optimizer,
"logLevel" => 0,
HiGHS.Optimizer,
"log_to_console" => false,
),
after_build = after_build,
after_optimize = after_optimize,
@ -68,8 +68,8 @@ function solution_methods_TimeDecomposition_optimize_test()
instance,
TimeDecomposition(time_window = 3, time_increment = 2),
optimizer = optimizer_with_attributes(
Cbc.Optimizer,
"logLevel" => 0,
HiGHS.Optimizer,
"log_to_console" => false,
),
)
@test length(solution["case14"]["Thermal production (MW)"]["g3"]) == 4

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

@ -2,7 +2,7 @@
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
# 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)
for sc in instance.scenarios
@ -18,8 +18,10 @@ function usage_test()
@testset "deterministic" begin
instance = UnitCommitment.read(fixture("case14.json.gz"))
_set_flow_limits!(instance)
optimizer =
optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0)
optimizer = optimizer_with_attributes(
HiGHS.Optimizer,
"log_to_console" => false,
)
model = UnitCommitment.build_model(
instance = instance,
optimizer = optimizer,
@ -53,8 +55,10 @@ function usage_test()
])
_set_flow_limits!(instance)
@test length(instance.scenarios) == 2
optimizer =
optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0)
optimizer = optimizer_with_attributes(
HiGHS.Optimizer,
"log_to_console" => false,
)
model = UnitCommitment.build_model(
instance = instance,
optimizer = optimizer,

Loading…
Cancel
Save