Merge branch 'main' into no_port

assume-framework · Sep 25, 2023 · e79a5b4 · e79a5b4
2 parents 9a056c2 + 8ede6e7
commit e79a5b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/assume/common/outputs.py b/assume/common/outputs.py
@@ -318,8 +318,8 @@ def write_market_dispatch(self, data):
         :type data: any
         """
         df = pd.DataFrame(data, columns=["datetime", "power", "market_id", "unit_id"])
-        df["simulation"] = self.simulation_id
         if not df.empty:
+            df["simulation"] = self.simulation_id
             self.write_dfs["market_dispatch"].append(df)
 
     def write_unit_dispatch(self, data):

diff --git a/tests/test_outputs.py b/tests/test_outputs.py
@@ -114,6 +114,15 @@ def test_output_market_dispatch():
     meta = {"sender_id": None}
     content = {"context": "write_results", "type": "market_dispatch", "data": []}
     output_writer.handle_message(content, meta)
+    # empty dfs are discarded
+    assert len(output_writer.write_dfs["market_dispatch"]) == 0, "market_dispatch"
+
+    content = {
+        "context": "write_results",
+        "type": "market_dispatch",
+        "data": [[start, 90, "EOM", "TestUnit"]],
+    }
+    output_writer.handle_message(content, meta)
     assert len(output_writer.write_dfs["market_dispatch"]) == 1, "market_dispatch"