From 8ccf1cc65d41ac1c0e1548d598a2d075e4a795ff Mon Sep 17 00:00:00 2001 From: Lars Hellemo Date: Thu, 9 Apr 2026 15:59:09 +0200 Subject: [PATCH 1/4] Add support for JuMP.AbstractModel and simplify optional model passing code. --- src/model.jl | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/src/model.jl b/src/model.jl index 7c49960..bf7340b 100644 --- a/src/model.jl +++ b/src/model.jl @@ -2,7 +2,7 @@ create_model( case::Case, modeltype::EnergyModel, - m::JuMP.Model; + m::JuMP.AbstractModel = JuMP.Model(); check_timeprofiles::Bool = true, check_any_data::Bool = true, ) @@ -32,7 +32,7 @@ Create the model and call all required functions. function create_model( case::Case, modeltype::EnergyModel, - m::JuMP.Model; + m::JuMP.AbstractModel = JuMP.Model(); check_timeprofiles::Bool = true, check_any_data::Bool = true, ) @@ -85,34 +85,17 @@ function create_model( return m end -function create_model( - case::Case, - modeltype::EnergyModel; - check_timeprofiles::Bool = true, - check_any_data::Bool = true, -) - m = JuMP.Model() - create_model(case, modeltype, m; check_timeprofiles, check_any_data) -end + function create_model( case::Dict, modeltype::EnergyModel, - m::JuMP.Model; + m::JuMP.AbstractModel = JuMP.Model(); check_timeprofiles::Bool = true, check_any_data::Bool = true, ) case_new = Case(case[:T], case[:products], [case[:nodes], case[:links]]) create_model(case_new, modeltype, m; check_timeprofiles, check_any_data) end -function create_model( - case::Dict, - modeltype::EnergyModel; - check_timeprofiles::Bool = true, - check_any_data::Bool = true, -) - m = JuMP.Model() - create_model(case, modeltype, m; check_timeprofiles, check_any_data) -end """ variables_capacity(m, 𝒩::Vector{<:Node}, 𝒳ᵛᵉᶜ, 𝒯, modeltype::EnergyModel) From f8b78d2fe06eba611d27748adefd651b6e51e1d7 Mon Sep 17 00:00:00 2001 From: Lars Hellemo Date: Fri, 10 Apr 2026 16:55:16 +0200 Subject: [PATCH 2/4] Add news entry --- NEWS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.md b/NEWS.md index e74248c..bc24348 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # Release notes +## Unversioned + +* Add support for JuMP.AbstractModel to allow custom model types, e.g. for decomposition. + ## Version 0.10.0 (2026-04-09) ### Breaking changes From 1f02a5c5a9e8d6a0f29e466473f4586ea573155d Mon Sep 17 00:00:00 2001 From: Lars Hellemo Date: Fri, 10 Apr 2026 16:58:03 +0200 Subject: [PATCH 3/4] Add missing header --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index bc24348..75f110c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,8 @@ ## Unversioned +### Minor updates + * Add support for JuMP.AbstractModel to allow custom model types, e.g. for decomposition. ## Version 0.10.0 (2026-04-09) From 0847962c6300384c6f2c0f58a23c4cb8493c3ab7 Mon Sep 17 00:00:00 2001 From: Julian Straus Date: Tue, 14 Apr 2026 17:11:16 +0200 Subject: [PATCH 4/4] Updated version number for new release --- NEWS.md | 2 +- Project.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index a3c9c98..5fa0700 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # Release notes -## Unversioned +## Version 0.10.1 (2026-04-14) ### Minor updates diff --git a/Project.toml b/Project.toml index dbc83d7..c008a8d 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "EnergyModelsBase" uuid = "5d7e687e-f956-46f3-9045-6f5a5fd49f50" authors = ["Lars Hellemo , Julian Straus "] -version = "0.10.0" +version = "0.10.1" [deps] JuMP = "4076af6c-e467-56ae-b986-b466b2749572"