diff --git a/Model_Library b/Model_Library index bfa86afea225c34fc47815ab54113e2bdb9b86cc..7fb211d58a0ef773b36c6fbc4b4ca4d7d2c904e0 160000 --- a/Model_Library +++ b/Model_Library @@ -1 +1 @@ -Subproject commit bfa86afea225c34fc47815ab54113e2bdb9b86cc +Subproject commit 7fb211d58a0ef773b36c6fbc4b4ca4d7d2c904e0 diff --git a/Tooling b/Tooling index e5ccdd9a089f59aae5de77a64877f2d46dd4c042..a0b6708198ed62b897e64be62737b63053a940e7 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 9be37c11c371d2f573a020ef4a3de0a4c25db7fc..6c9e909cb487b518658bb0ba4915d86da790a64c 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 1d9f55735912ff3b91cbdb11d8688935f016d76e..4773ee574662a3e09b8ad284f19733195840103e 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 ea10a3bfe9401e087f4f974fedce5e06760b9d3e..84e95446a88c5398b937ebc777e386ad7d030f38 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"]