-
Notifications
You must be signed in to change notification settings - Fork 134
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.
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
Features/schedule for flow #666
Open
c-koehl
wants to merge
53
commits into
oemof:dev
Choose a base branch
from
c-koehl:features/schedule_for_flow
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 29 commits
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
c34d5e7
Add schedule for flows
c49a010
Adapted existing test files
0887645
Adapted existing tests for scheduled flows
b760396
added constraint and variables to docstring
ea2e2ff
Added flexible schedule
78fceff
Added new `whatsnew` version file
8bd7dda
Fixed if statement according to Style Guide
650f9ec
Fixed boolean logic mistake
e264e5a
Clearified docstring for penalty parameters
a9ca25a
Clarified doc for _pos _neg parameters/variables
46cc201
Improved code to pep8 standards
c7882a9
Improved code to pep8 standards
d5e5f6c
Added constraint test for scheduled flows
2d89775
Added flow_scheduled.lp file for testing
151576d
Improve test for flow schedule
97d94b0
Merge branch 'dev' into features/schedule_for_flow
c-koehl 31397a1
Rename slack_neg and slack_pos to schedule_slack
bd43f3e
Deleted unnecessary print statement
a7709af
Deleted unnecessary else statement
cbabaa7
Replaced lp file due to new variable names
f71ae4a
Replaced lp file due to new variable names
54fa08e
Merge branch
4a7106f
Renamed added parameters
c65349c
add csv
fab3209
renamed csv file
810ea70
Merge upstream dev into schedule_for_flows
uvchik ecf0c67
Fix merge in blocks
uvchik 0b07a2c
Merge branch 'dev' into features/schedule_for_flow
uvchik 36d7ad0
Fix pep8 issues
uvchik 2a66fc2
Fix codacy issue
uvchik abab4ea
Fix another codacy issue
uvchik 5f63483
Remove default value dor schedule penalty costs
3048635
mind the dynamic property of sequence
5b5d328
fixed logical bug in schedule attribute validation
15d32d1
fixed logical bug in schedule attribute validation
0cd492b
Adapt tests to removed schedulecosts default value
564c7e7
added test for schedule attributes validation
9a2b0fd
Merge branch 'features/schedule_for_flow' of https://github.com/c-koe…
a31aed0
Merge branch 'dev' into features/schedule_for_flow
c51772b
Added whatsnew file
2c3f8f1
Delete old whatsnew file
0436ab1
Added missing line at end of file
134ec9a
Added schedule attributes to Flow class
4ba1c2c
Deleted files added by mistake
c948e6d
Renamed penalty_costs to schedule_costs
346e687
Added ValueError tests for schedule attributes
b6cefa2
Fixed merge conflict
5ec2d0d
Fixed merge conflict
40e0a9f
Merge pull request #4 from oemof/dev
f37c523
Added newfeatures to whatsnew file
309ba2e
Merge branch 'dev' into features/schedule_for_flow
5a7a4de
Merge branch 'dev' into features/schedule_for_flow
589d230
Deleted todo from older version
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
\* Source Pyomo model name=Model *\ | ||
|
||
min | ||
objective: | ||
+999 Flow_schedule_slack_neg(boiler_penalty_bus_th_penalty_0) | ||
+999 Flow_schedule_slack_neg(boiler_penalty_bus_th_penalty_1) | ||
+999 Flow_schedule_slack_neg(boiler_penalty_bus_th_penalty_2) | ||
+800 Flow_schedule_slack_pos(boiler_penalty_bus_th_penalty_1) | ||
+900 Flow_schedule_slack_pos(boiler_penalty_bus_th_penalty_2) | ||
|
||
s.t. | ||
|
||
c_e_Bus_balance(bus_gas_0)_: | ||
+1 flow(bus_gas_boiler_penalty_0) | ||
= 0 | ||
|
||
c_e_Bus_balance(bus_gas_1)_: | ||
+1 flow(bus_gas_boiler_penalty_1) | ||
= 0 | ||
|
||
c_e_Bus_balance(bus_gas_2)_: | ||
+1 flow(bus_gas_boiler_penalty_2) | ||
= 0 | ||
|
||
c_e_Bus_balance(bus_th_penalty_0)_: | ||
+1 flow(boiler_penalty_bus_th_penalty_0) | ||
= 0 | ||
|
||
c_e_Bus_balance(bus_th_penalty_1)_: | ||
+1 flow(boiler_penalty_bus_th_penalty_1) | ||
= 0 | ||
|
||
c_e_Bus_balance(bus_th_penalty_2)_: | ||
+1 flow(boiler_penalty_bus_th_penalty_2) | ||
= 0 | ||
|
||
c_e_Transformer_relation(boiler_penalty_bus_gas_bus_th_penalty_0)_: | ||
-1 flow(boiler_penalty_bus_th_penalty_0) | ||
+1 flow(bus_gas_boiler_penalty_0) | ||
= 0 | ||
|
||
c_e_Transformer_relation(boiler_penalty_bus_gas_bus_th_penalty_1)_: | ||
-1 flow(boiler_penalty_bus_th_penalty_1) | ||
+1 flow(bus_gas_boiler_penalty_1) | ||
= 0 | ||
|
||
c_e_Transformer_relation(boiler_penalty_bus_gas_bus_th_penalty_2)_: | ||
-1 flow(boiler_penalty_bus_th_penalty_2) | ||
+1 flow(bus_gas_boiler_penalty_2) | ||
= 0 | ||
|
||
c_e_Flow_schedule_constr(boiler_penalty_bus_th_penalty_1)_: | ||
-1 Flow_schedule_slack_neg(boiler_penalty_bus_th_penalty_1) | ||
+1 Flow_schedule_slack_pos(boiler_penalty_bus_th_penalty_1) | ||
+1 flow(boiler_penalty_bus_th_penalty_1) | ||
= 300 | ||
|
||
c_e_Flow_schedule_constr(boiler_penalty_bus_th_penalty_2)_: | ||
-1 Flow_schedule_slack_neg(boiler_penalty_bus_th_penalty_2) | ||
+1 Flow_schedule_slack_pos(boiler_penalty_bus_th_penalty_2) | ||
+1 flow(boiler_penalty_bus_th_penalty_2) | ||
= 50 | ||
|
||
c_e_ONE_VAR_CONSTANT: | ||
ONE_VAR_CONSTANT = 1.0 | ||
|
||
bounds | ||
0 <= flow(boiler_penalty_bus_th_penalty_0) <= 200 | ||
0 <= flow(boiler_penalty_bus_th_penalty_1) <= 200 | ||
0 <= flow(boiler_penalty_bus_th_penalty_2) <= 200 | ||
0 <= flow(bus_gas_boiler_penalty_0) <= +inf | ||
0 <= flow(bus_gas_boiler_penalty_1) <= +inf | ||
0 <= flow(bus_gas_boiler_penalty_2) <= +inf | ||
0 <= Flow_schedule_slack_pos(boiler_penalty_bus_th_penalty_1) <= +inf | ||
0 <= Flow_schedule_slack_pos(boiler_penalty_bus_th_penalty_2) <= +inf | ||
0 <= Flow_schedule_slack_neg(boiler_penalty_bus_th_penalty_0) <= +inf | ||
0 <= Flow_schedule_slack_neg(boiler_penalty_bus_th_penalty_1) <= +inf | ||
0 <= Flow_schedule_slack_neg(boiler_penalty_bus_th_penalty_2) <= +inf | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This error is not tested. Please add a test.