Adapt tests to storage loss variable

This commit includes changed line orders in the LP files,
as the order is just random and I was too lazy to change
everything by hand.

tests/lp_files/nonequidistant_timeindex.lp

@@ -149,59 +149,106 @@ c_e_ConverterBlock_relation(boiler_gas_heat_7)_:
 -1 flow(boiler_heat_7)
 = 0
 
+c_e_GenericStorageBlock_losses(storage_0)_:
+-1 GenericStorageBlock_storage_losses(storage_0)
+= -30.0
+
+c_e_GenericStorageBlock_losses(storage_1)_:
+-1 GenericStorageBlock_storage_losses(storage_1)
++0.1 GenericStorageBlock_storage_content(storage_1)
+= 0
+
+c_e_GenericStorageBlock_losses(storage_2)_:
+-1 GenericStorageBlock_storage_losses(storage_2)
++0.1 GenericStorageBlock_storage_content(storage_2)
+= 0
+
+c_e_GenericStorageBlock_losses(storage_3)_:
+-1 GenericStorageBlock_storage_losses(storage_3)
++0.010000000000000002 GenericStorageBlock_storage_content(storage_3)
+= 0
+
+c_e_GenericStorageBlock_losses(storage_4)_:
+-1 GenericStorageBlock_storage_losses(storage_4)
++0.010000000000000002 GenericStorageBlock_storage_content(storage_4)
+= 0
+
+c_e_GenericStorageBlock_losses(storage_5)_:
+-1 GenericStorageBlock_storage_losses(storage_5)
++0.31622776601683794 GenericStorageBlock_storage_content(storage_5)
+= 0
+
+c_e_GenericStorageBlock_losses(storage_6)_:
+-1 GenericStorageBlock_storage_losses(storage_6)
++0.31622776601683794 GenericStorageBlock_storage_content(storage_6)
+= 0
+
+c_e_GenericStorageBlock_losses(storage_7)_:
+-1 GenericStorageBlock_storage_losses(storage_7)
++0.31622776601683794 GenericStorageBlock_storage_content(storage_7)
+= 0
+
 c_e_GenericStorageBlock_balance(storage_0)_:
--1 flow(heat_storage_0)
-+1 flow(storage_heat_0)
-+1 GenericStorageBlock_storage_content(storage_1)
-= 270.0
++1 flow(heat_storage_0)
+-1 flow(storage_heat_0)
+-1 GenericStorageBlock_storage_losses(storage_0)
+-1 GenericStorageBlock_storage_content(storage_1)
+= -300
 
 c_e_GenericStorageBlock_balance(storage_1)_:
--1 flow(heat_storage_1)
-+1 flow(storage_heat_1)
--0.9 GenericStorageBlock_storage_content(storage_1)
-+1 GenericStorageBlock_storage_content(storage_2)
++1 flow(heat_storage_1)
+-1 flow(storage_heat_1)
+-1 GenericStorageBlock_storage_losses(storage_1)
++1 GenericStorageBlock_storage_content(storage_1)
+-1 GenericStorageBlock_storage_content(storage_2)
 = 0
 
 c_e_GenericStorageBlock_balance(storage_2)_:
--1 flow(heat_storage_2)
-+1 flow(storage_heat_2)
--0.9 GenericStorageBlock_storage_content(storage_2)
-+1 GenericStorageBlock_storage_content(storage_3)
++1 flow(heat_storage_2)
+-1 flow(storage_heat_2)
+-1 GenericStorageBlock_storage_losses(storage_2)
++1 GenericStorageBlock_storage_content(storage_2)
+-1 GenericStorageBlock_storage_content(storage_3)
 = 0
 
 c_e_GenericStorageBlock_balance(storage_3)_:
--2.0 flow(heat_storage_3)
-+2.0 flow(storage_heat_3)
--0.81 GenericStorageBlock_storage_content(storage_3)
-+1 GenericStorageBlock_storage_content(storage_4)
++2.0 flow(heat_storage_3)
+-2.0 flow(storage_heat_3)
+-1 GenericStorageBlock_storage_losses(storage_3)
++1 GenericStorageBlock_storage_content(storage_3)
+-1 GenericStorageBlock_storage_content(storage_4)
 = 0
 
 c_e_GenericStorageBlock_balance(storage_4)_:
--2.0 flow(heat_storage_4)
-+2.0 flow(storage_heat_4)
--0.81 GenericStorageBlock_storage_content(storage_4)
-+1 GenericStorageBlock_storage_content(storage_5)
++2.0 flow(heat_storage_4)
+-2.0 flow(storage_heat_4)
+-1 GenericStorageBlock_storage_losses(storage_4)
++1 GenericStorageBlock_storage_content(storage_4)
+-1 GenericStorageBlock_storage_content(storage_5)
 = 0
 
 c_e_GenericStorageBlock_balance(storage_5)_:
