Adjust multi-period constraint tests

oemof · Aug 4, 2023 · 0db730b · 0db730b
1 parent a213d2e
commit 0db730b
Show file tree

Hide file tree

Showing 13 changed files with 641 additions and 597 deletions.
diff --git a/tests/lp_files/connect_investment_multi_period.lp b/tests/lp_files/connect_investment_multi_period.lp
diff --git a/tests/lp_files/periodical_investment_limit.lp b/tests/lp_files/periodical_investment_limit.lp
@@ -27,60 +27,41 @@ c_u_investment_limit_per_period(2)_:
 <= 300
 
 c_e_BusBlock_balance(Bus1_0_0)_:
-+1 flow(Source_Bus1_0_0)
 +1 flow(storage_invest_limit_Bus1_0_0)
++1 flow(Source_Bus1_0_0)
 -1 flow(Bus1_storage_invest_limit_0_0)
 = 0
 
 c_e_BusBlock_balance(Bus1_0_1)_:
-+1 flow(Source_Bus1_0_1)
 +1 flow(storage_invest_limit_Bus1_0_1)
++1 flow(Source_Bus1_0_1)
 -1 flow(Bus1_storage_invest_limit_0_1)
 = 0
 
 c_e_BusBlock_balance(Bus1_1_2)_:
-+1 flow(Source_Bus1_1_2)
 +1 flow(storage_invest_limit_Bus1_1_2)
++1 flow(Source_Bus1_1_2)
 -1 flow(Bus1_storage_invest_limit_1_2)
 = 0
 
 c_e_BusBlock_balance(Bus1_1_3)_:
-+1 flow(Source_Bus1_1_3)
 +1 flow(storage_invest_limit_Bus1_1_3)
++1 flow(Source_Bus1_1_3)
 -1 flow(Bus1_storage_invest_limit_1_3)
 = 0
 
 c_e_BusBlock_balance(Bus1_2_4)_:
-+1 flow(Source_Bus1_2_4)
 +1 flow(storage_invest_limit_Bus1_2_4)
++1 flow(Source_Bus1_2_4)
 -1 flow(Bus1_storage_invest_limit_2_4)
 = 0
 
 c_e_BusBlock_balance(Bus1_2_5)_:
-+1 flow(Source_Bus1_2_5)
 +1 flow(storage_invest_limit_Bus1_2_5)
++1 flow(Source_Bus1_2_5)
 -1 flow(Bus1_storage_invest_limit_2_5)
 = 0
 
-c_e_InvestmentFlowBlock_total_rule(Bus1_storage_invest_limit_0)_:
-+1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_0)
--1 InvestmentFlowBlock_invest(Bus1_storage_invest_limit_0)
-= 0
-
-c_e_InvestmentFlowBlock_total_rule(Bus1_storage_invest_limit_1)_:
--1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_0)
-+1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_1)
--1 InvestmentFlowBlock_invest(Bus1_storage_invest_limit_1)
-+1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_1)
-= 0
-
-c_e_InvestmentFlowBlock_total_rule(Bus1_storage_invest_limit_2)_:
--1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_1)
-+1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_2)
--1 InvestmentFlowBlock_invest(Bus1_storage_invest_limit_2)
-+1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_2)
-= 0
-
 c_e_InvestmentFlowBlock_total_rule(storage_invest_limit_Bus1_0)_:
 +1 InvestmentFlowBlock_total(storage_invest_limit_Bus1_0)
 -1 InvestmentFlowBlock_invest(storage_invest_limit_Bus1_0)
@@ -119,16 +100,23 @@ c_e_InvestmentFlowBlock_total_rule(Source_Bus1_2)_:
 +1 InvestmentFlowBlock_old(Source_Bus1_2)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule_end(Bus1_storage_invest_limit_0)_:
-+1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_0)
+c_e_InvestmentFlowBlock_total_rule(Bus1_storage_invest_limit_0)_:
++1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_0)
+-1 InvestmentFlowBlock_invest(Bus1_storage_invest_limit_0)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule_end(Bus1_storage_invest_limit_1)_:
-+1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_1)
+c_e_InvestmentFlowBlock_total_rule(Bus1_storage_invest_limit_1)_:
+-1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_0)
++1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_1)
+-1 InvestmentFlowBlock_invest(Bus1_storage_invest_limit_1)
++1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_1)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule_end(Bus1_storage_invest_limit_2)_:
-+1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_2)
+c_e_InvestmentFlowBlock_total_rule(Bus1_storage_invest_limit_2)_:
+-1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_1)
++1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_2)
+-1 InvestmentFlowBlock_invest(Bus1_storage_invest_limit_2)
++1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_2)
 = 0
 
 c_e_InvestmentFlowBlock_old_rule_end(storage_invest_limit_Bus1_0)_:
