Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release notes

## Version 0.8.7 (2026-04-15)

### Bug fixes

* Fixed a bug in the function `check_scenario_profile` resulting in an error, if utilized.

## Version 0.8.6 (2025-11-26)

### Bugfixes
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "EnergyModelsBase"
uuid = "5d7e687e-f956-46f3-9045-6f5a5fd49f50"
authors = ["Lars Hellemo <Lars.Hellemo@sintef.no>, Julian Straus <Julian.Straus@sintef.no>"]
version = "0.8.6"
version = "0.8.7"

[deps]
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
Expand Down
4 changes: 2 additions & 2 deletions docs/src/how-to/utilize-timestruct.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ op_number = length(op_duration)
operational_periods = SimpleTimes(op_number, op_duration)

# output
SimpleTimes{Int64}(11, [4, 2, 1, 1, 2, 4, 2, 1, 1, 2, 4])
SimpleTimes{Int64}(11, [4, 2, 1, 1, 2, 4, 2, 1, 1, 2, 4], 24)
```

In this case, we model the day not with hourly resolution, but only have hourly resolution in the morning and afternoon.
Expand All @@ -60,7 +60,7 @@ Instead, one can also write
operational_periods = SimpleTimes(op_duration)

# output
SimpleTimes{Int64}(11, [4, 2, 1, 1, 2, 4, 2, 1, 1, 2, 4])
SimpleTimes{Int64}(11, [4, 2, 1, 1, 2, 4, 2, 1, 1, 2, 4], 24)
```

