diff --git a/test/Project.toml b/test/Project.toml index 7d70fe1..260aa24 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -3,7 +3,6 @@ Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" GZip = "92fee26a-97fe-5a0c-ad85-20a5f3185b63" -Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b" JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" JuMP = "4076af6c-e467-56ae-b986-b466b2749572" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" diff --git a/test/model/formulations_test.jl b/test/model/formulations_test.jl index 47fb373..4080004 100644 --- a/test/model/formulations_test.jl +++ b/test/model/formulations_test.jl @@ -17,11 +17,7 @@ import UnitCommitment: XavQiuWanThi2019, WanHob2016 -if ENABLE_LARGE_TESTS - using Gurobi -end - -function _small_test( +function _test( formulation::Formulation; instances::Array{String} = ["test/case14"], optimizer = optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0), @@ -42,32 +38,6 @@ function _small_test( end end -function _large_test(formulation::Formulation)::Nothing - instances = ["pglib-uc/ca/Scenario400_reserves_1"] - for instance in instances - instance = UnitCommitment.read_benchmark(instance) - model = UnitCommitment.build_model( - instance = instance, - formulation = formulation, - optimizer = Gurobi.Optimizer, - ) - UnitCommitment.optimize!( - model, - XavQiuWanThi2019.Method(two_phase_gap = false, gap_limit = 0.1), - ) - solution = UnitCommitment.solution(model) - @test UnitCommitment.validate(instance, solution) - end - return -end - -function _test(formulation::Formulation)::Nothing - _small_test(formulation) - if ENABLE_LARGE_TESTS - _large_test(formulation) - end -end - @testset "formulations" begin _test(Formulation()) _test(Formulation(ramping = ArrCon2000.Ramping())) @@ -83,7 +53,7 @@ end _test(Formulation(pwl_costs = Gar1962.PwlCosts())) _test(Formulation(pwl_costs = CarArr2006.PwlCosts())) _test(Formulation(pwl_costs = KnuOstWat2018.PwlCosts())) - _small_test( + _test( Formulation(ramping = WanHob2016.Ramping()), instances = ["test/case14-flex"], ) diff --git a/test/runtests.jl b/test/runtests.jl index 56cade9..d00f9ac 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -8,8 +8,6 @@ using UnitCommitment push!(Base.LOAD_PATH, @__DIR__) UnitCommitment._setup_logger(level = Base.CoreLogging.Error) -const ENABLE_LARGE_TESTS = ("UCJL_LARGE_TESTS" in keys(ENV)) - @testset "UnitCommitment" begin include("usage.jl") @testset "import" begin