Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve performance to create constraints over clustered year #1017

Merged
merged 14 commits into from
Feb 14, 2025
Merged

Improve performance to create constraints over clustered year #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c53bbb3
Improve performance when creating expressions for timeframe constraints
datejada Feb 5, 2025
c99898e
Update duration for incoming inflows
datejada Feb 5, 2025
e518d61
Fixing update of the JuMP expression
datejada Feb 5, 2025
64dc814
Calculate only if weight > 0
datejada Feb 6, 2025
c48b308
[WIP] Refactor add_expression*over_clustered_year to use DuckDB
abelsiqueira Feb 7, 2025
6d5ceee
[WIP] Fix the loop over rep_periods and decrease benchmark time
abelsiqueira Feb 8, 2025
5ccd848
[WIP] Fix computing inflows_profile_aggregation
abelsiqueira Feb 8, 2025
6d4fd78
[WIP] Fix query for the EU case
abelsiqueira Feb 8, 2025
ae97740
[WIP] Compute inflows directly in DuckDB
abelsiqueira Feb 8, 2025
b7d17b6
[WIP] Remove old comments
abelsiqueira Feb 12, 2025
33bd5fa
[WIP] Change samples back to 2 in benchmark/benchmarks.jl
abelsiqueira Feb 12, 2025
4d2998b
Update max storage level profile names
datejada Feb 13, 2025
34cebec
Create and error instead of creating the table
datejada Feb 13, 2025
1cf8c1d
Slightly change the missing table error message
abelsiqueira Feb 14, 2025
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
12 changes: 6 additions & 6 deletions benchmark/EU/assets-profiles.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,14 @@ CY_Solar,2050,availability,CY_Solar
OBZLL_Wind_Offshore,2050,availability,OBZLL_Wind_Offshore
OBZLL_E_Demand,2050,demand,OBZLL_E_Demand
FR_Hydro_Reservoir,2050,min_storage_level,FR_Hydro_Reservoir_Min_Storage_Level
FR_Hydro_Reservoir,2050,max-storage-level,FR_Hydro_Reservoir_Max_Storage_Level
FR_Hydro_Reservoir,2050,max_storage_level,FR_Hydro_Reservoir_Max_Storage_Level
CH_Pump_Hydro_Open,2050,min_storage_level,CH_Pump_Hydro_Open_Min_Storage_Level
CH_Pump_Hydro_Open,2050,max-storage-level,CH_Pump_Hydro_Open_Max_Storage_Level
CH_Pump_Hydro_Open,2050,max_storage_level,CH_Pump_Hydro_Open_Max_Storage_Level
SE_Hydro_Reservoir,2050,min_storage_level,SE_Hydro_Reservoir_Min_Storage_Level
SE_Hydro_Reservoir,2050,max-storage-level,SE_Hydro_Reservoir_Max_Storage_Level
SE_Hydro_Reservoir,2050,max_storage_level,SE_Hydro_Reservoir_Max_Storage_Level
NO_Hydro_Reservoir,2050,min_storage_level,NO_Hydro_Min_Storage_Level
NO_Hydro_Reservoir,2050,max-storage-level,NO_Hydro_Max_Storage_Level
NO_Hydro_Reservoir,2050,max_storage_level,NO_Hydro_Max_Storage_Level
SK_Hydro_Reservoir,2050,min_storage_level,SK_Hydro_Reservoir_Min_Storage_Level
SK_Hydro_Reservoir,2050,max-storage-level,SK_Hydro_Reservoir_Max_Storage_Level
SK_Hydro_Reservoir,2050,max_storage_level,SK_Hydro_Reservoir_Max_Storage_Level
FI_Hydro_Reservoir,2050,min_storage_level,FI_Hydro_Reservoir_Min_Storage_Level
FI_Hydro_Reservoir,2050,max-storage-level,FI_Hydro_Reservoir_Max_Storage_Level
FI_Hydro_Reservoir,2050,max_storage_level,FI_Hydro_Reservoir_Max_Storage_Level
12 changes: 6 additions & 6 deletions benchmark/EU/assets-timeframe-profiles.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
asset,commission_year,profile_type,profile_name
FR_Hydro_Reservoir,2050,min_storage_level,FR_Hydro_Reservoir_Min_Storage_Level
FR_Hydro_Reservoir,2050,max-storage-level,FR_Hydro_Reservoir_Max_Storage_Level
FR_Hydro_Reservoir,2050,max_storage_level,FR_Hydro_Reservoir_Max_Storage_Level
CH_Pump_Hydro_Open,2050,min_storage_level,CH_Pump_Hydro_Open_Min_Storage_Level
CH_Pump_Hydro_Open,2050,max-storage-level,CH_Pump_Hydro_Open_Max_Storage_Level
CH_Pump_Hydro_Open,2050,max_storage_level,CH_Pump_Hydro_Open_Max_Storage_Level
SE_Hydro_Reservoir,2050,min_storage_level,SE_Hydro_Reservoir_Min_Storage_Level
SE_Hydro_Reservoir,2050,max-storage-level,SE_Hydro_Reservoir_Max_Storage_Level
SE_Hydro_Reservoir,2050,max_storage_level,SE_Hydro_Reservoir_Max_Storage_Level
NO_Hydro_Reservoir,2050,min_storage_level,NO_Hydro_Min_Storage_Level
NO_Hydro_Reservoir,2050,max-storage-level,NO_Hydro_Max_Storage_Level
NO_Hydro_Reservoir,2050,max_storage_level,NO_Hydro_Max_Storage_Level
SK_Hydro_Reservoir,2050,min_storage_level,SK_Hydro_Reservoir_Min_Storage_Level
SK_Hydro_Reservoir,2050,max-storage-level,SK_Hydro_Reservoir_Max_Storage_Level
SK_Hydro_Reservoir,2050,max_storage_level,SK_Hydro_Reservoir_Max_Storage_Level
FI_Hydro_Reservoir,2050,min_storage_level,FI_Hydro_Reservoir_Min_Storage_Level
FI_Hydro_Reservoir,2050,max-storage-level,FI_Hydro_Reservoir_Max_Storage_Level
FI_Hydro_Reservoir,2050,max_storage_level,FI_Hydro_Reservoir_Max_Storage_Level
2 changes: 1 addition & 1 deletion benchmark/benchmarks.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ energy_problem = EnergyProblem(connection)
SUITE["energy_problem"]["create_model"] = @benchmarkable begin
create_model!($energy_problem)
end samples = 3 evals = 1 seconds = 86400
create_model!(energy_problem)
# create_model!(energy_problem)

# SUITE["energy_problem"]["output"] = @benchmarkable begin
# export_solution_to_csv_files($OUTPUT_FOLDER_BM, $energy_problem)
Expand Down
2 changes: 1 addition & 1 deletion src/constraints/storage.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function add_storage_constraints!(connection, model, variables, constraints, pro
indices,
cons.expressions[:incoming],
cons.expressions[:outgoing],
cons.expressions[:inflows_profile_aggregation],
cons.coefficients[:inflows_profile_aggregation],
)
],
)
Expand Down
8 changes: 1 addition & 7 deletions src/create-model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ function create_model!(energy_problem; kwargs...)
energy_problem.constraints,
energy_problem.profiles,
energy_problem.representative_periods,
energy_problem.years,
energy_problem.timeframe,
energy_problem.model_parameters;
kwargs...,
)
Expand All @@ -40,8 +38,6 @@ function create_model(
constraints,
profiles,
representative_periods,
years,
timeframe,
model_parameters;
write_lp_file = false,
enable_names = true,
Expand Down Expand Up @@ -77,9 +73,7 @@ function create_model(
constraints,
model,
expression_workspace,
representative_periods,
timeframe,
graph,
profiles,
)

## Expressions for multi-year investment
Expand Down
Loading
Loading