diff --git a/Model_Library b/Model_Library index 02172ebbda8402a975dba5dd3fafff0a6ceb4645..399882656ca472a9e92ce999888d6bf7b7953b70 160000 --- a/Model_Library +++ b/Model_Library @@ -1 +1 @@ -Subproject commit 02172ebbda8402a975dba5dd3fafff0a6ceb4645 +Subproject commit 399882656ca472a9e92ce999888d6bf7b7953b70 diff --git a/Tooling b/Tooling index 0961692dd8a92856b5600013bd5ddbba5618b311..229b05e31a54d74763fe8e4d347184c529848e49 160000 --- a/Tooling +++ b/Tooling @@ -1 +1 @@ -Subproject commit 0961692dd8a92856b5600013bd5ddbba5618b311 +Subproject commit 229b05e31a54d74763fe8e4d347184c529848e49 diff --git a/runme.py b/runme.py index 5ae2613ce9320b456c1a873fba7b71751a1a2091..eb43f0f79328489661a20eab6299181a946ba562 100644 --- a/runme.py +++ b/runme.py @@ -78,8 +78,8 @@ for prosumer_name, component_profiles in prosumer_profiles.items(): prosumer_main = main_prosumer.ProsumerMain(prosumer_dict, input_profiles, dynamic) -prosumer_sizing_strategy = 'annuity' -prosumer_main.optimize_sizing(prosumer_sizing_strategy) +prosumer_sizing_strategy = ['annuity'] +prosumer_main.optimize_sizing('sized', prosumer_sizing_strategy) prosumer_main.save_results() @@ -114,9 +114,9 @@ for district_name, profiles in district_profiles.items(): district_main = main_district.DistrictMain(district_dict, prosumers, district_assets, input_profiles, dynamic) district_sizing_strategy = 'max_operational_profit' -district_main.optimize_sizing(district_sizing_strategy) +district_main.optimize_sizing('sized', district_sizing_strategy) district_operation_strategy = 'max_operational_profit' -district_main.optimize_operation(district_operation_strategy) +district_main.optimize_operation('validated', district_operation_strategy) district_main.save_results()