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

Jump to bottom

Integrate objective_weighting into TSAM module #1000

Closed
wants to merge 39 commits into from
Closed

Integrate objective_weighting into TSAM module #1000

wants to merge 39 commits into from

Conversation

henhuy
Copy link
Contributor

@henhuy henhuy commented Oct 17, 2023

No description provided.

henhuy and others added 30 commits September 22, 2023 11:50
@henhuy
Add tsam_parameters to ES
ce1618c
@henhuy
Add test for TSAM integration with storage investment
c199f60
@henhuy
Add indexes and sets fr TSAM integration in model
c0d92e0
@henhuy
Refactor TSAM indexes
f3b16d2
@henhuy
Add inter and intra storages in TSAM mode
245e489
@henhuy
Change cluster and timeindex indexes for TSAM mode
3bb86c9
@henhuy
Disaggregate TSAM mode flows and storage SOCs
58a4c22
@henhuy
Integrate new cluster and timeindexes in storage model
d0b007a
@henhuy
Fix timeindex in inter storage balance rule
3ebb8b1
@henhuy
Fix SOC generation from intra SOC
60ab4f9
@henhuy
Fix timeincrement for min and max inter storage levels
fbc98c3
@henhuy
Fix SOC calculation in postprocessing by adding self-discharge to int…
fa21917 
…er SOCs
@henhuy
Add timeindex to aggregation setup in example
fef5305
@henhuy
Minor change
02edc39
@henhuy
Add flow repsentation in v5 storage example
9470465
@henhuy
Ttry to add extreme periods to TSAM aggregation for storage example v5
1565b7f
@henhuy
Fix line lengths
2c3f2aa
@henhuy
Fix F401
4593a55
@henhuy
Fix import order
7684cde
@MaxHiDLR
add example for tsam use
fc0de6f
@MaxHiDLR
add aggregate time series in _helpers
dded16f
@MaxHiDLR
add basic_example csv
eb8afa8
@MaxHiDLR
add example for tsam use
ebfd8fe
@MaxHiDLR
add aggregate time series in _helpers
e96f553
@MaxHiDLR
add basic_example csv
3dbdd73
@MaxHiDLR
Merge remote-tracking branch 'origin/feature/integrate_tsam_seg_objwe…
1807259 
…i' into feature/integrate_tsam_seg_objwei
@MaxHiDLR
functions to generate correct objective weighting for cost function a…
f571759 
…re integrated into the exmaple
@MaxHiDLR
added objetive weighting fo model
69c018b
@MaxHiDLR
add plot SOC for example5
f26b122
@MaxHiDLR
add no investment storage example for simpler debugging
71f1557
@pep8speaks
Copy link

pep8speaks commented Oct 17, 2023 •
edited
Loading

