diff --git a/Model_Library b/Model_Library index a5e9a3ab750522285e6198cd4156bf01fffcb94a..4a23622bec300febd437c86bc75feea2c6ae2296 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 87ab7839ce10d5a3f4ae70c6d74fa53eca5ebdfe..628f0ac62050dd274681e1b4970c8232c8681c1a 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 692fd0910045a937c4db8a8c48ea4580c8221b9c..a6542f121b1d92ef888ca6734975022422c29bb3 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 d8b3408bf2127d03d3fbad02ea9686edf223cd89..b026d550d2c02a9688ad77fec617ecff746db821 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 30323cbc71f2a88be3d046b29f360cdcad576a71..f8157cb1a7ae1610b1e008b52ebc6cedb9b55c33 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 41515faf8f431479faf55c7ba137d72cfd69f873..a8a5877f3c5c037b42ab866ae709f9629bee6a57 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 698d0218ed1845e45104668364bc09fdc3a9b1c3..6790925b9e807888e1e0974fa774cfd9c0dbcd6a 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 1366f3295e6465d8c1d9c62a563863d6b1f0afe5..9154170bd5206f9c05f9c992c0116b41e2ab5c91 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")