Merge dev into integrate_TSAM #1154

p-snft · 2025-01-23T05:25:23Z

Update the branch for the TSAM mode to current dev.

Release v0.5.3

There was a warning and a comment that having multiple inputs/outputs for one Sink/Source is unintended but should be possible. I think we can remove that "strong reccomendation" as it just works. To not let beginners fall into the trap of having a dangling Sink or Source, like the old warning also might have prevented, inputs and outputs are now explicitly named arguments without a default.

For Python 3.10+, "|" should be used instead of "or", but or is also incorrect for Python 3.9 (a typing.Union can be used). However, as date is superclass of datetime, giving the superclass shuld imply that the childs are also possible.

BaseModel was an unused superclass just for Model. At the moment it is not planned to have other models. Thus, it makes sense to merge both. Signed-off-by: Patrik Schönfeldt <[email protected]>

It seems to be a desired (and tested) feature to do so, but a typical user will probably not want to do this. So, a warning makes sense.

…-warnings-fixes

Note thatthis is just a workaround. chaned casts chould either work or be prohibited.

The test was confusing, as it added a nominal_value to a Sink. This, however, did not cause an error to be raised as the error that was tested before was first.

Allow sinks/sources to have multiple inputs/outputs

…r classes

…of/oemof-solph into fix-bugs-in-parameter-as-dict

Fix bugs in parameter as dict

Replace assert by pytest use

…o esske-infeasable_message

…om_dev_into_tsam # Conflicts: # src/oemof/solph/flows/_simple_flow_block.py # src/oemof/solph/processing.py

…o_tsam' into pull_request/update_from_dev_into_tsam # Conflicts: # tests/test_scripts/test_solph/test_tsam/test_storage_invest_tsam_integration.py # tests/test_scripts/test_solph/test_tsam/test_storage_tsam_vs_original.py

pep8speaks · 2025-01-23T05:25:36Z

Hello @p-snft! Thanks for opening this PR. We checked the lines you've touched for PEP 8 issues, and found:

In the file examples/tsam/invest_optimize_all_technologies_using_mp_and_tsam.py:

Line 32:80: E501 line too long (85 > 79 characters)
Line 52:80: E501 line too long (145 > 79 characters)
Line 56:80: E501 line too long (94 > 79 characters)
Line 62:80: E501 line too long (106 > 79 characters)
Line 233:80: E501 line too long (82 > 79 characters)
Line 256:80: E501 line too long (80 > 79 characters)

In the file src/oemof/solph/_energy_system.py:

Line 175:80: E501 line too long (82 > 79 characters)
Line 310:5: E301 expected 1 blank line, found 0

In the file src/oemof/solph/components/_generic_storage.py:

Line 784:80: E501 line too long (83 > 79 characters)
Line 1747:9: E306 expected 1 blank line before a nested definition, found 0
Line 2072:17: E123 closing bracket does not match indentation of opening bracket's line

In the file src/oemof/solph/constraints/storage_level.py:

Line 113:80: E501 line too long (92 > 79 characters)
Line 132:47: E241 multiple spaces after ','
Line 248:80: E501 line too long (91 > 79 characters)
Line 267:47: E241 multiple spaces after ','

In the file src/oemof/solph/processing.py:

Line 647:1: E302 expected 2 blank lines, found 1
Line 656:17: E123 closing bracket does not match indentation of opening bracket's line
Line 658:80: E501 line too long (82 > 79 characters)
Line 662:1: E302 expected 2 blank lines, found 1
Line 678:80: E501 line too long (107 > 79 characters)
Line 680:80: E501 line too long (102 > 79 characters)
Line 696:50: E231 missing whitespace after ','
Line 698:80: E501 line too long (80 > 79 characters)

In the file tests/test_scripts/test_solph/test_tsam/test_full_load_hours_and_variable_costs.py:

Line 48:13: E126 continuation line over-indented for hanging indent
Line 50:9: E121 continuation line under-indented for hanging indent

In the file tests/test_scripts/test_solph/test_tsam/test_storage_invest_tsam_integration_without_mp.py:

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

In the file tests/test_scripts/test_solph/test_tsam/test_storage_tsam_integration.py:

Line 57:13: E126 continuation line over-indented for hanging indent
Line 59:9: E121 continuation line under-indented for hanging indent

In the file tests/test_scripts/test_solph/test_tsam/test_storage_tsam_integration_with_segmentation.py:

Line 54:20: E251 unexpected spaces around keyword / parameter equals
Line 55:9: E131 continuation line unaligned for hanging indent

In the file tests/test_scripts/test_solph/test_tsam/test_storage_tsam_integration_with_segmentation_without_mp.py:

Line 55:13: E126 continuation line over-indented for hanging indent

In the file tests/test_scripts/test_solph/test_tsam/test_storage_tsam_vs_original.py:

Line 122:45: E261 at least two spaces before inline comment
Line 122:46: E262 inline comment should start with '# '
Line 122:80: E501 line too long (104 > 79 characters)

examples/basic_example/basic_example.py