--0.5 flow(heat_storage_5)
-+0.5 flow(storage_heat_5)
--0.9486832980505138 GenericStorageBlock_storage_content(storage_5)
-+1 GenericStorageBlock_storage_content(storage_6)
++0.5 flow(heat_storage_5)
+-0.5 flow(storage_heat_5)
+-1 GenericStorageBlock_storage_losses(storage_5)
++1 GenericStorageBlock_storage_content(storage_5)
+-1 GenericStorageBlock_storage_content(storage_6)
 = 0
 
 c_e_GenericStorageBlock_balance(storage_6)_:
--0.5 flow(heat_storage_6)
-+0.5 flow(storage_heat_6)
--0.9486832980505138 GenericStorageBlock_storage_content(storage_6)
-+1 GenericStorageBlock_storage_content(storage_7)
++0.5 flow(heat_storage_6)
+-0.5 flow(storage_heat_6)
+-1 GenericStorageBlock_storage_losses(storage_6)
++1 GenericStorageBlock_storage_content(storage_6)
+-1 GenericStorageBlock_storage_content(storage_7)
 = 0
 
 c_e_GenericStorageBlock_balance(storage_7)_:
--0.5 flow(heat_storage_7)
-+0.5 flow(storage_heat_7)
--0.9486832980505138 GenericStorageBlock_storage_content(storage_7)
-+1 GenericStorageBlock_storage_content(storage_8)
++0.5 flow(heat_storage_7)
+-0.5 flow(storage_heat_7)
+-1 GenericStorageBlock_storage_losses(storage_7)
++1 GenericStorageBlock_storage_content(storage_7)
+-1 GenericStorageBlock_storage_content(storage_8)
 = 0
 
 c_e_GenericStorageBlock_balanced_cstr(storage)_:
@@ -241,6 +288,14 @@ bounds
    0 <= flow(storage_heat_5) <= 100
    0 <= flow(storage_heat_6) <= 100
    0 <= flow(storage_heat_7) <= 100
+   -inf <= GenericStorageBlock_storage_losses(storage_0) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage_1) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage_2) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage_3) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage_4) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage_5) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage_6) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage_7) <= +inf
    0 <= GenericStorageBlock_storage_content(storage_1) <= 300
    0 <= GenericStorageBlock_storage_content(storage_2) <= 300
    0 <= GenericStorageBlock_storage_content(storage_3) <= 300

tests/lp_files/shared_limit.lp

@@ -7,20 +7,20 @@ objective:
 s.t.
 
 c_e_limit_storage_constraint(0)_:
-+0.5 GenericStorageBlock_storage_content(storage1_0)
 +1.25 GenericStorageBlock_storage_content(storage2_0)
++0.5 GenericStorageBlock_storage_content(storage1_0)
 -1 limit_storage(0)
 = 0
 
 c_e_limit_storage_constraint(1)_:
-+0.5 GenericStorageBlock_storage_content(storage1_1)
 +1.25 GenericStorageBlock_storage_content(storage2_1)
++0.5 GenericStorageBlock_storage_content(storage1_1)
 -1 limit_storage(1)
 = 0
 
 c_e_limit_storage_constraint(2)_:
-+0.5 GenericStorageBlock_storage_content(storage1_2)
 +1.25 GenericStorageBlock_storage_content(storage2_2)
++0.5 GenericStorageBlock_storage_content(storage1_2)
 -1 limit_storage(2)
 = 0
 
@@ -45,68 +45,98 @@ c_e_BusBlock_balance(bus_2)_:
 +1 flow(storage2_bus_2)
 = 0
 
-c_e_GenericStorageBlock_balance(storage1_0)_:
--1 GenericStorageBlock_storage_content(storage1_0)
-+1 GenericStorageBlock_storage_content(storage1_1)
--1 flow(bus_storage1_0)
-+1 flow(storage1_bus_0)
+c_e_GenericStorageBlock_losses(storage2_0)_:
+-1 GenericStorageBlock_storage_losses(storage2_0)
 = 0
 
-c_e_GenericStorageBlock_balance(storage1_1)_:
--1 GenericStorageBlock_storage_content(storage1_1)
-+1 GenericStorageBlock_storage_content(storage1_2)
--1 flow(bus_storage1_1)
-+1 flow(storage1_bus_1)
+c_e_GenericStorageBlock_losses(storage2_1)_:
+-1 GenericStorageBlock_storage_losses(storage2_1)
 = 0
 
-c_e_GenericStorageBlock_balance(storage1_2)_:
--1 GenericStorageBlock_storage_content(storage1_2)
-+1 GenericStorageBlock_storage_content(storage1_3)
--1 flow(bus_storage1_2)
-+1 flow(storage1_bus_2)
+c_e_GenericStorageBlock_losses(storage2_2)_:
+-1 GenericStorageBlock_storage_losses(storage2_2)
+= 0
+
+c_e_GenericStorageBlock_losses(storage1_0)_:
+-1 GenericStorageBlock_storage_losses(storage1_0)
+= 0
+
+c_e_GenericStorageBlock_losses(storage1_1)_:
+-1 GenericStorageBlock_storage_losses(storage1_1)
+= 0
+
+c_e_GenericStorageBlock_losses(storage1_2)_:
+-1 GenericStorageBlock_storage_losses(storage1_2)
 = 0
 
 c_e_GenericStorageBlock_balance(storage2_0)_:
