Merge branch 'master' into bug/FE-443

gridsingularity · Dec 1, 2023 · fc2bcc2 · fc2bcc2
2 parents 8be7d63 + 6a32169
commit fc2bcc2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/gsy_framework/schema/avro_schemas/simulation_raw_data.json b/gsy_framework/schema/avro_schemas/simulation_raw_data.json
@@ -438,6 +438,8 @@
         {"name": "energy_consumption_kWh", "type": "float"},
         {"name": "max_energy_demand_kWh", "type": "float"},
         {"name": "min_energy_demand_kWh", "type": "float"},
+        {"name": "cop", "type": "float"},
+        {"name": "unmatched_demand_kWh", "type": "float"},
         {"name": "market_fee", "type": "float"},
         {
           "name": "bids",

diff --git a/gsy_framework/schema/avro_schemas/simulation_state.json b/gsy_framework/schema/avro_schemas/simulation_state.json
@@ -338,6 +338,20 @@
                 "values": "float"
               }
             },
+            {
+              "name": "cop",
+              "type": {
+                "type": "map",
+                "values": "float"
+              }
+            },
+            {
+              "name": "unmatched_demand_kWh",
+              "type": {
+                "type": "map",
+                "values": "float"
+              }
+            },
             {
               "name": "energy_consumption_kWh",
               "type": {

diff --git a/tests/schema/test_data/simulation_state_test_data.json b/tests/schema/test_data/simulation_state_test_data.json
@@ -225,6 +225,14 @@
         "2023-05-23T22:00": 0.0,
         "2023-05-23T23:00": 0.0
       },
+      "cop": {
+        "2023-05-23T22:00": 4.0,
+        "2023-05-23T23:00": 6.0
+      },
+      "unmatched_demand_kWh": {
+        "2023-05-23T22:00": 4.0,
+        "2023-05-23T23:00": 6.0
+      },
       "temp_increase_K": {},
       "max_energy_demand_kWh": {
         "2023-05-23T22:00": 4.276815903856106,