From 0c92e6e4ad713756a4b0f3a2a4518a6ecf26fbc5 Mon Sep 17 00:00:00 2001 From: guille Date: Wed, 30 Mar 2022 13:26:31 -0400 Subject: [PATCH] Fixing libs wrong commit --- exports/energy_systems/__init__.py | 0 imports/construction_factory.py | 1 + imports/geometry/rhino.py | 6 ++++-- imports/sensors_factory.py | 9 +++------ 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 exports/energy_systems/__init__.py diff --git a/exports/energy_systems/__init__.py b/exports/energy_systems/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/imports/construction_factory.py b/imports/construction_factory.py index c315c455..e83ea7c8 100644 --- a/imports/construction_factory.py +++ b/imports/construction_factory.py @@ -22,6 +22,7 @@ class ConstructionFactory: def _nrel(self): """ Enrich the city by using NREL information + :cat: """ UsPhysicsParameters(self._city, self._base_path).enrich_buildings() diff --git a/imports/geometry/rhino.py b/imports/geometry/rhino.py index b9007ecb..53f21088 100644 --- a/imports/geometry/rhino.py +++ b/imports/geometry/rhino.py @@ -4,8 +4,10 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from numpy import inf -#from rhino3dm import * -#from rhino3dm._rhino3dm import MeshType +from rhino3dm import * +from rhino3dm._rhino3dm import MeshType + + from city_model_structure.attributes.point import Point import numpy as np diff --git a/imports/sensors_factory.py b/imports/sensors_factory.py index 3060d1a2..98fbb809 100644 --- a/imports/sensors_factory.py +++ b/imports/sensors_factory.py @@ -5,9 +5,6 @@ Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@conc Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path -from imports.sensors.concordia_energy_consumption import ConcordiaEnergyConsumption -from imports.sensors.concordia_gas_flow import ConcordiaGasFlow -from imports.sensors.concordia_temperature import ConcordiaTemperature class SensorsFactory: @@ -26,19 +23,19 @@ class SensorsFactory: """ Enrich the city by using concordia energy consumption sensors as data source """ - ConcordiaEnergyConsumption(self._city, self._end_point, self._base_path) + raise NotImplementedError('need to be reimplemented') def _cgf(self): """ Enrich the city by using concordia gas flow sensors as data source """ - ConcordiaGasFlow(self._city, self._end_point, self._base_path) + raise NotImplementedError('need to be reimplemented') def _ct(self): """ Enrich the city by using concordia temperature sensors as data source """ - ConcordiaTemperature(self._city, self._end_point, self._base_path) + raise NotImplementedError('need to be reimplemented') def enrich(self): """