m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity

fixing format and cleaning todos

Browse Source
This commit is contained in:
pilar 2020-11-26 09:26:55 -05:00
parent 5adcd7dbf3
commit 6cccb18cd1
17 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
city_model_structure/attributes/thermal_boundary.py
View File

@ -2,9 +2,9 @@
ThermalBoundary module ThermalBoundary module
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
Contributors Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
from typing import List from typing import List
from city_model_structure.attributes.layer import Layer from city_model_structure.attributes.layer import Layer
from city_model_structure.attributes.thermal_opening import ThermalOpening from city_model_structure.attributes.thermal_opening import ThermalOpening
from city_model_structure.attributes.thermal_zone import ThermalZone from city_model_structure.attributes.thermal_zone import ThermalZone

1
city_model_structure/attributes/thermal_opening.py
View File

@ -2,6 +2,7 @@
ThermalOpening module ThermalOpening module
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
Contributors Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
from helpers.configuration_helper import ConfigurationHelper from helpers.configuration_helper import ConfigurationHelper

14
city_model_structure/attributes/usage_zone.py
View File

@ -1,11 +1,10 @@
""" """
UsageZone module UsageZone module
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
Contributors Pilar Monsalvete pilar_monsalvete@yahoo.es Contributors Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
""" """
from typing import List from typing import List
from city_model_structure.attributes.internal_gains import InternalGains from city_model_structure.attributes.internal_gains import InternalGains
from helpers.configuration_helper import ConfigurationHelper from helpers.configuration_helper import ConfigurationHelper
@ -218,7 +217,6 @@ class UsageZone:
@property @property
def occupancy_density(self): def occupancy_density(self):
# todo: review units
""" """
Get occupancy density in persons per m2 Get occupancy density in persons per m2
:return: float :return: float
@ -235,7 +233,6 @@ class UsageZone:
@property @property
def dhw_average_volume_pers_day(self): def dhw_average_volume_pers_day(self):
# todo: review units
""" """
Get average DHW consumption in liters per person per day Get average DHW consumption in liters per person per day
:return: float :return: float
@ -252,7 +249,6 @@ class UsageZone:
@property @property
def dhw_preparation_temperature(self): def dhw_preparation_temperature(self):
# todo: review units
""" """
Get preparation temperature of the DHW in degree Celsius Get preparation temperature of the DHW in degree Celsius
:return: float :return: float
@ -269,9 +265,8 @@ class UsageZone:
@property @property
def electrical_app_average_consumption_sqm_year(self): def electrical_app_average_consumption_sqm_year(self):
# todo: review units
""" """
Get average consumption of electrical appliances in Watts per m2 and year Get average consumption of electrical appliances in kiloWatts hour per m2 and year (kWh/m2yr)
:return: float :return: float
""" """
return self._electrical_app_average_consumption_sqm_year return self._electrical_app_average_consumption_sqm_year
@ -279,8 +274,7 @@ class UsageZone:
@electrical_app_average_consumption_sqm_year.setter @electrical_app_average_consumption_sqm_year.setter
def electrical_app_average_consumption_sqm_year(self, values): def electrical_app_average_consumption_sqm_year(self, values):
""" """
average consumption of electrical appliances in Watts per m2 and year average consumption of electrical appliances in kiloWatts hour per m2 and year (kWh/m2yr)
:param values: float :param values: float
""" """
self._electrical_app_average_consumption_sqm_year = values self._electrical_app_average_consumption_sqm_year = values

2
city_model_structure/bixi_feature.py
View File

@ -1,7 +1,7 @@
""" """
bixi_feature module bixi_feature module
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
from city_model_structure.city_object import CityObject from city_model_structure.city_object import CityObject

4
city_model_structure/building.py
View File

@ -12,8 +12,6 @@ import numpy as np
from matplotlib import pylab from matplotlib import pylab
from shapely import ops from shapely import ops
from shapely.geometry import MultiPolygon from shapely.geometry import MultiPolygon
import pandas as pd
import helpers.constants as cte
from city_model_structure.attributes.surface import Surface from city_model_structure.attributes.surface import Surface
from city_model_structure.attributes.thermal_boundary import ThermalBoundary from city_model_structure.attributes.thermal_boundary import ThermalBoundary
@ -147,7 +145,7 @@ class Building(CityObject):
City object heated volume in cubic meters City object heated volume in cubic meters
:return: float :return: float
""" """
# ToDo: this need to be the calculated based on the basement and attic heated values # ToDo: this need to be calculated based on the basement and attic heated values
return self.volume return self.volume
@property @property