and a constructor will automatically deduce that there have to be 11 operational periods.
Expand Down
16 changes: 8 additions & 8 deletions src/checks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -493,28 +493,28 @@ scenario indexing.
"""
function check_scenario_profile(time_profile::TimeProfile, message::String)
# Check on the highest level
bool_osc = check_osc_sub_profile(time_profile, message, true)
bool_scp = check_osc_sub_profile(time_profile, message, true)

# Iterate through the strategic profiles, if existing
if isa(time_profile, StrategicProfile)
for l1_profile ∈ time_profile.vals
sub_msg = "in strategic profiles " * message
bool_osc = check_osc_sub_profile(l1_profile, sub_msg, bool_osc)
bool_scp = check_osc_sub_profile(l1_profile, sub_msg, bool_scp)
if isa(l1_profile, RepresentativeProfile)
for l2_profile ∈ l1_profile.vals
sub_msg = "in representative profiles in strategic profiles " * message
bool_osc = check_osc_sub_profile(l2_profile, sub_msg, bool_osc)
bool_scp = check_osc_sub_profile(l2_profile, sub_msg, bool_scp)
if isa(l2_profile, ScenarioProfile)
for l3_profile ∈ l2_profile.vals
sub_msg = "in scenario profiles in representative profiles in strategic profiles " * message
bool_osc = check_osc_sub_profile(l3_profile, sub_msg, bool_osc)
bool_scp = check_osc_sub_profile(l3_profile, sub_msg, bool_scp)
end
end
end
elseif isa(l1_profile, ScenarioProfile)
for l2_profile ∈ l1_profile.vals
sub_msg = "in scenario profiles in strategic profiles " * message
bool_osc = check_osc_sub_profile(l2_profile, sub_msg, bool_osc)
bool_scp = check_osc_sub_profile(l2_profile, sub_msg, bool_scp)
end
end
end
Expand All @@ -524,11 +524,11 @@ function check_scenario_profile(time_profile::TimeProfile, message::String)
if isa(time_profile, RepresentativeProfile)
for l1_profile ∈ time_profile.vals
sub_msg = "in representative profiles " * message
bool_osc = check_osc_sub_profile(l1_profile, sub_msg, bool_osc)
bool_scp = check_osc_sub_profile(l1_profile, sub_msg, bool_scp)
if isa(l1_profile, ScenarioProfile)
for l2_profile ∈ l1_profile.vals
sub_msg = "in scenario profiles in representative profiles " * message
bool_osc = check_osc_sub_profile(l2_profile, sub_msg, bool_osc)
bool_scp = check_osc_sub_profile(l2_profile, sub_msg, bool_scp)
end
end
end
Expand All @@ -538,7 +538,7 @@ function check_scenario_profile(time_profile::TimeProfile, message::String)
if isa(time_profile, ScenarioProfile)
for l1_profile ∈ time_profile.vals
sub_msg = "in scenario profiles " * message
bool_osc = check_osc_sub_profile(l1_profile, sub_msg, bool_osc)
bool_scp = check_osc_sub_profile(l1_profile, sub_msg, bool_scp)
end
end
return bool_scp
Expand Down
2 changes: 1 addition & 1 deletion src/constraint_functions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ function constraints_opex_fixed(m, n::Sink, 𝒯ᴵⁿᵛ, modeltype::EnergyMode

# Fix the fixed OPEX
for t_inv ∈ 𝒯ᴵⁿᵛ
fix(m[:opex_fixed][n, t_inv], 0, ; force = true)
fix(m[:opex_fixed][n, t_inv], 0; force = true)
end
end

Expand Down
2 changes: 1 addition & 1 deletion src/data_functions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function constraints_data(m, n::Node, 𝒯, 𝒫, modeltype::EnergyModel, data::

# Fix the other emissions to 0 to avoid problems with unconstrained variables
for t ∈ 𝒯, p_em ∈ 𝒫ᵉᵐ
fix(m[:emissions_node][n, t, p_em], 0, ; force = true)
fix(m[:emissions_node][n, t, p_em], 0; force = true)
end
end
function constraints_data(m, n::Node, 𝒯, 𝒫, modeltype::EnergyModel, data::EmissionsProcess)
Expand Down
20 changes: 10 additions & 10 deletions src/structures/data.jl
Original file line number Diff line number Diff line change
Expand Up @@ -215,18 +215,18 @@ When multiple inputs are provided, a constructor directly creates the correspond
[`StartInvData`](@extref EnergyModelsInvestments.StartInvData) type for the investment data.
- **`inv_mode::Investment`** is the chosen investment mode for the technology. The following
investment modes are currently available:
[`BinaryInvestment`](@extref EnergyModelsInvestments),
[`DiscreteInvestment`](@extref EnergyModelsInvestments),
[`ContinuousInvestment`](@extref EnergyModelsInvestments),
[`SemiContinuousInvestment`](@extref EnergyModelsInvestments), or
[`FixedInvestment`](@extref EnergyModelsInvestments).
[`BinaryInvestment`](@extref EnergyModelsInvestments.BinaryInvestment),
[`DiscreteInvestment`](@extref EnergyModelsInvestments.DiscreteInvestment),
[`ContinuousInvestment`](@extref EnergyModelsInvestments.ContinuousInvestment),
[`SemiContinuousInvestment`](@extref EnergyModelsInvestments.SemiContinuousInvestment), or
[`FixedInvestment`](@extref EnergyModelsInvestments.FixedInvestment).
- **`life_mode::LifetimeMode`** is type of handling the lifetime. Several different
alternatives can be used:
[`UnlimitedLife`](@extref EnergyModelsInvestments),
[`StudyLife`](@extref EnergyModelsInvestments),
[`PeriodLife`](@extref EnergyModelsInvestments), or
[`RollingLife`](@extref EnergyModelsInvestments). If `life_mode` is not specified, the
model assumes an [`UnlimitedLife`](@extref EnergyModelsInvestments).
[`UnlimitedLife`](@extref EnergyModelsInvestments.UnlimitedLife),
[`StudyLife`](@extref EnergyModelsInvestments.StudyLife),
[`PeriodLife`](@extref EnergyModelsInvestments.PeriodLife), or
[`RollingLife`](@extref EnergyModelsInvestments.RollingLife). If `life_mode` is not specified, the
model assumes an [`UnlimitedLife`](@extref EnergyModelsInvestments.UnlimitedLife).
"""
abstract type SingleInvData <: InvestmentData end

Expand Down
11 changes: 11 additions & 0 deletions test/test_checks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,17 @@ end
@test_throws AssertionError EMB.check_scenario_profile(tp, "")
end

# Check that valid profiles pass check_scenario_profile without error
valid_profiles = [
FixedProfile(5),
StrategicProfile([FixedProfile(5)]),
StrategicProfile([RepresentativeProfile([FixedProfile(5)])]),
RepresentativeProfile([ScenarioProfile([FixedProfile(5)])]),
]
for tp ∈ valid_profiles
@test EMB.check_scenario_profile(tp, "")
end

# Reactivate logging
EMB.ASSERTS_AS_LOG = true
end
Expand Down
Loading