+        logging.info(f"Store lp-file in {file_path}.")
+        io_option = {"symbolic_solver_labels": True}
+        energysystem_model.write(file_path, io_options=io_option)


p-snft and others added 30 commits June 25, 2024 11:03

Merge pull request #1083 from oemof/dev

82ffed1

Release v0.5.3

Release v0.5.3

8ed977d

Finalise v0.5.3 whatsnew

48a98c9

Merge pull request #1086 from oemof/v0.5

5834611

Release v0.5.3

Work towards v0.5.4

a68dad5

Update commit count to latest release

28bbd0d

Use badge to compare commits since latest and link to master branch

5d381b0

Merge branch 'dev' into revision/replace-constraint-tests

ed0d677

Improve testability of installation test

4f11cb6

Compare bool according to style guide

4276543

Compare bool according to style guide

23bcc39

Move test_constraints to own directory

7ef38e1

Move create_time_index to helpers

6b1a2b3

Fix type hint in create_time_index

0869463

For Python 3.10+, "|" should be used instead of "or", but or is also incorrect for Python 3.9 (a typing.Union can be used). However, as date is superclass of datetime, giving the superclass shuld imply that the childs are also possible.

Properly test create_time_index()

12f5bcf

Merge BaseModel into Model

83e5645

BaseModel was an unused superclass just for Model. At the moment it is not planned to have other models. Thus, it makes sense to merge both. Signed-off-by: Patrik Schönfeldt <[email protected]>

Warn if model overwrites timeincrement

1b04e70

It seems to be a desired (and tested) feature to do so, but a typical user will probably not want to do this. So, a warning makes sense.

Test (invalid) arguments of OffsetConverter

61a02a5

Adhere to Black

fc12b2a

Delete useless lines

6a87fb4

Test coefficient check in OffsetTransformer

9290ab2

Merge branch 'dev' of http://github.com/oemof/oemof-solph into pandas…

05e5b74

…-warnings-fixes

Extend examples

788df49

Fix style issue

f3df7c3

Avoid chained casts to solph.sequence

6e02ae4

Note thatthis is just a workaround. chaned casts chould either work or be prohibited.

Fix test_check_age_and_lifetime

de5fd70

The test was confusing, as it added a nominal_value to a Sink. This, however, did not cause an error to be raised as the error that was tested before was first.

Add tests for Multi-IO Sink/Source

fb20393

Add multi-IO-Sink/Source to whatsnew

c86c2fb

Merge pull request #1088 from oemof/feature/multi_input_sink

a448f7f

Allow sinks/sources to have multiple inputs/outputs

uvchik and others added 18 commits January 17, 2025 11:22

Extend error message.

61fab34

Rename custom_attributes to custom_properties to be in line with othe…

ef4944a

…r classes

Merge branch 'fix-bugs-in-parameter-as-dict' of http://github.com/oem…

3241fed

…of/oemof-solph into fix-bugs-in-parameter-as-dict

Add missing import

e98d4a2

Fix name of attribute in test

349a800

Add an additional hint to the error message

b249b77

Merge pull request #1152 from oemof/fix-bugs-in-parameter-as-dict

96d174c

Fix bugs in parameter as dict

Apply suggestions from code review

1cce93f

Replace assert by pytest use

Merge branch 'infeasable_message' of github.com:esske/oemof-solph int…

c119923

…o esske-infeasable_message

Fix format of model tests

61151bb

Merge branch 'esske-infeasable_message' into dev

f402c43

update period indices

2391560

Merge remote-tracking branch 'origin/dev' into pull_request/update_fr…

fbd0d2a

…om_dev_into_tsam # Conflicts: # src/oemof/solph/flows/_simple_flow_block.py # src/oemof/solph/processing.py

change Investment to nominal capacity

ee117b1

add check for timeincremt for tsam

633d430

update tsam test

3b13089

added periods of time indices

fab9cfa

p-snft changed the base branch from dev to feature/integrate_tsam January 23, 2025 05:26

github-advanced-security bot found potential problems Jan 23, 2025

View reviewed changes

p-snft changed the title ~~Add TSAM interoperability~~ Merge dev into integrate_TSAM Jan 23, 2025

p-snft marked this pull request as ready for review January 23, 2025 05:39

p-snft and others added 5 commits January 23, 2025 15:19

Adhere to Black

6842ee0

Adhere to Black

050cb5f

Add linebreak in comment

26555a7

Fix imports

5fd1c2e

Do not write lp file to cwd in unit tests

22feb11

p-snft merged commit 414810a into feature/integrate_tsam Jan 23, 2025

p-snft deleted the pull_request/update_from_dev_into_tsam branch January 23, 2025 15:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge dev into integrate_TSAM #1154

Merge dev into integrate_TSAM #1154

p-snft commented Jan 23, 2025 •

edited

Loading

pep8speaks commented Jan 23, 2025

Merge dev into integrate_TSAM #1154

Merge dev into integrate_TSAM #1154

Conversation

p-snft commented Jan 23, 2025 • edited Loading

pep8speaks commented Jan 23, 2025

p-snft commented Jan 23, 2025 •

edited

Loading