From 0c8252cfd99f5566d24e26aa8727165d8b0c008f Mon Sep 17 00:00:00 2001
From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de>
Date: Mon, 29 Apr 2024 16:40:32 +0200
Subject: [PATCH] Refactored Topology model construction methods
---
Model_Library | 2 +-
examples/BusChargingDepot/runme.py | 2 +-
examples/BusChargingHPC/runme.py | 2 +-
examples/BusChargingIMC/runme.py | 2 +-
examples/aggregation/runme.py | 2 +-
examples/complex_prosumer/runme.py | 4 +++-
examples/district/runme.py | 4 ++--
examples/simple_prosumer/runme.py | 2 +-
8 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Model_Library b/Model_Library
index a5e9a3ab75..4a23622bec 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit a5e9a3ab750522285e6198cd4156bf01fffcb94a
+Subproject commit 4a23622bec300febd437c86bc75feea2c6ae2296
diff --git a/examples/BusChargingDepot/runme.py b/examples/BusChargingDepot/runme.py
index 87ab7839ce..628f0ac620 100644
--- a/examples/BusChargingDepot/runme.py
+++ b/examples/BusChargingDepot/runme.py
@@ -76,6 +76,6 @@ prosumer_json["additional_model_logic"]["charger_2_enable"]["enable"] = input_pr
prosumer = Prosumer("LaTrielle", prosumer_json, dynamic)
-prosumer.optimize_sizing("sized", ["annuity", "peak_power_cost"])
+prosumer.optimize("sized", ["annuity", "peak_power_cost"])
prosumer.save_results("output_files")
diff --git a/examples/BusChargingHPC/runme.py b/examples/BusChargingHPC/runme.py
index 692fd09100..a6542f121b 100644
--- a/examples/BusChargingHPC/runme.py
+++ b/examples/BusChargingHPC/runme.py
@@ -94,6 +94,6 @@ prosumer_json["additional_model_logic"]["HPC_3_bus_2_enable"]["enable"] = (
prosumer = Prosumer("LaTreille", prosumer_json, dynamic)
-prosumer.optimize_sizing("sized", ["annuity", "peak_power_cost"])
+prosumer.optimize("sized", ["annuity", "peak_power_cost"])
prosumer.save_results("output_files")
diff --git a/examples/BusChargingIMC/runme.py b/examples/BusChargingIMC/runme.py
index d8b3408bf2..b026d550d2 100644
--- a/examples/BusChargingIMC/runme.py
+++ b/examples/BusChargingIMC/runme.py
@@ -98,6 +98,6 @@ prosumer_json["components"]["bus_2_motor_inverter"][
prosumer = Prosumer("LaTreille", prosumer_json, dynamic)
-prosumer.optimize_sizing("sized", ["annuity", "peak_power_cost"])
+prosumer.optimize("sized", ["annuity", "peak_power_cost"])
prosumer.save_results("output_files")
diff --git a/examples/aggregation/runme.py b/examples/aggregation/runme.py
index 30323cbc71..f8157cb1a7 100644
--- a/examples/aggregation/runme.py
+++ b/examples/aggregation/runme.py
@@ -110,6 +110,6 @@ prosumer_json["components"]["consumption"][
prosumer = Prosumer("my_prosumer", prosumer_json, aggregated_dynamic)
-prosumer.optimize_sizing("sized", ["annuity"])
+prosumer.optimize("sized", ["annuity"])
prosumer.save_results("output_files")
diff --git a/examples/complex_prosumer/runme.py b/examples/complex_prosumer/runme.py
index 41515faf8f..a8a5877f3c 100644
--- a/examples/complex_prosumer/runme.py
+++ b/examples/complex_prosumer/runme.py
@@ -72,6 +72,8 @@ prosumer_json["components"]["hot_water_consumption"]["consumption"] = input_prof
prosumer = Prosumer("my_prosumer", prosumer_json, dynamic)
-prosumer.optimize_sizing("sized", ["annuity"])
+prosumer.optimize("sized", ["annuity"])
+
+prosumer.save_results("output_files")
prosumer.save_results("output_files")
diff --git a/examples/district/runme.py b/examples/district/runme.py
index 698d0218ed..6790925b9e 100644
--- a/examples/district/runme.py
+++ b/examples/district/runme.py
@@ -66,7 +66,7 @@ for prosumer_name, prosumer_path in prosumer_paths.items():
prosumers[prosumer_name] = Prosumer(prosumer_name, prosumer_json, dynamic)
for prosumer_name, prosumer in prosumers.items():
- prosumer.optimize_sizing("sized", ["annuity"])
+ prosumer.optimize("sized", ["annuity"])
prosumer.save_results("output_files")
@@ -87,6 +87,6 @@ district = District(
"my_district", district_json, prosumers, {"my_asset": district_asset}, dynamic
)
-district.optimize_sizing("sized", ["annuity"])
+district.optimize("sized", ["annuity"])
district.save_results("output_files")
diff --git a/examples/simple_prosumer/runme.py b/examples/simple_prosumer/runme.py
index 1366f3295e..9154170bd5 100644
--- a/examples/simple_prosumer/runme.py
+++ b/examples/simple_prosumer/runme.py
@@ -57,6 +57,6 @@ prosumer_json["components"]["consumption"]["consumption"] = input_profiles[
prosumer = Prosumer("my_prosumer", prosumer_json, dynamic)
-prosumer.optimize_sizing("sized", ["annuity"])
+prosumer.optimize("sized", ["annuity"])
prosumer.save_results("output_files")
--
GitLab