Read in zero values from cplex

OSeMOSYS · Feb 1, 2024 · 999f39f · 999f39f
1 parent 15bdc0b
commit 999f39f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/otoole/results/results.py b/src/otoole/results/results.py
@@ -179,7 +179,7 @@ def rename_duplicate_column(index: List) -> List:
 
 
 class ReadCplex(ReadWideResults):
-    """Read a CPLEX solution file into memeory"""
+    """Read a CPLEX solution file into memory"""
 
     def _convert_to_dataframe(self, file_path: Union[str, TextIO]) -> pd.DataFrame:
         """Reads a Cplex solution file into a pandas DataFrame
@@ -193,7 +193,7 @@ def _convert_to_dataframe(self, file_path: Union[str, TextIO]) -> pd.DataFrame:
         df[["Variable", "Index"]] = df["name"].str.split("(", expand=True)
         df["Index"] = df["Index"].str.replace(")", "", regex=False)
         LOGGER.debug(df)
-        df = df[(df["value"] != 0)].reset_index().rename(columns={"value": "Value"})
+        df = df.reset_index().rename(columns={"value": "Value"})
         return df[["Variable", "Index", "Value"]].astype({"Value": float})
 
 

diff --git a/tests/test_read_strategies.py b/tests/test_read_strategies.py
@@ -83,8 +83,11 @@ def test_convert_to_dataframe(self, user_config):
         # print(actual)
         expected = pd.DataFrame(
             [
+                ["NewCapacity", "SIMPLICITY,ETHPLANT,2014", 0],
                 ["NewCapacity", "SIMPLICITY,ETHPLANT,2015", 0.030000000000000027],
                 ["NewCapacity", "SIMPLICITY,ETHPLANT,2016", 0.030999999999999917],
+                ["RateOfActivity", "SIMPLICITY,ID,GRID_EXP,1,2014", 0],
+                ["RateOfActivity", "SIMPLICITY,ID,GRID_EXP,2,2014", 0],
                 ["RateOfActivity", "SIMPLICITY,ID,HYD1,1,2020", 0.25228800000000001],
                 ["RateOfActivity", "SIMPLICITY,ID,HYD1,1,2021", 0.25228800000000001],
                 ["RateOfActivity", "SIMPLICITY,ID,HYD1,1,2022", 0.25228800000000001],
@@ -103,6 +106,7 @@ def test_solution_to_dataframe(self, user_config):
         expected = (
             pd.DataFrame(
                 [
+                    ["SIMPLICITY", "ETHPLANT", 2014, 0],
                     ["SIMPLICITY", "ETHPLANT", 2015, 0.030000000000000027],
                     ["SIMPLICITY", "ETHPLANT", 2016, 0.030999999999999917],
                 ],
@@ -117,6 +121,8 @@ def test_solution_to_dataframe(self, user_config):
         expected = (
             pd.DataFrame(
                 [
+                    ["SIMPLICITY", "ID", "GRID_EXP", 1, 2014, 0],
+                    ["SIMPLICITY", "ID", "GRID_EXP", 2, 2014, 0],
                     ["SIMPLICITY", "ID", "HYD1", 1, 2020, 0.25228800000000001],
                     ["SIMPLICITY", "ID", "HYD1", 1, 2021, 0.25228800000000001],
                     ["SIMPLICITY", "ID", "HYD1", 1, 2022, 0.25228800000000001],