Hello @henhuy! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 47:80: E501 line too long (145 > 79 characters)
Line 51:80: E501 line too long (94 > 79 characters)
Line 57:80: E501 line too long (106 > 79 characters)
Line 93:1: E302 expected 2 blank lines, found 0
Line 98:9: E265 block comment should start with '# '
Line 99:80: E501 line too long (120 > 79 characters)
Line 100:80: E501 line too long (95 > 79 characters)
Line 101:80: E501 line too long (111 > 79 characters)
Line 102:80: E501 line too long (109 > 79 characters)
Line 103:80: E501 line too long (103 > 79 characters)
Line 109:1: E302 expected 2 blank lines, found 1
Line 116:22: E225 missing whitespace around operator
Line 118:80: E501 line too long (81 > 79 characters)
Line 124:80: E501 line too long (93 > 79 characters)
Line 138:1: E302 expected 2 blank lines, found 1
Line 177:5: E303 too many blank lines (2)
Line 206:80: E501 line too long (91 > 79 characters)
Line 209:80: E501 line too long (91 > 79 characters)
Line 211:80: E501 line too long (106 > 79 characters)
Line 212:45: E128 continuation line under-indented for visual indent
Line 212:80: E501 line too long (84 > 79 characters)
Line 213:45: E128 continuation line under-indented for visual indent
Line 213:80: E501 line too long (94 > 79 characters)
Line 215:80: E501 line too long (108 > 79 characters)
Line 215:89: E251 unexpected spaces around keyword / parameter equals
Line 215:91: E251 unexpected spaces around keyword / parameter equals
Line 216:45: E128 continuation line under-indented for visual indent
Line 216:71: E251 unexpected spaces around keyword / parameter equals
Line 216:73: E251 unexpected spaces around keyword / parameter equals
Line 216:80: E501 line too long (86 > 79 characters)
Line 217:45: E128 continuation line under-indented for visual indent
Line 217:80: E501 line too long (94 > 79 characters)
Line 219:5: E265 block comment should start with '# '
Line 219:80: E501 line too long (123 > 79 characters)
Line 220:80: E501 line too long (111 > 79 characters)
Line 221:55: E128 continuation line under-indented for visual indent
Line 221:79: E251 unexpected spaces around keyword / parameter equals
Line 221:80: E501 line too long (107 > 79 characters)
Line 221:81: E251 unexpected spaces around keyword / parameter equals
Line 222:55: E128 continuation line under-indented for visual indent
Line 222:80: E501 line too long (132 > 79 characters)
Line 223:55: E128 continuation line under-indented for visual indent
Line 223:80: E501 line too long (92 > 79 characters)
Line 224:80: E501 line too long (86 > 79 characters)
Line 225:80: E501 line too long (111 > 79 characters)
Line 226:55: E128 continuation line under-indented for visual indent
Line 226:79: E251 unexpected spaces around keyword / parameter equals
Line 226:80: E501 line too long (107 > 79 characters)
Line 226:81: E251 unexpected spaces around keyword / parameter equals
Line 227:55: E128 continuation line under-indented for visual indent
Line 227:80: E501 line too long (132 > 79 characters)
Line 228:55: E128 continuation line under-indented for visual indent
Line 228:80: E501 line too long (92 > 79 characters)
Line 229:80: E501 line too long (86 > 79 characters)
Line 232:80: E501 line too long (83 > 79 characters)
Line 379:42: E251 unexpected spaces around keyword / parameter equals
Line 407:80: E501 line too long (94 > 79 characters)