2
city_model_structure/building_unit.py
View File

@ -1,7 +1,7 @@
""" """
Building module Building module
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Sanam Dabirian sanam.dabirian@mail.concordia.ca
""" """
from builtins import float from builtins import float

2
city_model_structure/city_object.py
View File

@ -91,8 +91,6 @@ class CityObject:
self._polyhedron = Polyhedron(self.surfaces) self._polyhedron = Polyhedron(self.surfaces)
self._polyhedron.show() self._polyhedron.show()
@property @property
def max_height(self): def max_height(self):
""" """

2
city_model_structure/composting_plant.py
View File

@ -1,7 +1,7 @@
""" """
Composting plant module Composting plant module
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
from city_model_structure.city_object import CityObject from city_model_structure.city_object import CityObject

22
city_model_structure/subway_entrance.py
View File

@ -1,7 +1,15 @@
"""
Subway entrance module
SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
"""
from city_model_structure.city_object import CityObject from city_model_structure.city_object import CityObject
class SubwayEntrance(CityObject): class SubwayEntrance(CityObject):
"""
SubwayEntrance(CityObject) class
"""
def __init__(self, name, latitude, longitude): def __init__(self, name, latitude, longitude):
super().__init__(0, [], name) super().__init__(0, [], name)
self._name = name self._name = name
@ -10,12 +18,26 @@ class SubwayEntrance(CityObject):
@property @property
def latitude(self): def latitude(self):
# todo: to be defined the spacial point and the units
"""
Get latitude
:return: float
"""
return self._latitude return self._latitude
@property @property
def longitude(self): def longitude(self):
# todo: to be defined the spacial point and the units
"""
Get longitude
:return: float
"""
return self._longitude return self._longitude
@property @property
def name(self): def name(self):
"""
Get name
:return: string
"""
return self._name return self._name

2
city_model_structure/tree.py
View File

@ -1,7 +1,7 @@
""" """
Tree module Tree module
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
from city_model_structure.city_object import CityObject from city_model_structure.city_object import CityObject

1
factories/usage_feeders/de_usage_parameters.py
View File

@ -6,7 +6,6 @@ Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@conc
from pathlib import Path from pathlib import Path
import xmltodict import xmltodict
from factories.usage_feeders.helpers.us_function_to_usage import UsFunctionToUsage from factories.usage_feeders.helpers.us_function_to_usage import UsFunctionToUsage

2
factories/usage_feeders/helpers/us_function_to_usage.py
View File

@ -1,7 +1,7 @@
""" """
UsFunctionToUsage helper UsFunctionToUsage helper
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """

1
factories/usage_feeders/us_base_usage_parameters.py
View File

@ -2,6 +2,7 @@
UsBaseUsageParameters base class to model the usage properties for a building in NYC and US UsBaseUsageParameters base class to model the usage properties for a building in NYC and US
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
Contributors Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
from pathlib import Path from pathlib import Path

1
factories/weather_factory.py
View File

@ -3,7 +3,6 @@ WeatherFactory retrieve the specific weather module for the given source format
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
from pathlib import Path from pathlib import Path
from factories.weather_feeders.dat_weather_parameters import DatWeatherParameters from factories.weather_feeders.dat_weather_parameters import DatWeatherParameters

14
factories/weather_feeders/helpers/weather.py
View File

@ -1,12 +1,24 @@
"""
weather helper
SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
"""
import math import math
import helpers.constants as cte import helpers.constants as cte
class Weather(object): class Weather(object):
"""
Weather class
"""
@staticmethod @staticmethod
def sky_temperature(ambient_temperature): def sky_temperature(ambient_temperature):
# Swinbank - Fuentes sky model approximation(1963) based on cloudiness statistics(32 %) in United States """
sky temperature from ambient temperature in degree Celsius
:return: float
"""
# Swinbank - Source sky model approximation(1963) based on cloudiness statistics(32 %) in United States
# ambient temperatures( in °C) # ambient temperatures( in °C)
# sky temperatures( in °C) # sky temperatures( in °C)
values = [] values = []

1
helpers/geometry_helper.py
View File

@ -2,6 +2,7 @@
Geometry helper Geometry helper
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
Contributors Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
import math import math