@@ -155,16 +143,16 @@ c_e_InvestmentFlowBlock_old_rule_end(Source_Bus1_2)_:
 +1 InvestmentFlowBlock_old_end(Source_Bus1_2)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule_exo(Bus1_storage_invest_limit_0)_:
-+1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_0)
+c_e_InvestmentFlowBlock_old_rule_end(Bus1_storage_invest_limit_0)_:
++1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_0)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule_exo(Bus1_storage_invest_limit_1)_:
-+1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_1)
+c_e_InvestmentFlowBlock_old_rule_end(Bus1_storage_invest_limit_1)_:
++1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_1)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule_exo(Bus1_storage_invest_limit_2)_:
-+1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_2)
+c_e_InvestmentFlowBlock_old_rule_end(Bus1_storage_invest_limit_2)_:
++1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_2)
 = 0
 
 c_e_InvestmentFlowBlock_old_rule_exo(storage_invest_limit_Bus1_0)_:
@@ -191,22 +179,16 @@ c_e_InvestmentFlowBlock_old_rule_exo(Source_Bus1_2)_:
 +1 InvestmentFlowBlock_old_exo(Source_Bus1_2)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule(Bus1_storage_invest_limit_0)_:
--1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_0)
--1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_0)
-+1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_0)
+c_e_InvestmentFlowBlock_old_rule_exo(Bus1_storage_invest_limit_0)_:
++1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_0)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule(Bus1_storage_invest_limit_1)_:
-+1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_1)
--1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_1)
--1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_1)
+c_e_InvestmentFlowBlock_old_rule_exo(Bus1_storage_invest_limit_1)_:
++1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_1)
 = 0
 
-c_e_InvestmentFlowBlock_old_rule(Bus1_storage_invest_limit_2)_:
-+1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_2)
--1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_2)
--1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_2)
+c_e_InvestmentFlowBlock_old_rule_exo(Bus1_storage_invest_limit_2)_:
++1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_2)
 = 0
 
 c_e_InvestmentFlowBlock_old_rule(storage_invest_limit_Bus1_0)_:
@@ -245,35 +227,23 @@ c_e_InvestmentFlowBlock_old_rule(Source_Bus1_2)_:
 -1 InvestmentFlowBlock_old_exo(Source_Bus1_2)
 = 0
 
-c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_0_0)_:
-+1 flow(Bus1_storage_invest_limit_0_0)
--1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_0)
-<= 0
-
-c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_0_1)_:
-+1 flow(Bus1_storage_invest_limit_0_1)
--1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_0)
-<= 0
-
-c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_1_2)_:
-+1 flow(Bus1_storage_invest_limit_1_2)
--1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_1)
-<= 0
-
-c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_1_3)_:
-+1 flow(Bus1_storage_invest_limit_1_3)
--1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_1)
-<= 0
+c_e_InvestmentFlowBlock_old_rule(Bus1_storage_invest_limit_0)_:
+-1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_0)
+-1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_0)
++1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_0)
+= 0
 
-c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_2_4)_:
-+1 flow(Bus1_storage_invest_limit_2_4)
--1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_2)
-<= 0
+c_e_InvestmentFlowBlock_old_rule(Bus1_storage_invest_limit_1)_:
++1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_1)
+-1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_1)
+-1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_1)
+= 0
 
-c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_2_5)_:
-+1 flow(Bus1_storage_invest_limit_2_5)
--1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_2)
-<= 0
+c_e_InvestmentFlowBlock_old_rule(Bus1_storage_invest_limit_2)_:
++1 InvestmentFlowBlock_old(Bus1_storage_invest_limit_2)
+-1 InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_2)
+-1 InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_2)
+= 0
 
 c_u_InvestmentFlowBlock_max(storage_invest_limit_Bus1_0_0)_:
 +1 flow(storage_invest_limit_Bus1_0_0)
@@ -335,6 +305,36 @@ c_u_InvestmentFlowBlock_max(Source_Bus1_2_5)_:
 -1 InvestmentFlowBlock_total(Source_Bus1_2)
 <= 0
 