Line 47:80: E501 line too long (145 > 79 characters)
Line 51:80: E501 line too long (94 > 79 characters)
Line 57:80: E501 line too long (106 > 79 characters)
Line 93:1: E302 expected 2 blank lines, found 0
Line 98:9: E265 block comment should start with '# '
Line 99:80: E501 line too long (120 > 79 characters)
Line 100:80: E501 line too long (95 > 79 characters)
Line 101:80: E501 line too long (111 > 79 characters)
Line 102:80: E501 line too long (109 > 79 characters)
Line 103:80: E501 line too long (103 > 79 characters)
Line 109:1: E302 expected 2 blank lines, found 1
Line 116:22: E225 missing whitespace around operator
Line 118:80: E501 line too long (81 > 79 characters)
Line 124:80: E501 line too long (93 > 79 characters)
Line 135:5: E265 block comment should start with '# '
Line 135:80: E501 line too long (82 > 79 characters)
Line 140:1: E302 expected 2 blank lines, found 1
Line 158:80: E501 line too long (110 > 79 characters)
Line 185:5: E303 too many blank lines (2)
Line 211:5: E303 too many blank lines (2)
Line 215:80: E501 line too long (95 > 79 characters)
Line 218:80: E501 line too long (95 > 79 characters)
Line 223:80: E501 line too long (106 > 79 characters)
Line 224:45: E128 continuation line under-indented for visual indent
Line 224:80: E501 line too long (84 > 79 characters)
Line 225:45: E128 continuation line under-indented for visual indent
Line 225:80: E501 line too long (94 > 79 characters)
Line 227:80: E501 line too long (108 > 79 characters)
Line 227:89: E251 unexpected spaces around keyword / parameter equals
Line 227:91: E251 unexpected spaces around keyword / parameter equals
Line 228:45: E128 continuation line under-indented for visual indent
Line 228:71: E251 unexpected spaces around keyword / parameter equals
Line 228:73: E251 unexpected spaces around keyword / parameter equals
Line 228:80: E501 line too long (86 > 79 characters)
Line 229:45: E128 continuation line under-indented for visual indent
Line 229:80: E501 line too long (94 > 79 characters)
Line 231:5: E265 block comment should start with '# '
Line 231:80: E501 line too long (123 > 79 characters)
Line 232:80: E501 line too long (111 > 79 characters)
Line 233:55: E128 continuation line under-indented for visual indent
Line 233:79: E251 unexpected spaces around keyword / parameter equals
Line 233:80: E501 line too long (107 > 79 characters)
Line 233:81: E251 unexpected spaces around keyword / parameter equals
Line 234:55: E128 continuation line under-indented for visual indent
Line 234:80: E501 line too long (132 > 79 characters)
Line 235:55: E128 continuation line under-indented for visual indent
Line 235:80: E501 line too long (92 > 79 characters)
Line 236:80: E501 line too long (86 > 79 characters)
Line 237:80: E501 line too long (111 > 79 characters)
Line 238:55: E128 continuation line under-indented for visual indent
Line 238:79: E251 unexpected spaces around keyword / parameter equals
Line 238:80: E501 line too long (107 > 79 characters)
Line 238:81: E251 unexpected spaces around keyword / parameter equals
Line 239:55: E128 continuation line under-indented for visual indent
Line 239:80: E501 line too long (132 > 79 characters)
Line 240:55: E128 continuation line under-indented for visual indent
Line 240:80: E501 line too long (92 > 79 characters)
Line 241:80: E501 line too long (86 > 79 characters)
Line 242:5: E265 block comment should start with '# '
Line 245:5: E265 block comment should start with '# '
Line 248:5: E265 block comment should start with '# '
Line 248:80: E501 line too long (81 > 79 characters)
Line 251:9: E265 block comment should start with '# '
Line 253:18: E265 block comment should start with '# '
Line 275:5: E303 too many blank lines (2)
Line 278:22: E201 whitespace after '('
Line 287:80: E501 line too long (95 > 79 characters)
Line 293:13: E265 block comment should start with '# '
Line 312:10: E265 block comment should start with '# '
Line 326:25: E265 block comment should start with '# '
Line 343:25: E265 block comment should start with '# '
Line 401:80: E501 line too long (94 > 79 characters)

Line 47:80: E501 line too long (145 > 79 characters)
Line 51:80: E501 line too long (94 > 79 characters)
Line 57:80: E501 line too long (106 > 79 characters)
Line 113:80: E501 line too long (110 > 79 characters)
Line 124:5: E265 block comment should start with '# '
Line 124:80: E501 line too long (85 > 79 characters)
Line 125:5: E265 block comment should start with '# '
Line 126:5: E265 block comment should start with '# '
Line 126:80: E501 line too long (88 > 79 characters)
Line 127:5: E265 block comment should start with '# '
Line 142:5: E303 too many blank lines (2)
Line 183:5: E303 too many blank lines (2)
Line 186:22: E201 whitespace after '('
Line 195:80: E501 line too long (95 > 79 characters)
Line 312:80: E501 line too long (94 > 79 characters)
Line 352:5: E303 too many blank lines (2)

