Skip to content

Commit

Permalink
Don't index horizons by subproblems (blue-marble#1090)
Browse files Browse the repository at this point in the history
  • Loading branch information
@anamileva
anamileva authored Jan 31, 2024
1 parent 44c93e0 commit 8b481a9
Show file tree
Hide file tree
Showing 36 changed files with 312 additions and 330 deletions.
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/10_1_w_timepoints_as_horizons/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
1,timepoint,20200101,circular
1,timepoint,20200102,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
timepoint,20200101,circular
timepoint,20200102,circular
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/10_1_w_timepoints_as_horizons/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,1,timepoint,20200101,20200101,20200101
1,1,timepoint,20200102,20200102,20200102
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,timepoint,20200101,20200101,0,20200101,0
1,timepoint,20200102,20200102,0,20200102,0
4 changes: 2 additions & 2 deletions db/csvs_test_examples/temporal/11_1horizon_1period/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
4 changes: 2 additions & 2 deletions db/csvs_test_examples/temporal/11_1horizon_1period/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
6 changes: 3 additions & 3 deletions db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
1,day,203001,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,203001,circular
6 changes: 3 additions & 3 deletions db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,1,day,203001,20300101,20300102
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,day,203001,20300101,0,20300102,0
6 changes: 3 additions & 3 deletions db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
1,day,203001,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,203001,circular
6 changes: 3 additions & 3 deletions ...svs_test_examples/temporal/13_1horizon_2periods_single_superperiod/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,1,day,203001,20300101,20300102
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,day,203001,20300101,0,20300102,0
18 changes: 9 additions & 9 deletions db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
1,day,203001,circular
1,year,2020,circular
1,year,2030,circular
1,halfyear,20201,circular
1,halfyear,20202,circular
1,halfyear,20301,circular
1,halfyear,20302,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,203001,circular
year,2020,circular
year,2030,circular
halfyear,20201,circular
halfyear,20202,circular
halfyear,20301,circular
halfyear,20302,circular
18 changes: 9 additions & 9 deletions ...s_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,1,day,203001,20300101,20300102
1,1,year,2020,20200101,20200102
1,1,year,2030,20300101,20300102
1,1,halfyear,20201,20200101,20200101
1,1,halfyear,20202,20200102,20200102
1,1,halfyear,20301,20300101,20300101
1,1,halfyear,20302,20300102,20300102
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,day,203001,20300101,0,20300102,0
1,year,2020,20200101,0,20200102,0
1,year,2030,20300101,0,20300102,0
1,halfyear,20201,20200101,0,20200101,0
1,halfyear,20202,20200102,0,20200102,0
1,halfyear,20301,20300101,0,20300101,0
1,halfyear,20302,20300102,0,20300102,0
8 changes: 4 additions & 4 deletions ...st_examples/temporal/15_1horizon_1period_3subproblems_spinup_lookahead/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
2,day,202002,circular
3,day,202003,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,202002,circular
day,202003,circular
8 changes: 4 additions & 4 deletions ...xamples/temporal/15_1horizon_1period_3subproblems_spinup_lookahead/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200201
2,1,day,202002,20200102,20200301
3,1,day,202003,20200202,20200302
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200201,1
1,day,202002,20200102,1,20200301,1
1,day,202003,20200202,1,20200302,0
4 changes: 2 additions & 2 deletions db/csvs_test_examples/temporal/1_1horizon_1period/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
4 changes: 2 additions & 2 deletions db/csvs_test_examples/temporal/1_1horizon_1period/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/2_2horizons_1period/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
1,day,202002,circular
1,year,2020,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,202002,circular
year,2020,circular
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/2_2horizons_1period/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,1,day,202002,20200201,20200202
1,1,year,2020,20200101,20200202
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,day,202002,20200201,0,20200202,0
1,year,2020,20200101,0,20200202,0
6 changes: 3 additions & 3 deletions db/csvs_test_examples/temporal/3_1horizon_2periods/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
1,day,203001,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,203001,circular
6 changes: 3 additions & 3 deletions db/csvs_test_examples/temporal/3_1horizon_2periods/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,1,day,203001,20300101,20300102
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,day,203001,20300101,0,20300102,0
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/4_1horizon_1period_3subproblems/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
2,day,202002,circular
3,day,202003,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,202002,circular
day,202003,circular
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/4_1horizon_1period_3subproblems/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
2,1,day,202002,20200201,20200202
3,1,day,202003,20200301,20200302
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,day,202002,20200201,0,20200202,0
1,day,202003,20200301,0,20200302,0
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/5_1horizon_1period_3subproblems_3stages/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
2,day,202002,circular
3,day,202003,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,202002,circular
day,202003,circular
20 changes: 10 additions & 10 deletions ...svs_test_examples/temporal/5_1horizon_1period_3subproblems_3stages/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,2,day,202001,20200101,20200102
1,3,day,202001,20200101,20200102
2,1,day,202002,20200201,20200202
2,2,day,202002,20200201,20200202
2,3,day,202002,20200201,20200202
3,1,day,202003,20200301,20200302
3,2,day,202003,20200301,20200302
3,3,day,202003,20200301,20200302
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
2,day,202001,20200101,0,20200102,0
3,day,202001,20200101,0,20200102,0
1,day,202002,20200201,0,20200202,0
2,day,202002,20200201,0,20200202,0
3,day,202002,20200201,0,20200202,0
1,day,202003,20200301,0,20200302,0
2,day,202003,20200301,0,20200302,0
3,day,202003,20200301,0,20200302,0
18 changes: 9 additions & 9 deletions db/csvs_test_examples/temporal/6_1horizon_2periods_10yrs/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
1,day,203001,circular
1,year,2020,circular
1,year,2030,circular
1,halfyear,20201,circular
1,halfyear,20202,circular
1,halfyear,20301,circular
1,halfyear,20302,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
day,203001,circular
year,2020,circular
year,2030,circular
halfyear,20201,circular
halfyear,20202,circular
halfyear,20301,circular
halfyear,20302,circular
18 changes: 9 additions & 9 deletions db/csvs_test_examples/temporal/6_1horizon_2periods_10yrs/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,1,day,203001,20300101,20300102
1,1,year,2020,20200101,20200102
1,1,year,2030,20300101,20300102
1,1,halfyear,20201,20200101,20200101
1,1,halfyear,20202,20200102,20200102
1,1,halfyear,20301,20300101,20300101
1,1,halfyear,20302,20300102,20300102
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,day,203001,20300101,0,20300102,0
1,year,2020,20200101,0,20200102,0
1,year,2030,20300101,0,20300102,0
1,halfyear,20201,20200101,0,20200101,0
1,halfyear,20202,20200102,0,20200102,0
1,halfyear,20301,20300101,0,20300101,0
1,halfyear,20302,20300102,0,20300102,0
6 changes: 3 additions & 3 deletions db/csvs_test_examples/temporal/7_1horizon_12timepoints/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
1,evn_tmp_test,1,circular
balancing_type_horizon,horizon,boundary
day,202001,circular
evn_tmp_test,1,circular
16 changes: 8 additions & 8 deletions db/csvs_test_examples/temporal/7_1horizon_12timepoints/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200112
1,1,evn_tmp_test,1,20200102,20200102
1,1,evn_tmp_test,1,20200104,20200104
1,1,evn_tmp_test,1,20200106,20200106
1,1,evn_tmp_test,1,20200108,20200108
1,1,evn_tmp_test,1,20200110,20200110
1,1,evn_tmp_test,1,20200112,20200112
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200112,0
1,evn_tmp_test,1,20200102,0,20200102,0
1,evn_tmp_test,1,20200104,0,20200104,0
1,evn_tmp_test,1,20200106,0,20200106,0
1,evn_tmp_test,1,20200108,0,20200108,0
1,evn_tmp_test,1,20200110,0,20200110,0
1,evn_tmp_test,1,20200112,0,20200112,0
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/8_1horizon_1period_3subproblems_linked/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
2,day,202002,linked
3,day,202003,linked
balancing_type_horizon,horizon,boundary
day,202001,circular
day,202002,linked
day,202003,linked
8 changes: 4 additions & 4 deletions db/csvs_test_examples/temporal/8_1horizon_1period_3subproblems_linked/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
2,1,day,202002,20200201,20200202
3,1,day,202003,20200301,20200302
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
1,day,202002,20200201,0,20200202,0
1,day,202003,20200301,0,20200302,0
2 changes: 1 addition & 1 deletion db/csvs_test_examples/temporal/8_1horizon_1period_3subproblems_linked/period_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
period,discount_factor,period_start_year,period_end_year
period,discount_factor,period_start_year,period_end_year
2020,1,2020,2021
8 changes: 4 additions & 4 deletions ..._test_examples/temporal/9_1horizon_1period_3subproblems_3stages_linked/horizon_params.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
subproblem_id,balancing_type_horizon,horizon,boundary
1,day,202001,circular
2,day,202002,linked
3,day,202003,linked
balancing_type_horizon,horizon,boundary
day,202001,circular
day,202002,linked
day,202003,linked
20 changes: 10 additions & 10 deletions ...t_examples/temporal/9_1horizon_1period_3subproblems_3stages_linked/horizon_timepoints.csv
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
1,1,day,202001,20200101,20200102
1,2,day,202001,20200101,20200102
1,3,day,202001,20200101,20200102
2,1,day,202002,20200201,20200202
2,2,day,202002,20200201,20200202
2,3,day,202002,20200201,20200202
3,1,day,202003,20200301,20200302
3,2,day,202003,20200301,20200302
3,3,day,202003,20200301,20200302
stage_id,balancing_type_horizon,horizon,tmp_start,tmp_start_spinup_or_lookahead,tmp_end,tmp_end_spinup_or_lookahead
1,day,202001,20200101,0,20200102,0
2,day,202001,20200101,0,20200102,0
3,day,202001,20200101,0,20200102,0
1,day,202002,20200201,0,20200202,0
2,day,202002,20200201,0,20200202,0
3,day,202002,20200201,0,20200202,0
1,day,202003,20200301,0,20200302,0
2,day,202003,20200301,0,20200302,0
3,day,202003,20200301,0,20200302,0
Loading

0 comments on commit 8b481a9

Please sign in to comment.