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

Enable branch violation reporting #131

Merged
merged 2 commits into from
Jan 19, 2022
Merged

Enable branch violation reporting #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4938aba
enabling violation reporting
bknueven Jan 12, 2022
26faea2
updating baselines
bknueven Jan 12, 2022
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
2 changes: 1 addition & 1 deletion prescient/simulator/reporting_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def setup_line_detail(self, options, stats_manager: StatsManager):
'Minute': lambda ops,l: ops.timestamp.minute,
'Line': lambda ops,l: l,
'Flow': lambda ops,l: _round(ops.observed_flow_levels[l]),
#'Violation': lambda ops,l: _round(ops.observed_flow_violation_levels[l]),
'Violation': lambda ops,l: _round(ops.observed_flow_violation_levels[l]),
}
line_writer = CsvMultiRowReporter.from_dict(line_file, line_entries_per_hour, line_columns)
stats_manager.register_for_sced_stats(line_writer.write_record)
Expand Down
1 change: 1 addition & 0 deletions .../simulator_tests/test_cases/deterministic_shortcut_output_baseline/contingency_detail.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Date,Hour,Minute,Contingency,Line,Flow,Violation
14 changes: 7 additions & 7 deletions tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/daily_summary.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Date,Demand,Renewables available,Renewables used,Renewables penetration rate,Average price,Fixed costs,Generation costs,Load shedding,Over generation,Reserve shortfall,Renewables curtailment,Number on/offs,Sum on/off ramps,Sum nominal ramps,Renewables energy payments,Renewables uplift payments,Thermal energy payments,Thermal uplift payments,Total energy payments,Total uplift payments,Total reserve payments,Total payments,Average payments
2020-07-10,0.0,0.0,0.0,0.0,0.0,17642.4,9212.89,0.0,0.0,0.0,0.0,0,0.0,153.3,0.0,0.0,33608.471327,0.0,33608.471327,0.0,0.0,33608.471327,0.0
2020-07-11,0.0,0.0,0.0,0.0,0.0,17642.4,12832.72,0.0,0.0,0.0,0.0,0,0.0,92.0,0.0,0.0,39600.608557,0.0,39600.608557,0.0,0.0,39600.608557,0.0
2020-07-12,0.0,0.0,0.0,0.0,0.0,17642.4,13047.71,0.0,0.0,0.0,0.0,0,0.0,107.3,0.0,0.0,38475.083438,0.0,38475.083438,0.0,0.0,38475.083438,0.0
2020-07-13,0.0,0.0,0.0,0.0,0.0,17642.4,15572.03,0.0,0.0,0.0,0.0,0,0.0,138.0,0.0,0.0,37872.046953,0.0,37872.046953,0.0,0.0,37872.046953,0.0
2020-07-14,0.0,0.0,0.0,0.0,0.0,17642.4,15144.095,0.0,0.0,0.0,0.0,0,0.0,183.9,0.0,0.0,41869.528294,0.0,41869.528294,0.0,0.0,41869.528294,0.0
2020-07-15,0.0,0.0,0.0,0.0,0.0,17642.4,14083.79,0.0,0.0,0.0,0.0,0,0.0,153.3,0.0,0.0,39068.319208,0.0,39068.319208,0.0,0.0,39068.319208,0.0
2020-07-16,0.0,0.0,0.0,0.0,0.0,17642.4,14730.805,0.0,0.0,0.0,0.0,0,0.0,153.2,0.0,0.0,51400.563617,0.0,51400.563617,0.0,0.0,51400.563617,0.0
2020-07-10,0.0,0.0,0.0,0.0,0.0,17642.4,9212.89,0.0,0.0,0.0,0.0,0,0.0,153.3,0.0,0.0,33608.471327,0.0,0.0,0.0,0.0,0.0,0.0
2020-07-11,0.0,0.0,0.0,0.0,0.0,17642.4,12832.72,0.0,0.0,0.0,0.0,0,0.0,92.0,0.0,0.0,39600.608557,0.0,0.0,0.0,0.0,0.0,0.0
2020-07-12,0.0,0.0,0.0,0.0,0.0,17642.4,13047.71,0.0,0.0,0.0,0.0,0,0.0,107.3,0.0,0.0,38475.083438,0.0,0.0,0.0,0.0,0.0,0.0
2020-07-13,0.0,0.0,0.0,0.0,0.0,17642.4,15572.03,0.0,0.0,0.0,0.0,0,0.0,138.0,0.0,0.0,37872.046953,0.0,0.0,0.0,0.0,0.0,0.0
2020-07-14,0.0,0.0,0.0,0.0,0.0,17642.4,15144.095,0.0,0.0,0.0,0.0,0,0.0,183.9,0.0,0.0,41869.528294,0.0,0.0,0.0,0.0,0.0,0.0
2020-07-15,0.0,0.0,0.0,0.0,0.0,17642.4,14083.79,0.0,0.0,0.0,0.0,0,0.0,153.3,0.0,0.0,39068.319208,0.0,0.0,0.0,0.0,0.0,0.0
2020-07-16,0.0,0.0,0.0,0.0,0.0,17642.4,14730.805,0.0,0.0,0.0,0.0,0,0.0,153.2,0.0,0.0,51400.563617,0.0,0.0,0.0,0.0,0.0,0.0
2 changes: 1 addition & 1 deletion tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/line_detail.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Date,Hour,Minute,Line,Flow
Date,Hour,Minute,Line,Flow,Violation
2 changes: 1 addition & 1 deletion ...tor_tests/test_cases/deterministic_shortcut_output_baseline/overall_simulation_output.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Total demand,Total fixed costs,Total generation costs,Total costs,Total load shedding,Total over generation,Total reserve shortfall,Total renewables curtailment,Total on/offs,Total sum on/off ramps,Total sum nominal ramps,Maximum observed demand,Overall renewables penetration rate,Cumulative average price,Total energy payments,Total reserve payments,Total uplift payments,Total payments,Cumulative average payments
0,123496.8,94624.04,218120.84,0,0,0,0,0,0,981,0,0,0,0,0,0,0,0
0.0,123496.8,94624.04,218120.84,0.0,0.0,0.0,0.0,0,0.0,981.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
12 changes: 6 additions & 6 deletions tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/runtimes.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,14 @@ Date,Hour,Minute,Type,Solve Time
2020-07-13,23,30,SCED,0.0
2020-07-13,23,0,Hourly Average,0.0
2020-07-14,0,0,SCED,0.0
2020-07-14,0,30,SCED,0.0
2020-07-14,0,0,Hourly Average,0.0
2020-07-14,1,0,SCED,0.0
2020-07-14,0,30,SCED,0.01
2020-07-14,0,0,Hourly Average,0.005
2020-07-14,1,0,SCED,0.01
2020-07-14,1,30,SCED,0.0
2020-07-14,1,0,Hourly Average,0.0
2020-07-14,2,0,SCED,0.0
2020-07-14,1,0,Hourly Average,0.005
2020-07-14,2,0,SCED,0.01
2020-07-14,2,30,SCED,0.0
2020-07-14,2,0,Hourly Average,0.0
2020-07-14,2,0,Hourly Average,0.005
2020-07-14,3,0,SCED,0.0
2020-07-14,3,30,SCED,0.0
2020-07-14,3,0,Hourly Average,0.0
Expand Down
337 changes: 337 additions & 0 deletions tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/virtual_detail.csv
View file
Open in desktop