Line 69:1: E302 expected 2 blank lines, found 1
Line 84:80: E501 line too long (94 > 79 characters)
Line 87:70: E231 missing whitespace after ','
Line 87:80: E501 line too long (112 > 79 characters)
Line 91:80: E501 line too long (90 > 79 characters)
Line 92:80: E501 line too long (86 > 79 characters)
Line 93:80: E501 line too long (100 > 79 characters)
Line 96:39: E225 missing whitespace around operator
Line 97:39: E226 missing whitespace around arithmetic operator
Line 101:64: E251 unexpected spaces around keyword / parameter equals
Line 101:66: E251 unexpected spaces around keyword / parameter equals
Line 101:80: E501 line too long (89 > 79 characters)
Line 102:31: E128 continuation line under-indented for visual indent
Line 102:63: E251 unexpected spaces around keyword / parameter equals
Line 102:65: E251 unexpected spaces around keyword / parameter equals
Line 102:80: E501 line too long (98 > 79 characters)
Line 103:31: E128 continuation line under-indented for visual indent
Line 103:43: E251 unexpected spaces around keyword / parameter equals
Line 103:45: E251 unexpected spaces around keyword / parameter equals
Line 105:80: E501 line too long (136 > 79 characters)
Line 105:111: E251 unexpected spaces around keyword / parameter equals
Line 105:113: E251 unexpected spaces around keyword / parameter equals
Line 106:31: E128 continuation line under-indented for visual indent
Line 106:56: E251 unexpected spaces around keyword / parameter equals
Line 106:58: E251 unexpected spaces around keyword / parameter equals
Line 106:80: E501 line too long (84 > 79 characters)
Line 107:31: E128 continuation line under-indented for visual indent
Line 107:63: E251 unexpected spaces around keyword / parameter equals
Line 107:65: E251 unexpected spaces around keyword / parameter equals
Line 107:80: E501 line too long (98 > 79 characters)
Line 108:31: E128 continuation line under-indented for visual indent
Line 108:61: E251 unexpected spaces around keyword / parameter equals
Line 108:80: E501 line too long (91 > 79 characters)
Line 109:31: E128 continuation line under-indented for visual indent
Line 109:43: E251 unexpected spaces around keyword / parameter equals
Line 109:45: E251 unexpected spaces around keyword / parameter equals
Line 110:9: E124 closing bracket does not match visual indentation
Line 112:80: E501 line too long (136 > 79 characters)
Line 112:111: E251 unexpected spaces around keyword / parameter equals
Line 112:113: E251 unexpected spaces around keyword / parameter equals
Line 113:31: E128 continuation line under-indented for visual indent
Line 113:56: E251 unexpected spaces around keyword / parameter equals
Line 113:58: E251 unexpected spaces around keyword / parameter equals
Line 113:80: E501 line too long (84 > 79 characters)
Line 114:31: E128 continuation line under-indented for visual indent
Line 114:63: E251 unexpected spaces around keyword / parameter equals
Line 114:65: E251 unexpected spaces around keyword / parameter equals
Line 114:80: E501 line too long (98 > 79 characters)
Line 115:31: E128 continuation line under-indented for visual indent
Line 115:43: E251 unexpected spaces around keyword / parameter equals
Line 115:45: E251 unexpected spaces around keyword / parameter equals
Line 116:9: E124 closing bracket does not match visual indentation
Line 171:80: E501 line too long (84 > 79 characters)
Line 181:80: E501 line too long (106 > 79 characters)
Line 189:80: E501 line too long (107 > 79 characters)
Line 210:53: E251 unexpected spaces around keyword / parameter equals
Line 268:1: E305 expected 2 blank lines after class or function definition, found 1
Line 271:1: W391 blank line at end of file

