Merge pull request #148 from oemof/fix/adjust-lp-files-to-pyomo6.7

Update lp files for pyomo6.7
oemof · Dec 4, 2023 · e218b83 · e218b83
2 parents f4fdfa5 + 2b5fc4e
commit e218b83
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 28 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -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>`_
 
 
 

diff --git a/tests/_files/lp_files/extraction_investment_brown_field.lp b/tests/_files/lp_files/extraction_investment_brown_field.lp
@@ -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)
@@ -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)

diff --git a/tests/_files/lp_files/extraction_investment_green_field.lp b/tests/_files/lp_files/extraction_investment_green_field.lp
@@ -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)
@@ -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)

diff --git a/tests/_files/lp_files/multi-period/extraction_investment_brown_field_multi_period.lp b/tests/_files/lp_files/multi-period/extraction_investment_brown_field_multi_period.lp
@@ -1,6 +1,6 @@
 \* Source Pyomo model name=Model *\
 
-min 
+min
 objective:
 +393187.4631175658 ONE_VAR_CONSTANT
 +561.5105784699618 InvestmentFlowBlock_invest(extraction_electricity_0)
@@ -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)

diff --git a/tests/_files/lp_files/multi-period/extraction_investment_green_field_multi_period.lp b/tests/_files/lp_files/multi-period/extraction_investment_green_field_multi_period.lp
@@ -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)
@@ -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)