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

Update lp files for pyomo6.7 #148

Merged
merged 3 commits into from
Dec 4, 2023
Merged

Update lp files for pyomo6.7 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
703cac4
Change 0.0 to 0 in some lp files
nailend Dec 4, 2023
032ba55
Add changelog entry
nailend Dec 4, 2023
2b5fc4e
Fix missed 0
nailend Dec 4, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Features
Fixes

* Remove specific dirs from flake8 & isort `#136 <https://github.com/oemof/oemof-tabular/pull/136>`_
* Update lp-files to pyomo6.7 `#148 <https://github.com/oemof/oemof-tabular/pull/148>`_



Expand Down
8 changes: 4 additions & 4 deletions tests/_files/lp_files/extraction_investment_brown_field.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\* Source Pyomo model name=Model *\

min
min
objective:
+50 InvestmentFlowBlock_invest(extraction_electricity_0)
+0.6 flow(gas_extraction_0_0)
Expand Down Expand Up @@ -69,19 +69,19 @@ c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_0)_:
+1 flow(gas_extraction_0_0)
-0.5714285714285713 flow(extraction_heat_0_0)
-2.0 flow(extraction_electricity_0_0)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_1)_:
+1 flow(gas_extraction_0_1)
-0.5714285714285713 flow(extraction_heat_0_1)
-2.0 flow(extraction_electricity_0_1)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_2)_:
+1 flow(gas_extraction_0_2)
-0.5714285714285713 flow(extraction_heat_0_2)
-2.0 flow(extraction_electricity_0_2)
= 0.0
= 0

c_u_ExtractionTurbineCHPBlock_out_flow_relation(extraction_0_0)_:
+1.142857142857143 flow(extraction_heat_0_0)
Expand Down
8 changes: 4 additions & 4 deletions tests/_files/lp_files/extraction_investment_green_field.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\* Source Pyomo model name=Model *\

min
min
objective:
+50 InvestmentFlowBlock_invest(extraction_electricity_0)
+0.6 flow(gas_extraction_0_0)
Expand Down Expand Up @@ -69,19 +69,19 @@ c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_0)_:
+1 flow(gas_extraction_0_0)
-0.5714285714285713 flow(extraction_heat_0_0)
-2.0 flow(extraction_electricity_0_0)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_1)_:
+1 flow(gas_extraction_0_1)
-0.5714285714285713 flow(extraction_heat_0_1)
-2.0 flow(extraction_electricity_0_1)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_2)_:
+1 flow(gas_extraction_0_2)
-0.5714285714285713 flow(extraction_heat_0_2)
-2.0 flow(extraction_electricity_0_2)
= 0.0
= 0

c_u_ExtractionTurbineCHPBlock_out_flow_relation(extraction_0_0)_:
+1.142857142857143 flow(extraction_heat_0_0)
Expand Down
20 changes: 10 additions & 10 deletions tests/_files/lp_files/multi-period/extraction_investment_brown_field_multi_period.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\* Source Pyomo model name=Model *\

min
min
objective:
+393187.4631175658 ONE_VAR_CONSTANT
+561.5105784699618 InvestmentFlowBlock_invest(extraction_electricity_0)
Expand Down Expand Up @@ -237,55 +237,55 @@ c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_0)_:
+1 flow(gas_extraction_0_0)
-0.5714285714285713 flow(extraction_heat_0_0)
-2.0 flow(extraction_electricity_0_0)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_1)_:
+1 flow(gas_extraction_0_1)
-0.5714285714285713 flow(extraction_heat_0_1)
-2.0 flow(extraction_electricity_0_1)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_2)_:
+1 flow(gas_extraction_0_2)
-0.5714285714285713 flow(extraction_heat_0_2)
-2.0 flow(extraction_electricity_0_2)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_1_3)_:
+1 flow(gas_extraction_1_3)
-0.5714285714285713 flow(extraction_heat_1_3)
-2.0 flow(extraction_electricity_1_3)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_1_4)_:
+1 flow(gas_extraction_1_4)
-0.5714285714285713 flow(extraction_heat_1_4)
-2.0 flow(extraction_electricity_1_4)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_1_5)_:
+1 flow(gas_extraction_1_5)
-0.5714285714285713 flow(extraction_heat_1_5)
-2.0 flow(extraction_electricity_1_5)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_2_6)_:
+1 flow(gas_extraction_2_6)
-0.5714285714285713 flow(extraction_heat_2_6)
-2.0 flow(extraction_electricity_2_6)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_2_7)_:
+1 flow(gas_extraction_2_7)
-0.5714285714285713 flow(extraction_heat_2_7)
-2.0 flow(extraction_electricity_2_7)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_2_8)_:
+1 flow(gas_extraction_2_8)
-0.5714285714285713 flow(extraction_heat_2_8)
-2.0 flow(extraction_electricity_2_8)
= 0.0
= 0

c_u_ExtractionTurbineCHPBlock_out_flow_relation(extraction_0_0)_:
+1.142857142857143 flow(extraction_heat_0_0)
Expand Down
20 changes: 10 additions & 10 deletions tests/_files/lp_files/multi-period/extraction_investment_green_field_multi_period.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\* Source Pyomo model name=Model *\

min
min
objective:
+561.5105784699618 InvestmentFlowBlock_invest(extraction_electricity_0)
+386.89361416194254 InvestmentFlowBlock_invest(extraction_electricity_1)
Expand Down Expand Up @@ -236,55 +236,55 @@ c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_0)_:
+1 flow(gas_extraction_0_0)
-0.5714285714285713 flow(extraction_heat_0_0)
-2.0 flow(extraction_electricity_0_0)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_1)_:
+1 flow(gas_extraction_0_1)
-0.5714285714285713 flow(extraction_heat_0_1)
-2.0 flow(extraction_electricity_0_1)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_0_2)_:
+1 flow(gas_extraction_0_2)
-0.5714285714285713 flow(extraction_heat_0_2)
-2.0 flow(extraction_electricity_0_2)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_1_3)_:
+1 flow(gas_extraction_1_3)
-0.5714285714285713 flow(extraction_heat_1_3)
-2.0 flow(extraction_electricity_1_3)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_1_4)_:
+1 flow(gas_extraction_1_4)
-0.5714285714285713 flow(extraction_heat_1_4)
-2.0 flow(extraction_electricity_1_4)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_1_5)_:
+1 flow(gas_extraction_1_5)
-0.5714285714285713 flow(extraction_heat_1_5)
-2.0 flow(extraction_electricity_1_5)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_2_6)_:
+1 flow(gas_extraction_2_6)
-0.5714285714285713 flow(extraction_heat_2_6)
-2.0 flow(extraction_electricity_2_6)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_2_7)_:
+1 flow(gas_extraction_2_7)
-0.5714285714285713 flow(extraction_heat_2_7)
-2.0 flow(extraction_electricity_2_7)
= 0.0
= 0

c_e_ExtractionTurbineCHPBlock_input_output_relation(extraction_2_8)_:
+1 flow(gas_extraction_2_8)
-0.5714285714285713 flow(extraction_heat_2_8)
-2.0 flow(extraction_electricity_2_8)
= 0.0
= 0

c_u_ExtractionTurbineCHPBlock_out_flow_relation(extraction_0_0)_:
+1.142857142857143 flow(extraction_heat_0_0)
Expand Down
Loading