+c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_0_0)_:
++1 flow(Bus1_storage_invest_limit_0_0)
+-1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_0)
+<= 0
+
+c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_0_1)_:
++1 flow(Bus1_storage_invest_limit_0_1)
+-1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_0)
+<= 0
+
+c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_1_2)_:
++1 flow(Bus1_storage_invest_limit_1_2)
+-1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_1)
+<= 0
+
+c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_1_3)_:
++1 flow(Bus1_storage_invest_limit_1_3)
+-1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_1)
+<= 0
+
+c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_2_4)_:
++1 flow(Bus1_storage_invest_limit_2_4)
+-1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_2)
+<= 0
+
+c_u_InvestmentFlowBlock_max(Bus1_storage_invest_limit_2_5)_:
++1 flow(Bus1_storage_invest_limit_2_5)
+-1 InvestmentFlowBlock_total(Bus1_storage_invest_limit_2)
+<= 0
+
 c_e_GenericInvestmentStorageBlock_total_storage_rule(storage_invest_limit_0)_:
 -1 GenericInvestmentStorageBlock_invest(storage_invest_limit_0)
 +1 GenericInvestmentStorageBlock_total(storage_invest_limit_0)
@@ -396,11 +396,15 @@ c_e_GenericInvestmentStorageBlock_old_rule(storage_invest_limit_2)_:
 -1 GenericInvestmentStorageBlock_old_exo(storage_invest_limit_2)
 = 0
 
+c_e_GenericInvestmentStorageBlock_initially_empty(storage_invest_limit_0)_:
++1 GenericInvestmentStorageBlock_storage_content(storage_invest_limit_0)
+= 0
+
 c_e_GenericInvestmentStorageBlock_balance(storage_invest_limit_0_1)_:
 +1 flow(storage_invest_limit_Bus1_0_1)
 -1 flow(Bus1_storage_invest_limit_0_1)
-+1 GenericInvestmentStorageBlock_storage_content(storage_invest_limit_1)
 -1 GenericInvestmentStorageBlock_storage_content(storage_invest_limit_0)
++1 GenericInvestmentStorageBlock_storage_content(storage_invest_limit_1)
 = 0
 
 c_e_GenericInvestmentStorageBlock_balance(storage_invest_limit_1_2)_:
@@ -498,32 +502,24 @@ bounds
    0 <= GenericInvestmentStorageBlock_invest(storage_invest_limit_0) <= +inf
    0 <= GenericInvestmentStorageBlock_invest(storage_invest_limit_1) <= +inf
    0 <= GenericInvestmentStorageBlock_invest(storage_invest_limit_2) <= +inf
-   0 <= flow(Source_Bus1_0_0) <= +inf
    0 <= flow(storage_invest_limit_Bus1_0_0) <= +inf
+   0 <= flow(Source_Bus1_0_0) <= +inf
    0 <= flow(Bus1_storage_invest_limit_0_0) <= +inf
-   0 <= flow(Source_Bus1_0_1) <= +inf
    0 <= flow(storage_invest_limit_Bus1_0_1) <= +inf
+   0 <= flow(Source_Bus1_0_1) <= +inf
    0 <= flow(Bus1_storage_invest_limit_0_1) <= +inf
-   0 <= flow(Source_Bus1_1_2) <= +inf
    0 <= flow(storage_invest_limit_Bus1_1_2) <= +inf
+   0 <= flow(Source_Bus1_1_2) <= +inf
    0 <= flow(Bus1_storage_invest_limit_1_2) <= +inf
-   0 <= flow(Source_Bus1_1_3) <= +inf
    0 <= flow(storage_invest_limit_Bus1_1_3) <= +inf
+   0 <= flow(Source_Bus1_1_3) <= +inf
    0 <= flow(Bus1_storage_invest_limit_1_3) <= +inf
-   0 <= flow(Source_Bus1_2_4) <= +inf
    0 <= flow(storage_invest_limit_Bus1_2_4) <= +inf
+   0 <= flow(Source_Bus1_2_4) <= +inf
    0 <= flow(Bus1_storage_invest_limit_2_4) <= +inf
-   0 <= flow(Source_Bus1_2_5) <= +inf
    0 <= flow(storage_invest_limit_Bus1_2_5) <= +inf
+   0 <= flow(Source_Bus1_2_5) <= +inf
    0 <= flow(Bus1_storage_invest_limit_2_5) <= +inf