--1 GenericStorageBlock_storage_content(storage2_0)
-+1 GenericStorageBlock_storage_content(storage2_1)
--1 flow(bus_storage2_0)
-+1 flow(storage2_bus_0)
++1 GenericStorageBlock_storage_content(storage2_0)
+-1 GenericStorageBlock_storage_content(storage2_1)
++1 flow(bus_storage2_0)
+-1 flow(storage2_bus_0)
+-1 GenericStorageBlock_storage_losses(storage2_0)
 = 0
 
 c_e_GenericStorageBlock_balance(storage2_1)_:
--1 GenericStorageBlock_storage_content(storage2_1)
-+1 GenericStorageBlock_storage_content(storage2_2)
--1 flow(bus_storage2_1)
-+1 flow(storage2_bus_1)
++1 GenericStorageBlock_storage_content(storage2_1)
+-1 GenericStorageBlock_storage_content(storage2_2)
++1 flow(bus_storage2_1)
+-1 flow(storage2_bus_1)
+-1 GenericStorageBlock_storage_losses(storage2_1)
 = 0
 
 c_e_GenericStorageBlock_balance(storage2_2)_:
--1 GenericStorageBlock_storage_content(storage2_2)
-+1 GenericStorageBlock_storage_content(storage2_3)
--1 flow(bus_storage2_2)
-+1 flow(storage2_bus_2)
++1 GenericStorageBlock_storage_content(storage2_2)
+-1 GenericStorageBlock_storage_content(storage2_3)
++1 flow(bus_storage2_2)
+-1 flow(storage2_bus_2)
+-1 GenericStorageBlock_storage_losses(storage2_2)
 = 0
 
-c_e_GenericStorageBlock_balanced_cstr(storage1)_:
--1 GenericStorageBlock_storage_content(storage1_0)
-+1 GenericStorageBlock_storage_content(storage1_3)
+c_e_GenericStorageBlock_balance(storage1_0)_:
++1 GenericStorageBlock_storage_content(storage1_0)
+-1 GenericStorageBlock_storage_content(storage1_1)
++1 flow(bus_storage1_0)
+-1 flow(storage1_bus_0)
+-1 GenericStorageBlock_storage_losses(storage1_0)
+= 0
+
+c_e_GenericStorageBlock_balance(storage1_1)_:
++1 GenericStorageBlock_storage_content(storage1_1)
+-1 GenericStorageBlock_storage_content(storage1_2)
++1 flow(bus_storage1_1)
+-1 flow(storage1_bus_1)
+-1 GenericStorageBlock_storage_losses(storage1_1)
+= 0
+
+c_e_GenericStorageBlock_balance(storage1_2)_:
++1 GenericStorageBlock_storage_content(storage1_2)
+-1 GenericStorageBlock_storage_content(storage1_3)
++1 flow(bus_storage1_2)
+-1 flow(storage1_bus_2)
+-1 GenericStorageBlock_storage_losses(storage1_2)
 = 0
 
 c_e_GenericStorageBlock_balanced_cstr(storage2)_:
 -1 GenericStorageBlock_storage_content(storage2_0)
 +1 GenericStorageBlock_storage_content(storage2_3)
 = 0
 
+c_e_GenericStorageBlock_balanced_cstr(storage1)_:
+-1 GenericStorageBlock_storage_content(storage1_0)
++1 GenericStorageBlock_storage_content(storage1_3)
+= 0
+
 bounds
    1 <= ONE_VAR_CONSTANT <= 1
-   0 <= GenericStorageBlock_storage_content(storage1_0) <= 5
-   0 <= GenericStorageBlock_storage_content(storage1_1) <= 5
-   0 <= GenericStorageBlock_storage_content(storage1_2) <= 5
-   0 <= GenericStorageBlock_storage_content(storage1_3) <= 5
    0 <= GenericStorageBlock_storage_content(storage2_0) <= 5
    0 <= GenericStorageBlock_storage_content(storage2_1) <= 5
    0 <= GenericStorageBlock_storage_content(storage2_2) <= 5
    0 <= GenericStorageBlock_storage_content(storage2_3) <= 5
+   0 <= GenericStorageBlock_storage_content(storage1_0) <= 5
+   0 <= GenericStorageBlock_storage_content(storage1_1) <= 5
+   0 <= GenericStorageBlock_storage_content(storage1_2) <= 5
+   0 <= GenericStorageBlock_storage_content(storage1_3) <= 5
    0 <= limit_storage(0) <= 7
    0 <= limit_storage(1) <= 7
    0 <= limit_storage(2) <= 7
@@ -122,4 +152,10 @@ bounds
    0 <= flow(storage2_bus_0) <= +inf
    0 <= flow(storage2_bus_1) <= +inf
    0 <= flow(storage2_bus_2) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage2_0) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage2_1) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage2_2) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage1_0) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage1_1) <= +inf
+   -inf <= GenericStorageBlock_storage_losses(storage1_2) <= +inf
 end