Large diffs are not rendered by default.

338 changes: 169 additions & 169 deletions tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/bus_detail.csv
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ...imulator_tests/test_cases/deterministic_simulation_output_baseline/contingency_detail.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Date,Hour,Minute,Contingency,Line,Flow,Violation
16 changes: 8 additions & 8 deletions tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/daily_summary.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Date,Demand,Renewables available,Renewables used,Renewables penetration rate,Average price,Fixed costs,Generation costs,Load shedding,Over generation,Reserve shortfall,Renewables curtailment,Number on/offs,Sum on/off ramps,Sum nominal ramps
2020-07-10,37897.34184808332,19645.391666666674,12949.879596670002,34.17094435958428,12.748937105424863,396759.41999999987,86391.407684,0.0,0.0,0.0,6695.512069663334,6,200.0,840.5472204
2020-07-11,38783.78513,6989.441666666667,6953.828693003301,17.929731896189736,16.76170190627291,490154.95999999996,159927.28514599998,0.0,50.5145498,0.0,35.61297532999985,7,114.0,1325.8508279999999
2020-07-12,40990.48953200001,8849.016666666666,8703.455469033299,21.2328653997625,15.49864188384584,480499.4799999998,154797.43790000002,1011.352359,102.72135800000001,0.0,145.56119930000006,7,170.0,1902.4788899999999
2020-07-13,42473.69581324999,24922.149999999998,23954.489378002996,56.39841063826193,7.4053673393305,279284.37000000005,35248.9497561,1596.60451,0.0,0.0,967.6606216966668,12,292.0,935.2936199999999
2020-07-14,43300.527647083334,22069.25833333334,20248.104073597002,46.76179523406082,12.15586617888372,433602.4999999998,92752.919553,307.94824900000003,0.0,0.0,1821.1542600366668,16,616.0,1346.6591334
2020-07-15,45185.63829791665,36014.54166666667,28683.866696997,63.48005201980186,6.736551274390975,273314.48000000004,31080.889260000004,824.95606,0.0,0.0,7330.674970336335,12,384.0,738.8277820000001
2020-07-16,47179.379054083336,24602.416666666664,18569.376155366004,39.35909401028634,14.138041736101853,461642.2599999998,205381.77015,654.35547,0.0,0.0,6033.0405126669975,15,742.0,1728.54864
Date,Demand,Renewables available,Renewables used,Renewables penetration rate,Average price,Fixed costs,Generation costs,Load shedding,Over generation,Reserve shortfall,Renewables curtailment,Number on/offs,Sum on/off ramps,Sum nominal ramps
2020-07-10,37897.341848,19645.391667,12949.879597,51.908605,12.748937,396759.42,86391.407684,0.0,0.0,0.0,6695.51207,6,200.0,840.54722
2020-07-11,38783.78513,6989.441667,6953.828693,21.812189,16.761702,490154.96,159927.285146,0.0,50.51455,0.0,35.612975,7,114.0,1325.850828
2020-07-12,40990.489532,8849.016667,8703.455469,27.737089,15.498642,480499.48,154797.4379,1011.352359,102.721358,0.0,145.561199,7,170.0,1902.47889
2020-07-13,42473.695813,24922.15,23954.489378,141.553229,7.405367,279284.37,35248.949756,1596.60451,0.0,0.0,967.660622,12,292.0,935.29362
2020-07-14,43300.527647,22069.258333,20248.104074,89.024274,12.155866,433602.5,92752.919553,307.948249,0.0,0.0,1821.15426,16,616.0,1346.659133
2020-07-15,45185.638298,36014.541667,28683.866697,182.969983,6.736551,273314.48,31080.88926,824.95606,0.0,0.0,7330.67497,12,384.0,738.827782
2020-07-16,47179.379054,24602.416667,18569.376155,66.424418,14.138042,461642.26,205381.77015,654.35547,0.0,0.0,6033.040513,15,742.0,1728.54864
Loading