From 1d5520f8693e4f945ecf4a9085c8aeef0e8f0c7c Mon Sep 17 00:00:00 2001
From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de>
Date: Tue, 9 Apr 2024 16:58:01 +0200
Subject: [PATCH] Added Profile
---
Model_Library | 2 +-
Tooling | 2 +-
examples/BusChargingDepot/runme.py | 4 ++--
examples/BusChargingHPC/runme.py | 16 ++++++++--------
examples/BusChargingIMC/runme.py | 7 ++++---
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Model_Library b/Model_Library
index bfa86afea2..7fb211d58a 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit bfa86afea225c34fc47815ab54113e2bdb9b86cc
+Subproject commit 7fb211d58a0ef773b36c6fbc4b4ca4d7d2c904e0
diff --git a/Tooling b/Tooling
index e5ccdd9a08..a0b6708198 160000
--- a/Tooling
+++ b/Tooling
@@ -1 +1 @@
-Subproject commit e5ccdd9a089f59aae5de77a64877f2d46dd4c042
+Subproject commit a0b6708198ed62b897e64be62737b63053a940e7
diff --git a/examples/BusChargingDepot/runme.py b/examples/BusChargingDepot/runme.py
index 9be37c11c3..6c9e909cb4 100644
--- a/examples/BusChargingDepot/runme.py
+++ b/examples/BusChargingDepot/runme.py
@@ -67,10 +67,10 @@ prosumer_dict["LaTreille"]["components"]["bus_2_generation"][
] = input_profiles["bus_2_recuperation"]
prosumer_dict["LaTreille"]["additional_model_logic"][2]["enable"] = input_profiles[
"bus_1_connected"
-][0]
+].values
prosumer_dict["LaTreille"]["additional_model_logic"][3]["enable"] = input_profiles[
"bus_2_connected"
-][0]
+].values
prosumer_main = ProsumerMain(prosumer_dict, dynamic)
diff --git a/examples/BusChargingHPC/runme.py b/examples/BusChargingHPC/runme.py
index 1d9f557359..4773ee5746 100644
--- a/examples/BusChargingHPC/runme.py
+++ b/examples/BusChargingHPC/runme.py
@@ -67,28 +67,28 @@ prosumer_dict["LaTreille"]["components"]["bus_2_generation"][
] = input_profiles["bus_2_recuperation"]
prosumer_dict["LaTreille"]["additional_model_logic"][2]["enable"] = input_profiles[
"bus_1_connected"
-][0].loc[:, "Connected to depot"]
+].values.loc[:, "Connected to depot"]
prosumer_dict["LaTreille"]["additional_model_logic"][3]["enable"] = input_profiles[
"bus_2_connected"
-][0].loc[:, "Connected to depot"]
+].values.loc[:, "Connected to depot"]
prosumer_dict["LaTreille"]["additional_model_logic"][4]["enable"] = input_profiles[
"bus_1_connected"
-][0].loc[:, "Connected to HPC 1"]
+].values.loc[:, "Connected to HPC 1"]
prosumer_dict["LaTreille"]["additional_model_logic"][5]["enable"] = input_profiles[
"bus_1_connected"
-][0].loc[:, "Connected to HPC 2"]
+].values.loc[:, "Connected to HPC 2"]
prosumer_dict["LaTreille"]["additional_model_logic"][6]["enable"] = input_profiles[
"bus_1_connected"
-][0].loc[:, "Connected to HPC 3"]
+].values.loc[:, "Connected to HPC 3"]
prosumer_dict["LaTreille"]["additional_model_logic"][7]["enable"] = input_profiles[
"bus_2_connected"
-][0].loc[:, "Connected to HPC 1"]
+].values.loc[:, "Connected to HPC 1"]
prosumer_dict["LaTreille"]["additional_model_logic"][8]["enable"] = input_profiles[
"bus_2_connected"
-][0].loc[:, "Connected to HPC 2"]
+].values.loc[:, "Connected to HPC 2"]
prosumer_dict["LaTreille"]["additional_model_logic"][9]["enable"] = input_profiles[
"bus_2_connected"
-][0].loc[:, "Connected to HPC 3"]
+].values.loc[:, "Connected to HPC 3"]
prosumer_main = ProsumerMain(prosumer_dict, dynamic)
diff --git a/examples/BusChargingIMC/runme.py b/examples/BusChargingIMC/runme.py
index ea10a3bfe9..84e95446a8 100644
--- a/examples/BusChargingIMC/runme.py
+++ b/examples/BusChargingIMC/runme.py
@@ -67,12 +67,13 @@ prosumer_dict["LaTreille"]["components"]["bus_2_generation"][
] = input_profiles["bus_2_recuperation"]
prosumer_dict["LaTreille"]["additional_model_logic"][2]["enable"] = input_profiles[
"bus_1_connected"
-][0]
+].values
prosumer_dict["LaTreille"]["additional_model_logic"][3]["enable"] = input_profiles[
"bus_2_connected"
-][0]
+].values
max_driving_consumpion = max(
- max(input_profiles["bus_1_demand"][0]), max(input_profiles["bus_1_demand"][0])
+ max(input_profiles["bus_1_demand"].values),
+ max(input_profiles["bus_1_demand"].values),
)
with open(
prosumer_dict["LaTreille"]["components"]["bus_1_motor_inverter"]["model"]
--
GitLab