-   0 <= InvestmentFlowBlock_total(Bus1_storage_invest_limit_0) <= +inf
-   0 <= InvestmentFlowBlock_invest(Bus1_storage_invest_limit_0) <= +inf
-   0 <= InvestmentFlowBlock_total(Bus1_storage_invest_limit_1) <= +inf
-   0 <= InvestmentFlowBlock_invest(Bus1_storage_invest_limit_1) <= +inf
-   0 <= InvestmentFlowBlock_old(Bus1_storage_invest_limit_1) <= +inf
-   0 <= InvestmentFlowBlock_total(Bus1_storage_invest_limit_2) <= +inf
-   0 <= InvestmentFlowBlock_invest(Bus1_storage_invest_limit_2) <= +inf
-   0 <= InvestmentFlowBlock_old(Bus1_storage_invest_limit_2) <= +inf
    0 <= InvestmentFlowBlock_total(storage_invest_limit_Bus1_0) <= +inf
    0 <= InvestmentFlowBlock_invest(storage_invest_limit_Bus1_0) <= +inf
    0 <= InvestmentFlowBlock_total(storage_invest_limit_Bus1_1) <= +inf
@@ -537,27 +533,35 @@ bounds
    0 <= InvestmentFlowBlock_old(Source_Bus1_1) <= +inf
    0 <= InvestmentFlowBlock_total(Source_Bus1_2) <= +inf
    0 <= InvestmentFlowBlock_old(Source_Bus1_2) <= +inf
-   0 <= InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_0) <= +inf
-   0 <= InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_1) <= +inf
-   0 <= InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_2) <= +inf
+   0 <= InvestmentFlowBlock_total(Bus1_storage_invest_limit_0) <= +inf
+   0 <= InvestmentFlowBlock_invest(Bus1_storage_invest_limit_0) <= +inf
+   0 <= InvestmentFlowBlock_total(Bus1_storage_invest_limit_1) <= +inf
+   0 <= InvestmentFlowBlock_invest(Bus1_storage_invest_limit_1) <= +inf
+   0 <= InvestmentFlowBlock_old(Bus1_storage_invest_limit_1) <= +inf
+   0 <= InvestmentFlowBlock_total(Bus1_storage_invest_limit_2) <= +inf
+   0 <= InvestmentFlowBlock_invest(Bus1_storage_invest_limit_2) <= +inf
+   0 <= InvestmentFlowBlock_old(Bus1_storage_invest_limit_2) <= +inf
    0 <= InvestmentFlowBlock_old_end(storage_invest_limit_Bus1_0) <= +inf
    0 <= InvestmentFlowBlock_old_end(storage_invest_limit_Bus1_1) <= +inf
    0 <= InvestmentFlowBlock_old_end(storage_invest_limit_Bus1_2) <= +inf
    0 <= InvestmentFlowBlock_old_end(Source_Bus1_0) <= +inf
    0 <= InvestmentFlowBlock_old_end(Source_Bus1_1) <= +inf
    0 <= InvestmentFlowBlock_old_end(Source_Bus1_2) <= +inf
-   0 <= InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_0) <= +inf
-   0 <= InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_1) <= +inf
-   0 <= InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_2) <= +inf
+   0 <= InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_0) <= +inf
+   0 <= InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_1) <= +inf
+   0 <= InvestmentFlowBlock_old_end(Bus1_storage_invest_limit_2) <= +inf
    0 <= InvestmentFlowBlock_old_exo(storage_invest_limit_Bus1_0) <= +inf
    0 <= InvestmentFlowBlock_old_exo(storage_invest_limit_Bus1_1) <= +inf
    0 <= InvestmentFlowBlock_old_exo(storage_invest_limit_Bus1_2) <= +inf
    0 <= InvestmentFlowBlock_old_exo(Source_Bus1_0) <= +inf
    0 <= InvestmentFlowBlock_old_exo(Source_Bus1_1) <= +inf
    0 <= InvestmentFlowBlock_old_exo(Source_Bus1_2) <= +inf
-   0 <= InvestmentFlowBlock_old(Bus1_storage_invest_limit_0) <= +inf
+   0 <= InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_0) <= +inf
+   0 <= InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_1) <= +inf
+   0 <= InvestmentFlowBlock_old_exo(Bus1_storage_invest_limit_2) <= +inf
    0 <= InvestmentFlowBlock_old(storage_invest_limit_Bus1_0) <= +inf
    0 <= InvestmentFlowBlock_old(Source_Bus1_0) <= +inf
