From 46a631c344e4cf1cf39594c94156754309130e4d Mon Sep 17 00:00:00 2001 From: Pilar Date: Thu, 9 Jun 2022 11:09:03 -0400 Subject: [PATCH] errors in stochastic schedules --- imports/customized_imports/stochastic_schedules_importer.py | 4 ++-- scripts/ep_workflow.py | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/imports/customized_imports/stochastic_schedules_importer.py b/imports/customized_imports/stochastic_schedules_importer.py index 2832bf61..1e99e63e 100644 --- a/imports/customized_imports/stochastic_schedules_importer.py +++ b/imports/customized_imports/stochastic_schedules_importer.py @@ -28,9 +28,9 @@ class StochasticSchedulesImporter: Returns the city with the usage parameters assigned to the buildings :return: """ - _daily_schedules = pd.read_excel(self._xls, nrows=261, usecols="A:Y") + _daily_schedules = pd.read_excel(self._xls, nrows=365, usecols="A:Y") year = [] - for day in range(1, 262): + for day in range(1, 366): values = _daily_schedules.iloc[day-1][1:].to_numpy() year.extend(values) schedule = Schedule() diff --git a/scripts/ep_workflow.py b/scripts/ep_workflow.py index 47e5c470..5d13f0bc 100644 --- a/scripts/ep_workflow.py +++ b/scripts/ep_workflow.py @@ -32,10 +32,6 @@ try: ConstructionFactory('nrel', city).enrich() print('enrich constructions... done') UsageFactory('comnet', city).enrich() - for building in city.buildings: - for internal_zone in building.internal_zones: - for usage_zone in internal_zone.usage_zones: - print(usage_zone.occupancy.occupancy_schedules) print('enrich usage... done') in_path = (Path(__file__).parent.parent / 'data' / 'occupancyschedules_2019_point4.xlsx') CustomizedImportsFactory(ssi, city, in_path).enrich()