Line 108:49: E261 at least two spaces before inline comment
Line 108:80: E501 line too long (91 > 79 characters)
Line 111:80: E501 line too long (105 > 79 characters)
Line 114:80: E501 line too long (97 > 79 characters)
Line 118:17: E265 block comment should start with '# '
Line 118:80: E501 line too long (101 > 79 characters)
Line 121:80: E501 line too long (80 > 79 characters)
Line 135:13: E265 block comment should start with '# '
Line 292:60: E127 continuation line over-indented for visual indent
Line 293:60: E127 continuation line over-indented for visual indent
Line 293:80: E501 line too long (84 > 79 characters)
Line 294:60: E127 continuation line over-indented for visual indent
Line 294:80: E501 line too long (82 > 79 characters)
Line 295:60: E127 continuation line over-indented for visual indent
Line 301:80: E501 line too long (85 > 79 characters)
Line 307:80: E501 line too long (87 > 79 characters)
Line 308:80: E501 line too long (82 > 79 characters)
Line 325:80: E501 line too long (103 > 79 characters)
Line 328:21: E201 whitespace after '('
Line 328:80: E501 line too long (96 > 79 characters)
Line 329:80: E501 line too long (99 > 79 characters)
Line 330:80: E501 line too long (115 > 79 characters)
Line 332:80: E501 line too long (122 > 79 characters)
Line 333:42: E226 missing whitespace around arithmetic operator
Line 334:80: E501 line too long (107 > 79 characters)

Line 54:1: E302 expected 2 blank lines, found 1
Line 58:35: E231 missing whitespace after ':'
Line 63:5: E123 closing bracket does not match indentation of opening bracket's line
Line 63:5: E125 continuation line with same indent as next logical line
Line 71:80: E501 line too long (97 > 79 characters)
Line 72:80: E501 line too long (118 > 79 characters)
Line 73:80: E501 line too long (108 > 79 characters)
Line 74:80: E501 line too long (117 > 79 characters)
Line 75:80: E501 line too long (103 > 79 characters)
Line 76:80: E501 line too long (96 > 79 characters)
Line 77:80: E501 line too long (111 > 79 characters)
Line 78:80: E501 line too long (86 > 79 characters)
Line 79:80: E501 line too long (82 > 79 characters)
Line 93:80: E501 line too long (92 > 79 characters)
Line 101:80: E501 line too long (82 > 79 characters)
Line 102:80: E501 line too long (117 > 79 characters)
Line 105:80: E501 line too long (110 > 79 characters)
Line 108:80: E501 line too long (91 > 79 characters)
Line 110:80: E501 line too long (98 > 79 characters)
Line 111:80: E501 line too long (108 > 79 characters)
Line 114:80: E501 line too long (92 > 79 characters)
Line 118:80: E501 line too long (199 > 79 characters)
Line 120:80: E501 line too long (84 > 79 characters)
Line 155:80: E501 line too long (92 > 79 characters)
Line 160:46: E225 missing whitespace around operator
Line 160:80: E501 line too long (118 > 79 characters)
Line 160:104: E225 missing whitespace around operator
Line 161:48: E225 missing whitespace around operator
Line 161:73: E225 missing whitespace around operator
Line 161:80: E501 line too long (87 > 79 characters)
Line 162:80: E501 line too long (111 > 79 characters)
Line 163:80: E501 line too long (103 > 79 characters)
Line 164:80: E501 line too long (103 > 79 characters)
Line 168:5: E303 too many blank lines (2)
Line 180:80: E501 line too long (93 > 79 characters)
Line 181:80: E501 line too long (105 > 79 characters)
Line 190:80: E501 line too long (84 > 79 characters)
Line 196:43: E201 whitespace after '{'
Line 198:80: E501 line too long (100 > 79 characters)

Line 130:80: E501 line too long (81 > 79 characters)
Line 133:80: E501 line too long (80 > 79 characters)

Line 538:80: E501 line too long (84 > 79 characters)

Comment last updated at 2023-10-30 08:18:06 UTC

@henhuy henhuy force-pushed the feature/integrate_tsam branch from 7684cde to e72cf9a Compare October 19, 2023 08:04
@henhuy henhuy force-pushed the feature/integrate_tsam branch from 9b1ce21 to ea573dd Compare October 31, 2023 13:35
@henhuy
Copy link
Contributor Author

henhuy commented Nov 1, 2023

reviewed and integrated in #980

@henhuy henhuy closed this Nov 1, 2023
@henhuy henhuy deleted the feature/integrate_tsam_seg_objwei branch November 30, 2023 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@henhuy @pep8speaks @MaxHiDLR