Use pytest.approx(x) instead of int(round(x))

tests/test_scripts/test_solph/test_connect_invest/test_connect_invest.py

@@ -12,6 +12,7 @@
 
 import logging
 import os
+import pytest
 
 import pandas as pd
 
@@ -131,11 +132,11 @@ def test_connect_invest():
     stor_res = views.node(results, "storage")["scalars"]
     my_results["storage_in"] = stor_res[
         [(("electricity1", "storage"), "invest")]
-    ]
-    my_results["storage"] = stor_res[[(("storage", "None"), "invest")]]
+    ].iloc[0]
+    my_results["storage"] = stor_res[[(("storage", "None"), "invest")]].iloc[0]
     my_results["storage_out"] = stor_res[
         [(("storage", "electricity1"), "invest")]
-    ]
+    ].iloc[0]
 
     connect_invest_dict = {
         "line12": 814705,
@@ -146,6 +147,6 @@ def test_connect_invest():
     }
 
     for key in connect_invest_dict.keys():
-        assert int(round(my_results[key])) == int(
-            round(connect_invest_dict[key])
+        assert my_results[key] == pytest.approx(
+            connect_invest_dict[key], abs=0.5
         )

tests/test_scripts/test_solph/test_generic_caes/test_generic_caes.py

@@ -15,6 +15,7 @@
 import os
 
 import pandas as pd
+import pytest
 
 from oemof.solph import EnergySystem
 from oemof.solph import Model
@@ -140,4 +141,4 @@ def test_gen_caes():
     }
 
     for key in test_dict.keys():
-        assert int(round(data[key])) == int(round(test_dict[key]))
+        assert data[key] == pytest.approx(test_dict[key])

tests/test_scripts/test_solph/test_generic_chp/test_generic_chp.py

@@ -15,6 +15,7 @@
 import os
 
 import pandas as pd
+import pytest
 
 from oemof import solph as solph
 from oemof.solph import processing
@@ -124,4 +125,4 @@ def test_gen_chp():
     }
 
     for key in test_dict.keys():
-        assert int(round(data[key])) == int(round(test_dict[key]))
+        assert data[key] == pytest.approx(test_dict[key])

tests/test_scripts/test_solph/test_lopf/test_lopf.py

@@ -15,6 +15,7 @@
 import logging
 
 import pandas as pd
+import pytest
 
 from oemof.solph import EnergySystem
 from oemof.solph import Investment
@@ -124,8 +125,8 @@ def test_lopf(solver="cbc"):
 
     for key in generators_test_results.keys():
         logging.debug("Test genertor production of {0}".format(key))
-        assert int(round(generators[key])) == int(
-            round(generators_test_results[key])
+        assert generators[key].iloc[0] == pytest.approx(
+            generators_test_results[key]
         )
 
     assert (

tests/test_scripts/test_solph/test_simple_model/test_simple_dispatch.py

@@ -16,6 +16,7 @@
 import os
 
 import pandas as pd
+import pytest
 
 from oemof.solph import EnergySystem
 from oemof.solph import Model
@@ -190,4 +191,4 @@ def test_dispatch_example(solver="cbc", periods=24 * 5):
     }
 
     for key in test_results.keys():
-        assert int(round(results[key])) == int(round(test_results[key]))
+        assert results[key] == pytest.approx(test_results[key], abs=0.5)

tests/test_scripts/test_solph/test_simple_model/test_simple_dispatch_one.py

@@ -11,6 +11,8 @@
 SPDX-License-Identifier: MIT
 """
 
+import pytest
+
 from oemof.solph import EnergySystem
 from oemof.solph import Model
 from oemof.solph import processing
@@ -116,4 +118,4 @@ def test_dispatch_one_time_step(solver="cbc"):
     }
 
     for key in test_results.keys():
-        assert int(round(results[key])) == int(round(test_results[key]))
+        assert results[key] == pytest.approx(test_results[key], abs=0.5)

tests/test_scripts/test_solph/test_simple_model/test_simple_dispatch_one_explicit_timemode.py

@@ -11,6 +11,8 @@
 SPDX-License-Identifier: MIT
 """
 
+import pytest
+
 from oemof.solph import EnergySystem
 from oemof.solph import Model
 from oemof.solph import processing
@@ -116,4 +118,4 @@ def test_dispatch_one_time_step(solver="cbc"):
     }
 
     for key in test_results.keys():