+   0 <= InvestmentFlowBlock_old(Bus1_storage_invest_limit_0) <= +inf
    0 <= GenericInvestmentStorageBlock_total(storage_invest_limit_0) <= +inf
    0 <= GenericInvestmentStorageBlock_total(storage_invest_limit_1) <= +inf
    0 <= GenericInvestmentStorageBlock_old(storage_invest_limit_1) <= +inf
@@ -570,8 +574,8 @@ bounds
    0 <= GenericInvestmentStorageBlock_old_exo(storage_invest_limit_1) <= +inf
    0 <= GenericInvestmentStorageBlock_old_exo(storage_invest_limit_2) <= +inf
    0 <= GenericInvestmentStorageBlock_old(storage_invest_limit_0) <= +inf
-   0 <= GenericInvestmentStorageBlock_storage_content(storage_invest_limit_1) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage_invest_limit_0) <= +inf
+   0 <= GenericInvestmentStorageBlock_storage_content(storage_invest_limit_1) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage_invest_limit_2) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage_invest_limit_3) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage_invest_limit_4) <= +inf

diff --git a/tests/lp_files/storage_invest_1_multi_period.lp b/tests/lp_files/storage_invest_1_multi_period.lp
@@ -293,11 +293,15 @@ c_e_GenericInvestmentStorageBlock_old_rule(storage1_2)_:
 -1 GenericInvestmentStorageBlock_old_exo(storage1_2)
 = 0
 
+c_e_GenericInvestmentStorageBlock_initially_empty(storage1_0)_:
++1 GenericInvestmentStorageBlock_storage_content(storage1_0)
+= 0
+
 c_e_GenericInvestmentStorageBlock_balance(storage1_0_1)_:
 -0.97 flow(electricityBus_storage1_0_1)
 +1.1627906976744187 flow(storage1_electricityBus_0_1)
-+1 GenericInvestmentStorageBlock_storage_content(storage1_1)
 -0.87 GenericInvestmentStorageBlock_storage_content(storage1_0)
++1 GenericInvestmentStorageBlock_storage_content(storage1_1)
 = 0
 
 c_e_GenericInvestmentStorageBlock_balance(storage1_1_2)_:
@@ -492,8 +496,8 @@ bounds
    0 <= GenericInvestmentStorageBlock_old_exo(storage1_1) <= +inf
    0 <= GenericInvestmentStorageBlock_old_exo(storage1_2) <= +inf
    0 <= GenericInvestmentStorageBlock_old(storage1_0) <= +inf
-   0 <= GenericInvestmentStorageBlock_storage_content(storage1_1) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage1_0) <= +inf
+   0 <= GenericInvestmentStorageBlock_storage_content(storage1_1) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage1_2) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage1_3) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage1_4) <= +inf

diff --git a/tests/lp_files/storage_invest_2_multi_period.lp b/tests/lp_files/storage_invest_2_multi_period.lp
@@ -287,11 +287,15 @@ c_e_GenericInvestmentStorageBlock_old_rule(storage2_2)_:
 -1 GenericInvestmentStorageBlock_old_exo(storage2_2)
 = 0
 
+c_e_GenericInvestmentStorageBlock_initially_empty(storage2_0)_:
++1 GenericInvestmentStorageBlock_storage_content(storage2_0)
+= 0
+
 c_e_GenericInvestmentStorageBlock_balance(storage2_0_1)_:
 +1 flow(storage2_electricityBus_0_1)
 -1 flow(electricityBus_storage2_0_1)
-+1 GenericInvestmentStorageBlock_storage_content(storage2_1)
 -1 GenericInvestmentStorageBlock_storage_content(storage2_0)
++1 GenericInvestmentStorageBlock_storage_content(storage2_1)
 = 0
 
 c_e_GenericInvestmentStorageBlock_balance(storage2_1_2)_:
@@ -410,8 +414,8 @@ bounds
    0 <= GenericInvestmentStorageBlock_old_exo(storage2_1) <= +inf
    0 <= GenericInvestmentStorageBlock_old_exo(storage2_2) <= +inf
    0 <= GenericInvestmentStorageBlock_old(storage2_0) <= +inf
-   0 <= GenericInvestmentStorageBlock_storage_content(storage2_1) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage2_0) <= +inf
+   0 <= GenericInvestmentStorageBlock_storage_content(storage2_1) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage2_2) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage2_3) <= +inf
    0 <= GenericInvestmentStorageBlock_storage_content(storage2_4) <= +inf