From af9d15b1180e13b5c67de527cd3cf4cd805ab420 Mon Sep 17 00:00:00 2001 From: Carleton Coffrin Date: Wed, 30 Nov 2022 15:29:29 -0700 Subject: [PATCH 1/2] fix solution output test for infeasible models --- CHANGELOG.md | 1 + test/output.jl | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 593b97bf..6b05b6fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ PowerModels.jl Change Log - Improve linear algebra test robustness (#827) - Fix `make_multinetwork` and add test (#823) - Fix SDP solution reporting consistency (#833) +- Fix solution output api test for infeasible models ### v0.19.6 - Add specialized version of `sol_component_fixed` for PowerModels (#821) diff --git a/test/output.jl b/test/output.jl index b396c10e..10b8dc0e 100644 --- a/test/output.jl +++ b/test/output.jl @@ -5,7 +5,9 @@ @test haskey(result, "optimizer") == true @test haskey(result, "termination_status") == true + @test result["termination_status"] == LOCALLY_SOLVED @test haskey(result, "primal_status") == true + @test result["primal_status"] == FEASIBLE_POINT @test haskey(result, "dual_status") == true @test haskey(result, "objective") == true @test haskey(result, "objective_lb") == true @@ -33,12 +35,13 @@ @test haskey(result, "optimizer") @test haskey(result, "termination_status") + @test result["termination_status"] == INFEASIBLE @test haskey(result, "primal_status") + @test result["primal_status"] == NO_SOLUTION @test haskey(result, "dual_status") @test haskey(result, "solve_time") @test haskey(result, "solution") @test !isnan(result["solve_time"]) - @test length(result["solution"]) == 0 end end From 3a17fa6f4a9aac13f64e8bce238a7e3f996b9330 Mon Sep 17 00:00:00 2001 From: Carleton Coffrin Date: Wed, 30 Nov 2022 15:30:08 -0700 Subject: [PATCH 2/2] prep for release --- CHANGELOG.md | 5 ++++- Project.toml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b05b6fd..0c8d1df1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,13 @@ PowerModels.jl Change Log ========================= ### Staged +- nothing + +### v0.19.7 - Improve linear algebra test robustness (#827) - Fix `make_multinetwork` and add test (#823) - Fix SDP solution reporting consistency (#833) -- Fix solution output api test for infeasible models +- Fix solution output test for infeasible models ### v0.19.6 - Add specialized version of `sol_component_fixed` for PowerModels (#821) diff --git a/Project.toml b/Project.toml index a7b80cff..8fcfe378 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "PowerModels" uuid = "c36e90e8-916a-50a6-bd94-075b64ef4655" authors = ["Carleton Coffrin"] repo = "https://github.com/lanl-ansi/PowerModels.jl" -version = "0.19.6" +version = "0.19.7" [deps] InfrastructureModels = "2030c09a-7f63-5d83-885d-db604e0e9cc0"