-        assert int(round(results[key])) == int(round(test_results[key]))
+        assert results[key] == pytest.approx(test_results[key], abs=0.5)

tests/test_scripts/test_solph/test_simple_model/test_simple_invest.py

@@ -16,6 +16,7 @@
 import os
 
 import pandas as pd
+import pytest
 from oemof.tools import economics
 
 from oemof.solph import EnergySystem
@@ -208,4 +209,4 @@ def test_dispatch_example(solver="cbc", periods=24 * 5):
     }
 
     for key in test_results.keys():
-        assert int(round(comp_results[key])) == int(round(test_results[key]))
+        assert comp_results[key] == pytest.approx(test_results[key], abs=0.5)

tests/test_scripts/test_solph/test_storage_investment/test_storage_investment.py

@@ -38,6 +38,7 @@
 import os
 
 import pandas as pd
+import pytest
 from oemof.tools import economics
 
 from oemof import solph
@@ -179,7 +180,7 @@ def test_results_with_actual_dump():
     }
 
     for key in stor_invest_dict.keys():
-        assert int(round(my_results[key])) == int(round(stor_invest_dict[key]))
+        assert my_results[key] == pytest.approx(stor_invest_dict[key])
 
     # Solver results
     assert str(meta["solver"]["Termination condition"]) == "optimal"

tests/test_scripts/test_solph/test_storage_investment/test_storage_with_tuple_label.py

@@ -36,6 +36,7 @@
 
 import logging
 import os
+import pytest
 from collections import namedtuple
 
 import pandas as pd
@@ -171,9 +172,11 @@ def test_tuples_as_labels_example(
     my_results = electricity_bus["sequences"].sum(axis=0).to_dict()
     storage = es.groups["storage_electricity_battery"]
     storage_node = views.node(results, storage)
-    my_results["max_load"] = storage_node["sequences"].max()[
-        [((storage, None), "storage_content")]
-    ]
+    my_results["max_load"] = (
+        storage_node["sequences"]
+        .max()[[((storage, None), "storage_content")]]
+        .iloc[0]
+    )
     commodity_bus = views.node(results, "bus_natural_gas_None")
 
     gas_usage = commodity_bus["sequences"][
@@ -201,7 +204,7 @@ def test_tuples_as_labels_example(
     }
 
     for key in stor_invest_dict.keys():
-        assert int(round(my_results[key])) == int(round(stor_invest_dict[key]))
+        assert my_results[key] == pytest.approx(stor_invest_dict[key])
 
     # Solver results
     assert str(meta["solver"]["Termination condition"]) == "optimal"

tests/test_scripts/test_solph/test_variable_chp/test_variable_chp.py

@@ -16,6 +16,7 @@
 import os
 
 import pandas as pd
+import pytest
 
 from oemof import solph
 from oemof.solph import views
@@ -172,14 +173,14 @@ def test_variable_chp(filename="variable_chp.csv", solver="cbc"):
 
     for key in variable_chp_dict_max.keys():
         logging.debug("Test the maximum value of {0}".format(key))
-        assert int(round(maxresults[[key]])) == int(
-            round(variable_chp_dict_max[key])
+        assert maxresults[[key]].iloc[0] == pytest.approx(
+            variable_chp_dict_max[key]
         )
 
     for key in variable_chp_dict_sum.keys():
         logging.debug("Test the summed up value of {0}".format(key))
-        assert int(round(sumresults[[key]])) == int(
-            round(variable_chp_dict_sum[key])
+        assert sumresults[[key]].iloc[0] == pytest.approx(
+            variable_chp_dict_sum[key]
         )
 
     assert (