diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9f093ccb..7a9b89ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,7 +56,8 @@ Include a small header with contact information and the code license at the top """ Name module SPDX - License - Identifier: LGPL - 3.0 - or -later - Copyright © 2020 Project Author name mail@concordia.ca + Copyright © 2022 Concordia CERC group + Project Coder name mail@concordia.ca """ diff --git a/PYGUIDE.md b/PYGUIDE.md index 41f70c81..eb0e7f8a 100644 --- a/PYGUIDE.md +++ b/PYGUIDE.md @@ -31,7 +31,8 @@ comment. """ MyClass module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author name name@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder name name@concordia.ca """ import sys diff --git a/catalogs/catalog.py b/catalogs/catalog.py index 67de9fda..2525177b 100644 --- a/catalogs/catalog.py +++ b/catalogs/catalog.py @@ -1,7 +1,8 @@ """ Catalog base class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ class Catalog: diff --git a/catalogs/construction/nrcan_catalog.py b/catalogs/construction/nrcan_catalog.py new file mode 100644 index 00000000..e69de29b diff --git a/catalogs/construction/nrel_catalog.py b/catalogs/construction/nrel_catalog.py new file mode 100644 index 00000000..ac346c68 --- /dev/null +++ b/catalogs/construction/nrel_catalog.py @@ -0,0 +1,34 @@ +""" +Greenery catalog +SPDX - License - Identifier: LGPL - 3.0 - or -later +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +""" +import xmltodict +from pathlib import Path +from catalogs.catalog import Catalog + + +class NrelCatalog(Catalog): + def __init__(self, path): + archetypes = str(Path(path / 'us_archetypes.xml').resolve()) + constructions = str(Path(path / 'us_constructions.xml').resolve()) + with open(constructions) as xml: + self._constructions = xmltodict.parse(xml.read()) + with open(archetypes) as xml: + self._archetypes = xmltodict.parse(xml.read()) + self._windows = [] + self._materials = [] + self._constructions = [] + self._archetypes = [] + + @property + def names(self, category=None): + nam + + def entries(self, category=None): + pass + + def get_entry(self, name): + pass + diff --git a/catalogs/construction_catalog_factory.py b/catalogs/construction_catalog_factory.py new file mode 100644 index 00000000..96d20858 --- /dev/null +++ b/catalogs/construction_catalog_factory.py @@ -0,0 +1,39 @@ +""" +Construction catalog factory, publish the construction information +SPDX - License - Identifier: LGPL - 3.0 - or -later +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +""" + +from pathlib import Path +from typing import TypeVar +from catalogs.construction.nrel_catalog import NrelCatalog +from catalogs.construction.nrcan_catalog import NrcanCatalog +Catalog = TypeVar('Catalog') + +class ConstructionCatalogFactory: + def __init__(self, file_type, base_path=None): + if base_path is None: + base_path = Path(Path(__file__).parent.parent / 'data/construction') + self._catalog_type = '_' + file_type.lower() + self._path = base_path + + def _nrel(self): + """ + Retrieve NREL catalog + """ + return NrelCatalog(self._path) + + def _nrcan(self): + """ + Retrieve NRCAN catalog + """ + return NrcanCatalog(self._city, self._base_path) + + @property + def catalog(self) -> Catalog: + """ + Enrich the city given to the class using the class given handler + :return: Catalog + """ + return getattr(self, self._catalog_type, lambda: None) \ No newline at end of file diff --git a/catalogs/data_models/construction/archetype.py b/catalogs/data_models/construction/archetype.py new file mode 100644 index 00000000..3fefa825 --- /dev/null +++ b/catalogs/data_models/construction/archetype.py @@ -0,0 +1,10 @@ +""" +Construction catalog Archetype +SPDX - License - Identifier: LGPL - 3.0 - or -later +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +""" + +class Archetype: + def __init__(self): + pass \ No newline at end of file diff --git a/catalogs/data_models/construction/construction.py b/catalogs/data_models/construction/construction.py new file mode 100644 index 00000000..51a1c028 --- /dev/null +++ b/catalogs/data_models/construction/construction.py @@ -0,0 +1,10 @@ +""" +Construction catalog contruction +SPDX - License - Identifier: LGPL - 3.0 - or -later +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +""" + +class Construction: + def __init__(self): + pass \ No newline at end of file diff --git a/catalogs/data_models/construction/content.py b/catalogs/data_models/construction/content.py new file mode 100644 index 00000000..c7d5f7a2 --- /dev/null +++ b/catalogs/data_models/construction/content.py @@ -0,0 +1,41 @@ +""" +Construction catalog content +SPDX - License - Identifier: LGPL - 3.0 - or -later +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +""" + +class Content: + def __init__(self, archetypes, constructions, materials, windows): + self._archetypes = archetypes + self._constructions = constructions + self._materials = materials + self._windows = windows + + @property + def archetypes(self): + """ + All archetypes in the catalog + """ + return self._archetypes + + @property + def constructions(self): + """ + All constructions in the catalog + """ + return self._constructions + + @property + def materials(self): + """ + All materials in the catalog + """ + return self._materials + + @property + def windows(self): + """ + All windows in the catalog + """ + return self._windows diff --git a/catalogs/data_models/construction/material.py b/catalogs/data_models/construction/material.py new file mode 100644 index 00000000..a99dc7df --- /dev/null +++ b/catalogs/data_models/construction/material.py @@ -0,0 +1,13 @@ +""" +Construction catalog material +SPDX - License - Identifier: LGPL - 3.0 - or -later +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +""" + +from city_model_structure.building_demand.material import Material as LibsMaterial + +class Material(LibsMaterial): + def __init__(self): + # Inherit normal material directly if needed additional transformations will be done to this class + super().__init__() diff --git a/catalogs/data_models/construction/window.py b/catalogs/data_models/construction/window.py new file mode 100644 index 00000000..ba702152 --- /dev/null +++ b/catalogs/data_models/construction/window.py @@ -0,0 +1,78 @@ +""" +Construction catalog window +SPDX - License - Identifier: LGPL - 3.0 - or -later +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +""" + +class Window: + def __init__(self): + self._frame_ratio = None + self._g_value = None + self._overall_u_value = None + self._construction_name = None + + @property + def frame_ratio(self): + """ + Get window frame ratio + :return: None or float + """ + return self._frame_ratio + + @frame_ratio.setter + def frame_ratio(self, value): + """ + Set window frame ratio + :param value: float + """ + if value is not None: + self._frame_ratio = float(value) + + @property + def g_value(self): + """ + Get thermal opening g-value + :return: None or float + """ + return self._g_value + + @g_value.setter + def g_value(self, value): + """ + Set thermal opening g-value + :param value: float + """ + if value is not None: + self._g_value = float(value) + + @property + def overall_u_value(self): + """ + Get thermal opening overall U-value in W/m2K + :return: None or float + """ + return self._overall_u_value + + @overall_u_value.setter + def overall_u_value(self, value): + """ + Set thermal opening overall U-value in W/m2K + :param value: float + """ + if value is not None: + self._overall_u_value = float(value) + + @property + def construction_name(self): + """ + Get thermal opening construction name + """ + return self._construction_name + + @construction_name.setter + def construction_name(self, value): + """ + Set thermal opening construction name + """ + self._construction_name = value diff --git a/catalogs/data_model/greenery/greenery_content.py b/catalogs/data_models/greenery/content.py similarity index 81% rename from catalogs/data_model/greenery/greenery_content.py rename to catalogs/data_models/greenery/content.py index 04018d5b..b9849d5d 100644 --- a/catalogs/data_model/greenery/greenery_content.py +++ b/catalogs/data_models/greenery/content.py @@ -1,10 +1,11 @@ """ Greenery catalog content SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -class GreeneryContent: +class Content: def __init__(self, vegetations, plants, soils): self._vegetations = vegetations self._plants = plants diff --git a/catalogs/data_model/greenery/plant.py b/catalogs/data_models/greenery/plant.py similarity index 90% rename from catalogs/data_model/greenery/plant.py rename to catalogs/data_models/greenery/plant.py index 6ef0c447..a9763392 100644 --- a/catalogs/data_model/greenery/plant.py +++ b/catalogs/data_models/greenery/plant.py @@ -1,10 +1,11 @@ """ Greenery catalog data model Plant class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalogs.data_model.greenery.soil import Soil as libs_soil +from catalogs.data_models.greenery.soil import Soil as libs_soil class Plant: diff --git a/catalogs/data_model/greenery/plant_percentage.py b/catalogs/data_models/greenery/plant_percentage.py similarity index 66% rename from catalogs/data_model/greenery/plant_percentage.py rename to catalogs/data_models/greenery/plant_percentage.py index 828e8871..a26817c7 100644 --- a/catalogs/data_model/greenery/plant_percentage.py +++ b/catalogs/data_models/greenery/plant_percentage.py @@ -1,10 +1,11 @@ """ Greenery catalog data model Plant percentage class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalogs.data_model.greenery.plant import Plant as libs_plant +from catalogs.data_models.greenery.plant import Plant as libs_plant class PlantPercentage(libs_plant): diff --git a/catalogs/data_model/greenery/soil.py b/catalogs/data_models/greenery/soil.py similarity index 95% rename from catalogs/data_model/greenery/soil.py rename to catalogs/data_models/greenery/soil.py index 177c3662..d63d11e5 100644 --- a/catalogs/data_model/greenery/soil.py +++ b/catalogs/data_models/greenery/soil.py @@ -1,7 +1,8 @@ """ Greenery catalog data model Soil class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ class Soil: diff --git a/catalogs/data_model/greenery/vegetation.py b/catalogs/data_models/greenery/vegetation.py similarity index 95% rename from catalogs/data_model/greenery/vegetation.py rename to catalogs/data_models/greenery/vegetation.py index 3bc8da2c..ae47ddf6 100644 --- a/catalogs/data_model/greenery/vegetation.py +++ b/catalogs/data_models/greenery/vegetation.py @@ -1,10 +1,11 @@ """ Greenery catalog data model Vegetation class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from catalogs.data_model.greenery.plant_percentage import PlantPercentage +from catalogs.data_models.greenery.plant_percentage import PlantPercentage class Vegetation: def __init__(self, category, vegetation, plant_percentages): diff --git a/catalogs/greenery/greenery_catalog.py b/catalogs/greenery/greenery_catalog.py index 243bc47b..434a4fb5 100644 --- a/catalogs/greenery/greenery_catalog.py +++ b/catalogs/greenery/greenery_catalog.py @@ -1,18 +1,19 @@ """ Greenery catalog SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pyecore.resources import ResourceSet, URI from catalogs.greenery.ecore_greenery.greenerycatalog import GreeneryCatalog as gc from catalogs.catalog import Catalog from pathlib import Path -from catalogs.data_model.greenery.vegetation import Vegetation as libs_vegetation -from catalogs.data_model.greenery.plant import Plant as libs_plant -from catalogs.data_model.greenery.soil import Soil as libs_soil -from catalogs.data_model.greenery.plant_percentage import PlantPercentage as libs_pp -from catalogs.data_model.greenery.greenery_content import GreeneryContent +from catalogs.data_models.greenery.vegetation import Vegetation as libs_vegetation +from catalogs.data_models.greenery.plant import Plant as libs_plant +from catalogs.data_models.greenery.soil import Soil as libs_soil +from catalogs.data_models.greenery.plant_percentage import PlantPercentage as libs_pp +from catalogs.data_models.greenery.content import Content as GreeneryContent class GreeneryCatalog(Catalog): @@ -56,7 +57,7 @@ class GreeneryCatalog(Catalog): for soil in catalog_data.soils: soils.append(libs_soil(soil)) - self._data = GreeneryContent(vegetations, plants, soils) + self._content = GreeneryContent(vegetations, plants, soils) def names(self, category=None): """ @@ -65,22 +66,22 @@ class GreeneryCatalog(Catalog): """ if category is None: _names = {'vegetations': [], 'plants': [], 'soils': []} - for vegetation in self._data.vegetations: + for vegetation in self._content.vegetations: _names['vegetations'].append(vegetation.name) - for plant in self._data.plants: + for plant in self._content.plants: _names['plants'].append(plant.name) - for soil in self._data.soils: + for soil in self._content.soils: _names['soils'].append(soil.name) else: _names = {category: []} if category.lower() == 'vegetations': - for vegetation in self._data.vegetations: + for vegetation in self._content.vegetations: _names[category].append(vegetation.name) elif category.lower() == 'plants': - for plant in self._data.plants: + for plant in self._content.plants: _names[category].append(plant.name) elif category.lower() == 'soils': - for soil in self._data.soils: + for soil in self._content.soils: _names[category].append(soil.name) else: raise ValueError(f'Unknown category [{category}]') @@ -90,26 +91,26 @@ class GreeneryCatalog(Catalog): """ Get one complete entry from the greenery catalog """ - for entry in self._data.vegetations: + for entry in self._content.vegetations: if entry.name.lower() == name.lower(): return entry - for entry in self._data.plants: + for entry in self._content.plants: if entry.name.lower() == name.lower(): return entry - for entry in self._data.soils: + for entry in self._content.soils: if entry.name.lower() == name.lower(): return entry raise IndexError(f"{name} doesn't exists in the catalog") def entries(self, category=None): if category is None: - return self._data + return self._content else: if category.lower() == 'vegetations': - return self._data.vegetations + return self._content.vegetations elif category.lower() == 'plants': - return self._data.plants + return self._content.plants elif category.lower() == 'soils': - return self._data.soils + return self._content.soils else: raise ValueError(f'Unknown category [{category}]') diff --git a/catalogs/greenery_catalog_factory.py b/catalogs/greenery_catalog_factory.py index 905f1602..31c2a271 100644 --- a/catalogs/greenery_catalog_factory.py +++ b/catalogs/greenery_catalog_factory.py @@ -1,7 +1,8 @@ """ Greenery catalog publish the greenery information SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pathlib import Path @@ -16,7 +17,7 @@ class GreeneryCatalogFactory: def __init__(self, file_type, base_path=None): if base_path is None: base_path = Path(Path(__file__).parent.parent / 'data/greenery') - self._file_type = '_' + file_type.lower() + self._catalog_type = '_' + file_type.lower() self._path = base_path @property @@ -33,4 +34,4 @@ class GreeneryCatalogFactory: Enrich the city given to the class using the class given handler :return: Catalog """ - return getattr(self, self._file_type, lambda: None) + return getattr(self, self._catalog_type, lambda: None) diff --git a/city_model_structure/attributes/edge.py b/city_model_structure/attributes/edge.py index 3a156ed8..9fd6d75b 100644 --- a/city_model_structure/attributes/edge.py +++ b/city_model_structure/attributes/edge.py @@ -1,8 +1,8 @@ """ Node module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid from typing import List, TypeVar diff --git a/city_model_structure/attributes/node.py b/city_model_structure/attributes/node.py index 86e6b514..32b82466 100644 --- a/city_model_structure/attributes/node.py +++ b/city_model_structure/attributes/node.py @@ -1,8 +1,8 @@ """ Node module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid diff --git a/city_model_structure/attributes/plane.py b/city_model_structure/attributes/plane.py index 71e0f6d9..87edb2d5 100644 --- a/city_model_structure/attributes/plane.py +++ b/city_model_structure/attributes/plane.py @@ -1,7 +1,8 @@ """ Plane module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import TypeVar diff --git a/city_model_structure/attributes/point.py b/city_model_structure/attributes/point.py index 76a55e57..3aeb423c 100644 --- a/city_model_structure/attributes/point.py +++ b/city_model_structure/attributes/point.py @@ -1,7 +1,8 @@ """ Point module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import math diff --git a/city_model_structure/attributes/polygon.py b/city_model_structure/attributes/polygon.py index 4064ad81..b16a9f8a 100644 --- a/city_model_structure/attributes/polygon.py +++ b/city_model_structure/attributes/polygon.py @@ -1,7 +1,8 @@ """ Polygon module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from __future__ import annotations diff --git a/city_model_structure/attributes/polyhedron.py b/city_model_structure/attributes/polyhedron.py index 3f292f79..baa09fda 100644 --- a/city_model_structure/attributes/polyhedron.py +++ b/city_model_structure/attributes/polyhedron.py @@ -1,8 +1,9 @@ """ Polyhedron module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, Union diff --git a/city_model_structure/attributes/record.py b/city_model_structure/attributes/record.py index e7261ddb..a425d48d 100644 --- a/city_model_structure/attributes/record.py +++ b/city_model_structure/attributes/record.py @@ -1,7 +1,8 @@ """ Record module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ diff --git a/city_model_structure/attributes/schedule.py b/city_model_structure/attributes/schedule.py index 2d009f7f..4881fce8 100644 --- a/city_model_structure/attributes/schedule.py +++ b/city_model_structure/attributes/schedule.py @@ -1,7 +1,8 @@ """ Schedule module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import uuid diff --git a/city_model_structure/attributes/time_series.py b/city_model_structure/attributes/time_series.py index 20c4d5dd..81627305 100644 --- a/city_model_structure/attributes/time_series.py +++ b/city_model_structure/attributes/time_series.py @@ -1,7 +1,8 @@ """ Time series module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List diff --git a/city_model_structure/building.py b/city_model_structure/building.py index bab214a1..0c3d0082 100644 --- a/city_model_structure/building.py +++ b/city_model_structure/building.py @@ -1,8 +1,9 @@ """ Building module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, Union diff --git a/city_model_structure/building_demand/appliances.py b/city_model_structure/building_demand/appliances.py index 8fd4f0f6..3e377df1 100644 --- a/city_model_structure/building_demand/appliances.py +++ b/city_model_structure/building_demand/appliances.py @@ -1,7 +1,8 @@ """ Appliances module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List from city_model_structure.attributes.schedule import Schedule diff --git a/city_model_structure/building_demand/household.py b/city_model_structure/building_demand/household.py index 251c8dbd..c740f9c3 100644 --- a/city_model_structure/building_demand/household.py +++ b/city_model_structure/building_demand/household.py @@ -1,7 +1,8 @@ """ Household module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ diff --git a/city_model_structure/building_demand/internal_gains.py b/city_model_structure/building_demand/internal_gains.py index 9384cf21..f3ad93a5 100644 --- a/city_model_structure/building_demand/internal_gains.py +++ b/city_model_structure/building_demand/internal_gains.py @@ -1,7 +1,8 @@ """ InternalGains module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from typing import Union, List diff --git a/city_model_structure/building_demand/internal_zone.py b/city_model_structure/building_demand/internal_zone.py index 74678473..16bd2b58 100644 --- a/city_model_structure/building_demand/internal_zone.py +++ b/city_model_structure/building_demand/internal_zone.py @@ -1,7 +1,8 @@ """ InternalZone module. It saves the original geometrical information from interiors together with some attributes of those SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import uuid diff --git a/city_model_structure/building_demand/layer.py b/city_model_structure/building_demand/layer.py index 608ebeb8..04dd7596 100644 --- a/city_model_structure/building_demand/layer.py +++ b/city_model_structure/building_demand/layer.py @@ -1,7 +1,8 @@ """ Layers module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid from typing import Union diff --git a/city_model_structure/building_demand/lighting.py b/city_model_structure/building_demand/lighting.py index 0e72249f..26ea29eb 100644 --- a/city_model_structure/building_demand/lighting.py +++ b/city_model_structure/building_demand/lighting.py @@ -1,7 +1,8 @@ """ Lighting module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List from city_model_structure.attributes.schedule import Schedule diff --git a/city_model_structure/building_demand/material.py b/city_model_structure/building_demand/material.py index 5762550d..fe54d19e 100644 --- a/city_model_structure/building_demand/material.py +++ b/city_model_structure/building_demand/material.py @@ -1,9 +1,8 @@ """ Material module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributor Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import ast @@ -15,42 +14,16 @@ class Material: Material class """ def __init__(self): - self._type = type self._id = None self._name = None self._conductivity = None self._specific_heat = None self._density = None - self._density_unit = None self._solar_absorptance = None self._thermal_absorptance = None self._visible_absorptance = None self._no_mass = False self._thermal_resistance = None - self._embodied_carbon = None - self._embodied_carbon_unit = None - self._recycling_ratio = None - self._onsite_recycling_ratio = None - self._company_recycling_ratio = None - self._landfilling_ratio = None - self._cost = None - self._cost_unit = None - - @property - def type(self): - """ - Get material type - :return: str - """ - return self._type - - @type.setter - def type(self, value): - """ - Set material type - :param value: string - """ - self._type = str(value) @property def id(self): @@ -135,23 +108,6 @@ class Material: if value is not None: self._density = float(value) - @property - def density_unit(self) -> Union[None, str]: - """ - Get material density unit - :return: None or string - """ - return self._density_unit - - @density_unit.setter - def density_unit(self, value): - """ - Set material density unit - :param value: string - """ - if value is not None: - self._density_unit = str(value) - @property def solar_absorptance(self) -> Union[None, float]: """ @@ -236,139 +192,3 @@ class Material: """ if value is not None: self._thermal_resistance = float(value) - - @property - def embodied_carbon(self) -> Union[None, float]: - """ - Get material embodied carbon - :return: None or float - """ - return self._embodied_carbon - - @embodied_carbon.setter - def embodied_carbon(self, value): - """ - Set material embodied carbon - :param value: float - """ - if value is not None: - self._embodied_carbon = float(value) - - @property - def embodied_carbon_unit(self) -> Union[None, str]: - """ - Get material embodied carbon unit - :return: None or string - """ - return self._embodied_carbon - - @embodied_carbon_unit.setter - def embodied_carbon_unit(self, value): - """ - Set material embodied carbon unit - :param value: string - """ - if value is not None: - self._embodied_carbon_unit = str(value) - - @property - def recycling_ratio(self) -> Union[None, float]: - """ - Get material recycling ratio - :return: None or float - """ - return self._recycling_ratio - - @recycling_ratio.setter - def recycling_ratio(self, value): - """ - Set material recycling ratio - :param value: float - """ - if value is not None: - self._recycling_ratio = float(value) - - @property - def onsite_recycling_ratio(self) -> Union[None, float]: - """ - Get material onsite recycling ratio - :return: None or float - """ - return self._onsite_recycling_ratio - - @onsite_recycling_ratio.setter - def onsite_recycling_ratio(self, value): - """ - Set material onsite recycling ratio - :param value: float - """ - if value is not None: - self._onsite_recycling_ratio = float(value) - - @property - def company_recycling_ratio(self) -> Union[None, float]: - """ - Get material company recycling ratio - :return: None or float - """ - return self._company_recycling_ratio - - @company_recycling_ratio.setter - def company_recycling_ratio(self, value): - """ - Set material company recycling ratio - :param value: float - """ - if value is not None: - self._company_recycling_ratio = float(value) - - @property - def landfilling_ratio(self) -> Union[None, float]: - """ - Get material landfilling ratio - :return: None or float - """ - return self._landfilling_ratio - - @landfilling_ratio.setter - def landfilling_ratio(self, value): - """ - Set material landfilling ratio - :param value: float - """ - if value is not None: - self._landfilling_ratio = float(value) - - @property - def cost(self) -> Union[None, float]: - """ - Get material cost - :return: None or float - """ - return self._cost - - @cost.setter - def cost(self, value): - """ - Set material cost - :param value: float - """ - if value is not None: - self._cost = float(value) - - @property - def cost_unit(self) -> Union[None, str]: - """ - Get material cost unit - :return: None or string - """ - return self._cost_unit - - @cost_unit.setter - def cost_unit(self, value): - """ - Set material cost unit - :param value: string - """ - if value is not None: - self._cost_unit = float(value) diff --git a/city_model_structure/building_demand/occupancy.py b/city_model_structure/building_demand/occupancy.py index ec9ebf1e..a7c9db5c 100644 --- a/city_model_structure/building_demand/occupancy.py +++ b/city_model_structure/building_demand/occupancy.py @@ -1,7 +1,8 @@ """ Occupancy module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List from city_model_structure.attributes.schedule import Schedule diff --git a/city_model_structure/building_demand/occupant.py b/city_model_structure/building_demand/occupant.py index 878d278c..9ee6f9bd 100644 --- a/city_model_structure/building_demand/occupant.py +++ b/city_model_structure/building_demand/occupant.py @@ -1,8 +1,9 @@ """ Occupant module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Sanam Dabirian sanam.dabirian@mail.concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Sanam Dabirian sanam.dabirian@mail.concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import calendar as cal diff --git a/city_model_structure/building_demand/storey.py b/city_model_structure/building_demand/storey.py index 143eec29..16278eaa 100644 --- a/city_model_structure/building_demand/storey.py +++ b/city_model_structure/building_demand/storey.py @@ -1,7 +1,8 @@ """ Storey module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from __future__ import annotations diff --git a/city_model_structure/building_demand/surface.py b/city_model_structure/building_demand/surface.py index 6c73d268..1778354d 100644 --- a/city_model_structure/building_demand/surface.py +++ b/city_model_structure/building_demand/surface.py @@ -1,8 +1,9 @@ """ Surface module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from __future__ import annotations diff --git a/city_model_structure/building_demand/thermal_boundary.py b/city_model_structure/building_demand/thermal_boundary.py index 946e7642..836795c6 100644 --- a/city_model_structure/building_demand/thermal_boundary.py +++ b/city_model_structure/building_demand/thermal_boundary.py @@ -1,8 +1,9 @@ """ ThermalBoundary module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import uuid from typing import List, Union diff --git a/city_model_structure/building_demand/thermal_control.py b/city_model_structure/building_demand/thermal_control.py index 0c4c8a62..e1acda5c 100644 --- a/city_model_structure/building_demand/thermal_control.py +++ b/city_model_structure/building_demand/thermal_control.py @@ -1,7 +1,8 @@ """ ThermalControl module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union, List from city_model_structure.attributes.schedule import Schedule diff --git a/city_model_structure/building_demand/thermal_opening.py b/city_model_structure/building_demand/thermal_opening.py index ae695187..ad3cfd01 100644 --- a/city_model_structure/building_demand/thermal_opening.py +++ b/city_model_structure/building_demand/thermal_opening.py @@ -1,8 +1,9 @@ """ ThermalOpening module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import uuid from typing import TypeVar, Union diff --git a/city_model_structure/building_demand/thermal_zone.py b/city_model_structure/building_demand/thermal_zone.py index 10f8ac0b..d3e19c46 100644 --- a/city_model_structure/building_demand/thermal_zone.py +++ b/city_model_structure/building_demand/thermal_zone.py @@ -1,8 +1,9 @@ """ ThermalZone module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import uuid from typing import List, Union, TypeVar diff --git a/city_model_structure/building_demand/usage_zone.py b/city_model_structure/building_demand/usage_zone.py index c2f8e9da..b25fc1c5 100644 --- a/city_model_structure/building_demand/usage_zone.py +++ b/city_model_structure/building_demand/usage_zone.py @@ -1,8 +1,9 @@ """ UsageZone module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributors Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid from typing import List, Union diff --git a/city_model_structure/buildings_cluster.py b/city_model_structure/buildings_cluster.py index f36f649b..c30b485c 100644 --- a/city_model_structure/buildings_cluster.py +++ b/city_model_structure/buildings_cluster.py @@ -1,7 +1,8 @@ """ BuildingsCluster module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar diff --git a/city_model_structure/bus_system.py b/city_model_structure/bus_system.py index c254a55e..2ad29ca3 100644 --- a/city_model_structure/bus_system.py +++ b/city_model_structure/bus_system.py @@ -1,7 +1,8 @@ """ Bus system module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List diff --git a/city_model_structure/city.py b/city_model_structure/city.py index b0e19e81..d50f53ac 100644 --- a/city_model_structure/city.py +++ b/city_model_structure/city.py @@ -1,8 +1,9 @@ """ City module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributor Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Peter Yefi peteryefi@gmail.com """ from __future__ import annotations import sys diff --git a/city_model_structure/city_object.py b/city_model_structure/city_object.py index 5604f6e0..bea861da 100644 --- a/city_model_structure/city_object.py +++ b/city_model_structure/city_object.py @@ -1,7 +1,8 @@ """ CityObject module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import math @@ -39,7 +40,7 @@ class CityObject: @property def name(self): """ - Get building name + Get city object name :return: str """ return self._name @@ -47,7 +48,7 @@ class CityObject: @name.setter def name(self, value): """ - Set building name + Set city object name :return: str """ self._name = value diff --git a/city_model_structure/city_objects_cluster.py b/city_model_structure/city_objects_cluster.py index 35f02251..06182338 100644 --- a/city_model_structure/city_objects_cluster.py +++ b/city_model_structure/city_objects_cluster.py @@ -1,7 +1,8 @@ """ CityObjectsCluster module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from abc import ABC diff --git a/city_model_structure/energy_system.py b/city_model_structure/energy_system.py index 7fb7d2d1..3c7f5002 100644 --- a/city_model_structure/energy_system.py +++ b/city_model_structure/energy_system.py @@ -1,8 +1,9 @@ """ EnergySystem module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Peter Yefi peteryefi@gmail.com """ from city_model_structure.city_object import CityObject diff --git a/city_model_structure/energy_systems/air_source_hp.py b/city_model_structure/energy_systems/air_source_hp.py index 4f9695c7..b5c2e233 100644 --- a/city_model_structure/energy_systems/air_source_hp.py +++ b/city_model_structure/energy_systems/air_source_hp.py @@ -1,8 +1,9 @@ """ air_source_hp module defines an air source heat pump SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Peter Yefi peteryefi@gmail.com """ from typing import List diff --git a/city_model_structure/energy_systems/heat_pump.py b/city_model_structure/energy_systems/heat_pump.py index a0af2442..bb78dc72 100644 --- a/city_model_structure/energy_systems/heat_pump.py +++ b/city_model_structure/energy_systems/heat_pump.py @@ -1,7 +1,8 @@ """ heat_pump module defines a heat pump SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ diff --git a/city_model_structure/energy_systems/hvac_system.py b/city_model_structure/energy_systems/hvac_system.py index 4bc6edf3..3e390cfe 100644 --- a/city_model_structure/energy_systems/hvac_system.py +++ b/city_model_structure/energy_systems/hvac_system.py @@ -1,7 +1,8 @@ """ HvacSystem module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union diff --git a/city_model_structure/energy_systems/pv_system.py b/city_model_structure/energy_systems/pv_system.py index 7e6b3870..ead8e1d4 100644 --- a/city_model_structure/energy_systems/pv_system.py +++ b/city_model_structure/energy_systems/pv_system.py @@ -1,7 +1,8 @@ """ pv_system defines a pv system including all components: PV panels, transformer... SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union diff --git a/city_model_structure/energy_systems/water_to_water_hp.py b/city_model_structure/energy_systems/water_to_water_hp.py index e65d2247..12c80343 100644 --- a/city_model_structure/energy_systems/water_to_water_hp.py +++ b/city_model_structure/energy_systems/water_to_water_hp.py @@ -1,7 +1,8 @@ """ water_to_water_hp module defines a water to water heat pump heat pump SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ from typing import List diff --git a/city_model_structure/fuel.py b/city_model_structure/fuel.py index 3e92ce8b..db2925f8 100644 --- a/city_model_structure/fuel.py +++ b/city_model_structure/fuel.py @@ -1,8 +1,8 @@ """ ConstructionFactory (before PhysicsFactory) retrieve the specific construction module for the given region SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ class Fuel: diff --git a/city_model_structure/iot/sensor.py b/city_model_structure/iot/sensor.py index 5855d85b..48e0eb12 100644 --- a/city_model_structure/iot/sensor.py +++ b/city_model_structure/iot/sensor.py @@ -1,7 +1,8 @@ """ Sensor module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from helpers.location import Location diff --git a/city_model_structure/iot/sensor_measure.py b/city_model_structure/iot/sensor_measure.py index 608d97f4..7c2d2223 100644 --- a/city_model_structure/iot/sensor_measure.py +++ b/city_model_structure/iot/sensor_measure.py @@ -1,7 +1,8 @@ """ Sensor measure module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ class SensorMeasure: diff --git a/city_model_structure/iot/sensor_type.py b/city_model_structure/iot/sensor_type.py index 414b6f60..49596c50 100644 --- a/city_model_structure/iot/sensor_type.py +++ b/city_model_structure/iot/sensor_type.py @@ -1,7 +1,8 @@ """ Sensor type module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from enum import Enum diff --git a/city_model_structure/iot/station.py b/city_model_structure/iot/station.py index 8a15e62d..19a05775 100644 --- a/city_model_structure/iot/station.py +++ b/city_model_structure/iot/station.py @@ -1,7 +1,8 @@ """ Station SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid diff --git a/city_model_structure/lca_calculations.py b/city_model_structure/lca_calculations.py index fd8b30be..c0ea24e1 100644 --- a/city_model_structure/lca_calculations.py +++ b/city_model_structure/lca_calculations.py @@ -1,7 +1,8 @@ """ LifeCycleAssessment retrieve the specific Life Cycle Assessment module for the given region SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ from city_model_structure.machine import Machine diff --git a/city_model_structure/lca_material.py b/city_model_structure/lca_material.py index f9c620a7..935bc528 100644 --- a/city_model_structure/lca_material.py +++ b/city_model_structure/lca_material.py @@ -1,8 +1,8 @@ """ -Material module +LCA Material module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder atiya.atiya@mail.concordia.ca """ from typing import Union diff --git a/city_model_structure/machine.py b/city_model_structure/machine.py index 249fe3d0..491a8e72 100644 --- a/city_model_structure/machine.py +++ b/city_model_structure/machine.py @@ -1,8 +1,8 @@ """ LifeCycleAssessment retrieve the specific Life Cycle Assessment module for the given region SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ class Machine: diff --git a/city_model_structure/network.py b/city_model_structure/network.py index ae3d0186..77efc492 100644 --- a/city_model_structure/network.py +++ b/city_model_structure/network.py @@ -1,8 +1,8 @@ """ Network module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid diff --git a/city_model_structure/parts_consisting_building.py b/city_model_structure/parts_consisting_building.py index e49ff9aa..17aedb26 100644 --- a/city_model_structure/parts_consisting_building.py +++ b/city_model_structure/parts_consisting_building.py @@ -1,7 +1,8 @@ """ PartsConsistingBuilding module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar diff --git a/city_model_structure/subway_entrance.py b/city_model_structure/subway_entrance.py index 51f049d6..736ce6af 100644 --- a/city_model_structure/subway_entrance.py +++ b/city_model_structure/subway_entrance.py @@ -1,7 +1,8 @@ """ Subway entrance module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from city_model_structure.city_object import CityObject diff --git a/city_model_structure/transport/bus.py b/city_model_structure/transport/bus.py index ea7acb47..ef62b91d 100644 --- a/city_model_structure/transport/bus.py +++ b/city_model_structure/transport/bus.py @@ -1,7 +1,8 @@ """ Bus module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from city_model_structure.attributes.schedule import Schedule diff --git a/city_model_structure/transport/bus_depot.py b/city_model_structure/transport/bus_depot.py index 0b617275..8dde8571 100644 --- a/city_model_structure/transport/bus_depot.py +++ b/city_model_structure/transport/bus_depot.py @@ -1,7 +1,8 @@ """ Bus depot module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from city_model_structure.transport.bus_node import BusNode diff --git a/city_model_structure/transport/bus_edge.py b/city_model_structure/transport/bus_edge.py index 98c31dc0..cc08be7c 100644 --- a/city_model_structure/transport/bus_edge.py +++ b/city_model_structure/transport/bus_edge.py @@ -1,7 +1,8 @@ """ Bus edge module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar diff --git a/city_model_structure/transport/bus_network.py b/city_model_structure/transport/bus_network.py index 6f3dfbd8..fd134dee 100644 --- a/city_model_structure/transport/bus_network.py +++ b/city_model_structure/transport/bus_network.py @@ -1,7 +1,8 @@ """ Bus network module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List diff --git a/city_model_structure/transport/bus_node.py b/city_model_structure/transport/bus_node.py index 17274a4f..71a99301 100644 --- a/city_model_structure/transport/bus_node.py +++ b/city_model_structure/transport/bus_node.py @@ -1,7 +1,8 @@ """ Bus node module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar diff --git a/city_model_structure/transport/bus_stop.py b/city_model_structure/transport/bus_stop.py index b4fccd62..b68b7750 100644 --- a/city_model_structure/transport/bus_stop.py +++ b/city_model_structure/transport/bus_stop.py @@ -1,7 +1,8 @@ """ Bus stop module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import Union diff --git a/city_model_structure/transport/connection.py b/city_model_structure/transport/connection.py index 0f023cd4..4ebbc467 100644 --- a/city_model_structure/transport/connection.py +++ b/city_model_structure/transport/connection.py @@ -1,9 +1,9 @@ """ Connection module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca -Contributor Guille guille.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille guille.gutierrezmorote@concordia.ca """ import ast diff --git a/city_model_structure/transport/crossing.py b/city_model_structure/transport/crossing.py index 0b740355..d9e83142 100644 --- a/city_model_structure/transport/crossing.py +++ b/city_model_structure/transport/crossing.py @@ -1,9 +1,9 @@ """ Crossing module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca -Contributor Guille guille.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille guille.gutierrezmorote@concordia.ca """ import ast diff --git a/city_model_structure/transport/fast_charging_infrastructure.py b/city_model_structure/transport/fast_charging_infrastructure.py index a3369a91..c772cee5 100644 --- a/city_model_structure/transport/fast_charging_infrastructure.py +++ b/city_model_structure/transport/fast_charging_infrastructure.py @@ -1,7 +1,8 @@ """ Fast charging infrastructure module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ diff --git a/city_model_structure/transport/join.py b/city_model_structure/transport/join.py index 3e1cd143..3b7ae328 100644 --- a/city_model_structure/transport/join.py +++ b/city_model_structure/transport/join.py @@ -1,9 +1,9 @@ """ Join module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca -Contributor Guille guille.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille guille.gutierrezmorote@concordia.ca """ from city_model_structure.transport.traffic_node import TrafficNode diff --git a/city_model_structure/transport/lane.py b/city_model_structure/transport/lane.py index 417f986a..1ac6e32f 100644 --- a/city_model_structure/transport/lane.py +++ b/city_model_structure/transport/lane.py @@ -1,8 +1,8 @@ """ Lane module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, Union diff --git a/city_model_structure/transport/origin_destination_edge.py b/city_model_structure/transport/origin_destination_edge.py index 32fa7cbb..9bada29d 100644 --- a/city_model_structure/transport/origin_destination_edge.py +++ b/city_model_structure/transport/origin_destination_edge.py @@ -1,8 +1,8 @@ """ Origin-Destination edge module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca - +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar diff --git a/city_model_structure/transport/origin_destination_network.py b/city_model_structure/transport/origin_destination_network.py index 9090f983..905ef058 100644 --- a/city_model_structure/transport/origin_destination_network.py +++ b/city_model_structure/transport/origin_destination_network.py @@ -1,7 +1,8 @@ """ Origin-Destination network module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List diff --git a/city_model_structure/transport/origin_destination_node.py b/city_model_structure/transport/origin_destination_node.py index ea84bd5c..c24886ad 100644 --- a/city_model_structure/transport/origin_destination_node.py +++ b/city_model_structure/transport/origin_destination_node.py @@ -1,7 +1,8 @@ """ Origin-Destination node module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, TypeVar diff --git a/city_model_structure/transport/phase.py b/city_model_structure/transport/phase.py index 66d2d59b..a6669fa4 100644 --- a/city_model_structure/transport/phase.py +++ b/city_model_structure/transport/phase.py @@ -1,8 +1,8 @@ """ Phase module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List, Union diff --git a/city_model_structure/transport/traffic_edge.py b/city_model_structure/transport/traffic_edge.py index e507e0ba..a608c812 100644 --- a/city_model_structure/transport/traffic_edge.py +++ b/city_model_structure/transport/traffic_edge.py @@ -1,9 +1,9 @@ """ Traffic edge module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca -Contributor Guille guille.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille guille.gutierrezmorote@concordia.ca """ from typing import List, Union diff --git a/city_model_structure/transport/traffic_light.py b/city_model_structure/transport/traffic_light.py index 89827a62..ffc94c75 100644 --- a/city_model_structure/transport/traffic_light.py +++ b/city_model_structure/transport/traffic_light.py @@ -1,9 +1,9 @@ """ Traffic light module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca -Contributor Guille guille.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille guille.gutierrezmorote@concordia.ca """ import ast diff --git a/city_model_structure/transport/traffic_network.py b/city_model_structure/transport/traffic_network.py index eef5a4e9..1db151b7 100644 --- a/city_model_structure/transport/traffic_network.py +++ b/city_model_structure/transport/traffic_network.py @@ -1,9 +1,9 @@ """ Traffic network module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca -Contributor Guille guille.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille guille.gutierrezmorote@concordia.ca """ from typing import List diff --git a/city_model_structure/transport/traffic_node.py b/city_model_structure/transport/traffic_node.py index 6188e6e5..02ebb1be 100644 --- a/city_model_structure/transport/traffic_node.py +++ b/city_model_structure/transport/traffic_node.py @@ -1,9 +1,9 @@ """ TrafficNode module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca -Contributor Guille guille.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille guille.gutierrezmorote@concordia.ca """ from typing import List, TypeVar diff --git a/city_model_structure/transport/walkway_node.py b/city_model_structure/transport/walkway_node.py index e884f976..54d2dec5 100644 --- a/city_model_structure/transport/walkway_node.py +++ b/city_model_structure/transport/walkway_node.py @@ -1,9 +1,9 @@ """ Walkway node module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca -Contributor Milad milad.aghamohamadnia@concordia.ca -Contributor Guille guille.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Code contributors: Guille guille.gutierrezmorote@concordia.ca """ from typing import List, Union diff --git a/city_model_structure/vehicle.py b/city_model_structure/vehicle.py index e9ed8131..ddbdf631 100644 --- a/city_model_structure/vehicle.py +++ b/city_model_structure/vehicle.py @@ -1,8 +1,8 @@ """ LifeCycleAssessment retrieve the specific Life Cycle Assessment module for the given region SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ class Vehicle: diff --git a/exports/energy_systems/air_source_hp_export.py b/exports/energy_systems/air_source_hp_export.py index 9ea7f7d7..29daa827 100644 --- a/exports/energy_systems/air_source_hp_export.py +++ b/exports/energy_systems/air_source_hp_export.py @@ -2,7 +2,8 @@ AirSourceHPExport exports air source values after executing insel. Multiple files are generated for the export SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ from exports.energy_systems.heat_pump_export import HeatPumpExport from typing import List, Tuple, Union diff --git a/exports/energy_systems/heat_pump_export.py b/exports/energy_systems/heat_pump_export.py index b6731579..7c007b82 100644 --- a/exports/energy_systems/heat_pump_export.py +++ b/exports/energy_systems/heat_pump_export.py @@ -1,7 +1,8 @@ """ HeatPumpExport exports heatpump outputs into several files after insel execution SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ import os from typing import List, Tuple, Union, Dict diff --git a/exports/energy_systems/water_to_water_hp_export.py b/exports/energy_systems/water_to_water_hp_export.py index 07787218..a0be32d3 100644 --- a/exports/energy_systems/water_to_water_hp_export.py +++ b/exports/energy_systems/water_to_water_hp_export.py @@ -2,7 +2,8 @@ WaterToWaterHPExport exports water to water values after executing insel. Multiple files are generated for the export SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ from exports.energy_systems.heat_pump_export import HeatPumpExport from typing import List, Tuple, Union diff --git a/exports/energy_systems_factory.py b/exports/energy_systems_factory.py index 8f4daa93..27442e1b 100644 --- a/exports/energy_systems_factory.py +++ b/exports/energy_systems_factory.py @@ -1,7 +1,8 @@ """ EnergySystemsFactory exports energy systems into several formats SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ from pathlib import Path diff --git a/exports/exports_factory.py b/exports/exports_factory.py index 6ea6b18b..dc910ff5 100644 --- a/exports/exports_factory.py +++ b/exports/exports_factory.py @@ -1,7 +1,8 @@ """ ExportsFactory export a city into several formats SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pathlib import Path diff --git a/exports/formats/energy_ade.py b/exports/formats/energy_ade.py index cf335397..315bc131 100644 --- a/exports/formats/energy_ade.py +++ b/exports/formats/energy_ade.py @@ -1,7 +1,8 @@ """ ExportsFactory export a city into several formats SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import uuid diff --git a/exports/formats/idf.py b/exports/formats/idf.py index 54e899d3..4a0c0175 100644 --- a/exports/formats/idf.py +++ b/exports/formats/idf.py @@ -1,7 +1,10 @@ """ TestOccupancyFactory test and validate the city model structure schedules parameters SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Soroush Samareh Abolhassani - soroush.samarehabolhassani@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Guillermo.GutierrezMorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca + Soroush Samareh Abolhassani soroush.samarehabolhassani@mail.concordia.ca """ from geomeppy import IDF diff --git a/exports/formats/obj.py b/exports/formats/obj.py index 00e84e1f..bf1bee2b 100644 --- a/exports/formats/obj.py +++ b/exports/formats/obj.py @@ -1,7 +1,8 @@ """ export a city into Obj format SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pathlib import Path diff --git a/exports/formats/simplified_radiosity_algorithm.py b/exports/formats/simplified_radiosity_algorithm.py index 9f5d6104..d40a4908 100644 --- a/exports/formats/simplified_radiosity_algorithm.py +++ b/exports/formats/simplified_radiosity_algorithm.py @@ -1,7 +1,8 @@ """ Simplified Radiosity Algorithm SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guillermo.GutierrezMorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guillermo.GutierrezMorote@concordia.ca """ import xmltodict diff --git a/exports/formats/stl.py b/exports/formats/stl.py index ac1d2aed..30479a95 100644 --- a/exports/formats/stl.py +++ b/exports/formats/stl.py @@ -1,7 +1,8 @@ """ export a city into Stl format SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from exports.formats.triangular import Triangular diff --git a/exports/formats/triangular.py b/exports/formats/triangular.py index 60292a76..25715d5b 100644 --- a/exports/formats/triangular.py +++ b/exports/formats/triangular.py @@ -1,7 +1,8 @@ """ export a city from trimesh into Triangular format (obj or stl) SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pathlib import Path from trimesh import Trimesh diff --git a/helpers/configuration_helper.py b/helpers/configuration_helper.py index 51d9a3d8..d6aca652 100644 --- a/helpers/configuration_helper.py +++ b/helpers/configuration_helper.py @@ -1,7 +1,8 @@ """ Configuration helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import configparser from pathlib import Path diff --git a/helpers/constants.py b/helpers/constants.py index b4291102..9707ffd9 100644 --- a/helpers/constants.py +++ b/helpers/constants.py @@ -1,7 +1,8 @@ """ Constant module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ # universal constants diff --git a/helpers/enrich_city.py b/helpers/enrich_city.py index cc5067a1..7e0f47cf 100644 --- a/helpers/enrich_city.py +++ b/helpers/enrich_city.py @@ -1,7 +1,8 @@ """ Enrich city SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from imports.construction_factory import ConstructionFactory diff --git a/helpers/geometry_helper.py b/helpers/geometry_helper.py index 3b7977aa..d6b0979f 100644 --- a/helpers/geometry_helper.py +++ b/helpers/geometry_helper.py @@ -1,8 +1,9 @@ """ Geometry helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import math import numpy as np diff --git a/helpers/location.py b/helpers/location.py index f25d24e4..087256bf 100644 --- a/helpers/location.py +++ b/helpers/location.py @@ -1,8 +1,9 @@ """ Location module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ diff --git a/helpers/monthly_to_hourly_demand.py b/helpers/monthly_to_hourly_demand.py index 029a42dd..bc7d11d4 100644 --- a/helpers/monthly_to_hourly_demand.py +++ b/helpers/monthly_to_hourly_demand.py @@ -1,7 +1,8 @@ """ monthly_to_hourly_demand module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import calendar as cal import pandas as pd diff --git a/helpers/yearly_from_daily_schedules.py b/helpers/yearly_from_daily_schedules.py index 2c4cd21a..d5ab535f 100644 --- a/helpers/yearly_from_daily_schedules.py +++ b/helpers/yearly_from_daily_schedules.py @@ -1,7 +1,8 @@ """ Yearly from daily schedules module SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import calendar as cal import helpers.constants as cte diff --git a/imports/construction/ca_physics_parameters.py b/imports/construction/ca_physics_parameters.py index 6f4120fc..445bb378 100644 --- a/imports/construction/ca_physics_parameters.py +++ b/imports/construction/ca_physics_parameters.py @@ -1,7 +1,8 @@ """ CaPhysicsParameters import the construction and material information for Canada SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys from imports.construction.helpers.construction_helper import ConstructionHelper diff --git a/imports/construction/data_classes/building_achetype.py b/imports/construction/data_classes/building_achetype.py index fb35bad6..199cc5a4 100644 --- a/imports/construction/data_classes/building_achetype.py +++ b/imports/construction/data_classes/building_achetype.py @@ -1,7 +1,8 @@ """ BuildingArchetype stores construction information by building archetypes SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List from imports.construction.data_classes.thermal_boundary_archetype import ThermalBoundaryArchetype diff --git a/imports/construction/data_classes/layer_archetype.py b/imports/construction/data_classes/layer_archetype.py index adad7439..ece0efc5 100644 --- a/imports/construction/data_classes/layer_archetype.py +++ b/imports/construction/data_classes/layer_archetype.py @@ -1,7 +1,8 @@ """ LayerArchetype stores layer and materials information, complementing the BuildingArchetype class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ diff --git a/imports/construction/data_classes/thermal_boundary_archetype.py b/imports/construction/data_classes/thermal_boundary_archetype.py index 11aecf44..36ed66bd 100644 --- a/imports/construction/data_classes/thermal_boundary_archetype.py +++ b/imports/construction/data_classes/thermal_boundary_archetype.py @@ -1,7 +1,8 @@ """ ThermalBoundaryArchetype stores thermal boundaries information, complementing the BuildingArchetype class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List diff --git a/imports/construction/data_classes/thermal_opening_archetype.py b/imports/construction/data_classes/thermal_opening_archetype.py index fc729769..bfa7a026 100644 --- a/imports/construction/data_classes/thermal_opening_archetype.py +++ b/imports/construction/data_classes/thermal_opening_archetype.py @@ -1,7 +1,8 @@ """ ThermalOpeningArchetype stores thermal openings information, complementing the BuildingArchetype class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ diff --git a/imports/construction/helpers/construction_helper.py b/imports/construction/helpers/construction_helper.py index ba93d614..c81180ed 100644 --- a/imports/construction/helpers/construction_helper.py +++ b/imports/construction/helpers/construction_helper.py @@ -1,7 +1,8 @@ """ Construction helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys from helpers import constants as cte diff --git a/imports/construction/helpers/storeys_generation.py b/imports/construction/helpers/storeys_generation.py index da0b4dcc..d33a6c51 100644 --- a/imports/construction/helpers/storeys_generation.py +++ b/imports/construction/helpers/storeys_generation.py @@ -1,7 +1,8 @@ """ Storeys generation helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys import math diff --git a/imports/construction/nrel_physics_interface.py b/imports/construction/nrel_physics_interface.py index 1c23b106..268d55d4 100644 --- a/imports/construction/nrel_physics_interface.py +++ b/imports/construction/nrel_physics_interface.py @@ -2,7 +2,8 @@ Nrel-based interface, it reads format defined within the CERC team based on NREL structure and enriches the city with archetypes and materials SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import xmltodict @@ -137,7 +138,8 @@ class NrelPhysicsInterface: if units != 'W/m2 K': raise Exception(f'overall U-value units = {units}, expected W/m2 K') g_value = w_lib['g_value'] - thermal_opening = ntoa(frame_ratio=frame_ratio, g_value=g_value, overall_u_value=overall_u_value) + thermal_opening = ntoa(frame_ratio=frame_ratio, g_value=g_value, overall_u_value=overall_u_value, + construction_name=window_construction_name) if 'outside_thermal_absorptance' in c_lib: outside_solar_absorptance = c_lib['outside_solar_absorptance']['#text'] diff --git a/imports/construction/us_physics_parameters.py b/imports/construction/us_physics_parameters.py index 9673d921..0828e41b 100644 --- a/imports/construction/us_physics_parameters.py +++ b/imports/construction/us_physics_parameters.py @@ -1,8 +1,9 @@ """ UsPhysicsParameters import the construction and material information for US SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys diff --git a/imports/construction_factory.py b/imports/construction_factory.py index e65d5552..3298bf51 100644 --- a/imports/construction_factory.py +++ b/imports/construction_factory.py @@ -1,7 +1,8 @@ """ ConstructionFactory (before PhysicsFactory) retrieve the specific construction module for the given region SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pathlib import Path from imports.construction.us_physics_parameters import UsPhysicsParameters diff --git a/imports/customized_imports/helpers/sanam_customized_usage_helper.py b/imports/customized_imports/helpers/sanam_customized_usage_helper.py index 7bf73f65..a2de6577 100644 --- a/imports/customized_imports/helpers/sanam_customized_usage_helper.py +++ b/imports/customized_imports/helpers/sanam_customized_usage_helper.py @@ -1,7 +1,8 @@ """ Sanam's customized importer Usage helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys import helpers.constants as cte diff --git a/imports/customized_imports/sanam_customized_usage_parameters.py b/imports/customized_imports/sanam_customized_usage_parameters.py index ea3cac62..f746014f 100644 --- a/imports/customized_imports/sanam_customized_usage_parameters.py +++ b/imports/customized_imports/sanam_customized_usage_parameters.py @@ -1,7 +1,8 @@ """ SanamCustomizedUsageParameters add two parameters to usage properties from ASHRAE SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys diff --git a/imports/customized_imports_factory.py b/imports/customized_imports_factory.py index 0a072f89..24b55ec3 100644 --- a/imports/customized_imports_factory.py +++ b/imports/customized_imports_factory.py @@ -2,7 +2,8 @@ CustomizedImportsFactory is used to import any information using user customized formats This factory can only be called after calling the construction factory. SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path diff --git a/imports/energy_systems/air_source_hp_parameters.py b/imports/energy_systems/air_source_hp_parameters.py index 664207c2..decb6617 100644 --- a/imports/energy_systems/air_source_hp_parameters.py +++ b/imports/energy_systems/air_source_hp_parameters.py @@ -1,8 +1,8 @@ """ AirSourceHeatPumpParameters import the heat pump information SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Peter Yefi peteryefi@gmail.com -Contributor Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.comCode contributor Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import pandas as pd diff --git a/imports/energy_systems/water_to_water_hp_parameters.py b/imports/energy_systems/water_to_water_hp_parameters.py index 346c5e3f..8df8563f 100644 --- a/imports/energy_systems/water_to_water_hp_parameters.py +++ b/imports/energy_systems/water_to_water_hp_parameters.py @@ -1,7 +1,8 @@ """ WaterToWaterHPParameters import the heat pump information SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ import pandas as pd diff --git a/imports/energy_systems_factory.py b/imports/energy_systems_factory.py index 466ff936..98cb000d 100644 --- a/imports/energy_systems_factory.py +++ b/imports/energy_systems_factory.py @@ -1,8 +1,9 @@ """ EnergySystemsFactory retrieve the energy system module for the given region SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete pilar.monsalvete@concordi.ca -Contributor Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete pilar.monsalvete@concordi. +Code contributors: Peter Yefi peteryefi@gmail.com """ from pathlib import Path from imports.energy_systems.air_source_hp_parameters import AirSourceHeatPumpParameters diff --git a/imports/geometry/citygml.py b/imports/geometry/citygml.py index 09803d55..403f7db5 100644 --- a/imports/geometry/citygml.py +++ b/imports/geometry/citygml.py @@ -1,7 +1,8 @@ """ CityGml module parses citygml_classes files and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import numpy as np import xmltodict diff --git a/imports/geometry/citygml_classes/citygml_base.py b/imports/geometry/citygml_classes/citygml_base.py index 18bc6214..38fe3f36 100644 --- a/imports/geometry/citygml_classes/citygml_base.py +++ b/imports/geometry/citygml_classes/citygml_base.py @@ -1,7 +1,8 @@ """ CityGmlBase module abstract class to template the different level of details SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from abc import ABC diff --git a/imports/geometry/citygml_classes/citygml_lod1.py b/imports/geometry/citygml_classes/citygml_lod1.py index 7c7e93ce..5c16e444 100644 --- a/imports/geometry/citygml_classes/citygml_lod1.py +++ b/imports/geometry/citygml_classes/citygml_lod1.py @@ -2,7 +2,8 @@ CityGmlLod1 module parses citygml_classes files with level of detail 1 and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from imports.geometry.citygml_classes.citygml_base import CityGmlBase diff --git a/imports/geometry/citygml_classes/citygml_lod2.py b/imports/geometry/citygml_classes/citygml_lod2.py index 40181e8a..f2281568 100644 --- a/imports/geometry/citygml_classes/citygml_lod2.py +++ b/imports/geometry/citygml_classes/citygml_lod2.py @@ -2,7 +2,8 @@ CityGmlLod1 module parses citygml_classes files with level of detail 1 and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from imports.geometry.citygml_classes.citygml_base import CityGmlBase diff --git a/imports/geometry/helpers/geometry_helper.py b/imports/geometry/helpers/geometry_helper.py index 7307673a..17504da5 100644 --- a/imports/geometry/helpers/geometry_helper.py +++ b/imports/geometry/helpers/geometry_helper.py @@ -1,7 +1,8 @@ """ Geometry helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import helpers.constants as cte diff --git a/imports/geometry/obj.py b/imports/geometry/obj.py index 3ce1fae3..68460d4c 100644 --- a/imports/geometry/obj.py +++ b/imports/geometry/obj.py @@ -1,7 +1,8 @@ """ Obj module parses obj files and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import trimesh.exchange.load from trimesh import Scene diff --git a/imports/geometry/osm_subway.py b/imports/geometry/osm_subway.py index dc85facf..c007839a 100644 --- a/imports/geometry/osm_subway.py +++ b/imports/geometry/osm_subway.py @@ -1,7 +1,8 @@ """ OsmSubway module parses osm files and import the metro location into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import sys diff --git a/imports/geometry/rhino.py b/imports/geometry/rhino.py index 1d0b63c0..bdee4a41 100644 --- a/imports/geometry/rhino.py +++ b/imports/geometry/rhino.py @@ -1,7 +1,8 @@ """ Rhino module parses rhino files and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from numpy import inf from rhino3dm import * diff --git a/imports/geometry_factory.py b/imports/geometry_factory.py index b594da08..7254e8af 100644 --- a/imports/geometry_factory.py +++ b/imports/geometry_factory.py @@ -1,7 +1,8 @@ """ GeometryFactory retrieve the specific geometric module to load the given format SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from city_model_structure.city import City diff --git a/imports/life_cycle_assessment/lca_fuel.py b/imports/life_cycle_assessment/lca_fuel.py index bc515a91..7089918a 100644 --- a/imports/life_cycle_assessment/lca_fuel.py +++ b/imports/life_cycle_assessment/lca_fuel.py @@ -1,8 +1,8 @@ """ CityGml module parses citygml_classes files and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ import xmltodict from pathlib import Path diff --git a/imports/life_cycle_assessment/lca_machine.py b/imports/life_cycle_assessment/lca_machine.py index 87c35c5c..01eed943 100644 --- a/imports/life_cycle_assessment/lca_machine.py +++ b/imports/life_cycle_assessment/lca_machine.py @@ -1,8 +1,8 @@ """ CityGml module parses citygml_classes files and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ import xmltodict from pathlib import Path diff --git a/imports/life_cycle_assessment/lca_material.py b/imports/life_cycle_assessment/lca_material.py index 88253871..7ac4b4ee 100644 --- a/imports/life_cycle_assessment/lca_material.py +++ b/imports/life_cycle_assessment/lca_material.py @@ -1,8 +1,8 @@ """ CityGml module parses citygml_classes files and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ import xmltodict from pathlib import Path diff --git a/imports/life_cycle_assessment/lca_vehicle.py b/imports/life_cycle_assessment/lca_vehicle.py index 2125be95..60778ff2 100644 --- a/imports/life_cycle_assessment/lca_vehicle.py +++ b/imports/life_cycle_assessment/lca_vehicle.py @@ -1,8 +1,8 @@ """ CityGml module parses citygml_classes files and import the geometry into the city model structure SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ import xmltodict from pathlib import Path diff --git a/imports/life_cycle_assessment_factory.py b/imports/life_cycle_assessment_factory.py index f779bee5..b2cd172c 100644 --- a/imports/life_cycle_assessment_factory.py +++ b/imports/life_cycle_assessment_factory.py @@ -1,8 +1,8 @@ """ ConstructionFactory (before PhysicsFactory) retrieve the specific construction module for the given region SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ from pathlib import Path diff --git a/imports/schedules/comnet_schedules_parameters.py b/imports/schedules/comnet_schedules_parameters.py index 2eaac773..7897d274 100644 --- a/imports/schedules/comnet_schedules_parameters.py +++ b/imports/schedules/comnet_schedules_parameters.py @@ -1,8 +1,9 @@ """ Schedules retrieve the specific usage schedules module for the given standard SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import pandas as pd from imports.schedules.helpers.schedules_helper import SchedulesHelper diff --git a/imports/schedules/doe_idf.py b/imports/schedules/doe_idf.py index 61390199..b37f86d1 100644 --- a/imports/schedules/doe_idf.py +++ b/imports/schedules/doe_idf.py @@ -1,8 +1,9 @@ """ Building test SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Guille Gutierrez Morote Guillermo.GutierrezMorote@concordia.ca -Contributor Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez Morote Guillermo.GutierrezMorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import pandas as pd diff --git a/imports/schedules/helpers/schedules_helper.py b/imports/schedules/helpers/schedules_helper.py index 4d4881a5..0cdc3d3a 100644 --- a/imports/schedules/helpers/schedules_helper.py +++ b/imports/schedules/helpers/schedules_helper.py @@ -1,8 +1,9 @@ """ Schedules helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys import helpers.constants as cte diff --git a/imports/schedules_factory.py b/imports/schedules_factory.py index 3842889a..5ce61681 100644 --- a/imports/schedules_factory.py +++ b/imports/schedules_factory.py @@ -2,7 +2,8 @@ SchedulesFactory retrieve the specific schedules module for the given standard This factory can only be called after calling the usage factory so the usage zones are created. SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from pathlib import Path diff --git a/imports/sensors/concordia_energy_consumption.py b/imports/sensors/concordia_energy_consumption.py index 4f3c7d63..2f8b5d2f 100644 --- a/imports/sensors/concordia_energy_consumption.py +++ b/imports/sensors/concordia_energy_consumption.py @@ -1,7 +1,8 @@ """ Concordia energy consumption SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import pandas as pd from imports.sensors.concordia_file_report import ConcordiaFileReport diff --git a/imports/sensors/concordia_file_report.py b/imports/sensors/concordia_file_report.py index 6f360f86..eae5554a 100644 --- a/imports/sensors/concordia_file_report.py +++ b/imports/sensors/concordia_file_report.py @@ -1,7 +1,8 @@ """ Concordia file report SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ import io diff --git a/imports/sensors/concordia_gas_flow.py b/imports/sensors/concordia_gas_flow.py index e9176fc7..fcf6fc3a 100644 --- a/imports/sensors/concordia_gas_flow.py +++ b/imports/sensors/concordia_gas_flow.py @@ -1,7 +1,8 @@ """ Concordia gas flow SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import pandas as pd from imports.sensors.concordia_file_report import ConcordiaFileReport diff --git a/imports/sensors/concordia_temperature.py b/imports/sensors/concordia_temperature.py index f4b937a8..d2a3b7f4 100644 --- a/imports/sensors/concordia_temperature.py +++ b/imports/sensors/concordia_temperature.py @@ -1,7 +1,8 @@ """ Concordia temperature SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import pandas as pd from imports.sensors.concordia_file_report import ConcordiaFileReport diff --git a/imports/sensors_factory.py b/imports/sensors_factory.py index 98fbb809..f161b8fc 100644 --- a/imports/sensors_factory.py +++ b/imports/sensors_factory.py @@ -1,8 +1,9 @@ """ SensorsFactory retrieve sensors information SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path diff --git a/imports/usage/ca_usage_parameters.py b/imports/usage/ca_usage_parameters.py index b2320fa6..22397d8b 100644 --- a/imports/usage/ca_usage_parameters.py +++ b/imports/usage/ca_usage_parameters.py @@ -1,7 +1,8 @@ """ CaUsageParameters model the usage properties SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys diff --git a/imports/usage/comnet_usage_parameters.py b/imports/usage/comnet_usage_parameters.py index 5d159af7..7d001aa8 100644 --- a/imports/usage/comnet_usage_parameters.py +++ b/imports/usage/comnet_usage_parameters.py @@ -1,7 +1,8 @@ """ ComnetUsageParameters model the usage properties SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys diff --git a/imports/usage/data_classes/hft_internal_gains_archetype.py b/imports/usage/data_classes/hft_internal_gains_archetype.py index cc21a77a..9a39d3f9 100644 --- a/imports/usage/data_classes/hft_internal_gains_archetype.py +++ b/imports/usage/data_classes/hft_internal_gains_archetype.py @@ -1,7 +1,8 @@ """ HftInternalGainsArchetype stores internal gains information, complementing the HftUsageZoneArchetype class SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ diff --git a/imports/usage/data_classes/usage_zone_archetype.py b/imports/usage/data_classes/usage_zone_archetype.py index 67d1f964..8ea43367 100644 --- a/imports/usage/data_classes/usage_zone_archetype.py +++ b/imports/usage/data_classes/usage_zone_archetype.py @@ -1,7 +1,8 @@ """ UsageZoneArchetype stores usage information by usage type SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from typing import List diff --git a/imports/usage/helpers/usage_helper.py b/imports/usage/helpers/usage_helper.py index 98f873da..db3b45df 100644 --- a/imports/usage/helpers/usage_helper.py +++ b/imports/usage/helpers/usage_helper.py @@ -1,7 +1,8 @@ """ Usage helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys import helpers.constants as cte diff --git a/imports/usage/hft_usage_interface.py b/imports/usage/hft_usage_interface.py index 959afbef..a8ca2ad6 100644 --- a/imports/usage/hft_usage_interface.py +++ b/imports/usage/hft_usage_interface.py @@ -2,7 +2,8 @@ Hft-based interface, it reads format defined within the CERC team (based on that one used in SimStadt and developed by the IAF team at hft-Stuttgart) SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import xmltodict import copy diff --git a/imports/usage/hft_usage_parameters.py b/imports/usage/hft_usage_parameters.py index 48a7b267..c05e5658 100644 --- a/imports/usage/hft_usage_parameters.py +++ b/imports/usage/hft_usage_parameters.py @@ -1,7 +1,8 @@ """ HftUsageParameters model the usage properties SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys import copy diff --git a/imports/usage_factory.py b/imports/usage_factory.py index 165e7f45..ad446857 100644 --- a/imports/usage_factory.py +++ b/imports/usage_factory.py @@ -2,8 +2,9 @@ UsageFactory retrieve the specific usage module for the given region This factory can only be called after calling the construction factory so the thermal zones are created. SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from imports.usage.hft_usage_parameters import HftUsageParameters diff --git a/imports/weather/dat_weather_parameters.py b/imports/weather/dat_weather_parameters.py index 3554090a..c9414d6f 100644 --- a/imports/weather/dat_weather_parameters.py +++ b/imports/weather/dat_weather_parameters.py @@ -1,7 +1,8 @@ """ DatWeatherParameters class to extract weather parameters from a defined region in .dat format SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys diff --git a/imports/weather/epw_weather_parameters.py b/imports/weather/epw_weather_parameters.py index 89d7dab0..c0db288a 100644 --- a/imports/weather/epw_weather_parameters.py +++ b/imports/weather/epw_weather_parameters.py @@ -1,7 +1,8 @@ """ EpwWeatherParameters class to extract weather parameters from a defined region in .epw format (EnergyPlus Weather) SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys diff --git a/imports/weather/helpers/weather.py b/imports/weather/helpers/weather.py index 9e6fc181..1e8799e6 100644 --- a/imports/weather/helpers/weather.py +++ b/imports/weather/helpers/weather.py @@ -1,7 +1,8 @@ """ weather helper SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import math import helpers.constants as cte diff --git a/imports/weather/xls_weather_parameters.py b/imports/weather/xls_weather_parameters.py index 93e92385..33aef0b6 100644 --- a/imports/weather/xls_weather_parameters.py +++ b/imports/weather/xls_weather_parameters.py @@ -2,7 +2,8 @@ XlsWeatherParameters class to extract weather parameters from a defined region in .xls format defined and used by the norm iso 52016-1:2017 SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ import sys diff --git a/imports/weather_factory.py b/imports/weather_factory.py index 4a650f8e..83c15cf9 100644 --- a/imports/weather_factory.py +++ b/imports/weather_factory.py @@ -1,7 +1,8 @@ """ WeatherFactory retrieve the specific weather module for the given source format SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from imports.weather.xls_weather_parameters import XlsWeatherParameters diff --git a/unittests/test_construction_factory.py b/unittests/test_construction_factory.py index 9348e8d3..17790ebb 100644 --- a/unittests/test_construction_factory.py +++ b/unittests/test_construction_factory.py @@ -1,7 +1,8 @@ """ TestConstructionFactory test and validate the city model structure construction parameters SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2022 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from unittest import TestCase diff --git a/unittests/test_customized_imports_factory.py b/unittests/test_customized_imports_factory.py index 245a8821..127666a3 100644 --- a/unittests/test_customized_imports_factory.py +++ b/unittests/test_customized_imports_factory.py @@ -1,7 +1,8 @@ """ TestCustomizedImportsFactory tests and validates the factory to import customized data SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from unittest import TestCase diff --git a/unittests/test_doe_idf.py b/unittests/test_doe_idf.py index c75e6372..de587093 100644 --- a/unittests/test_doe_idf.py +++ b/unittests/test_doe_idf.py @@ -1,7 +1,8 @@ """ Building test SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez Morote Guillermo.GutierrezMorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez Morote Guillermo.GutierrezMorote@concordia.ca """ from pathlib import Path from unittest import TestCase diff --git a/unittests/test_energy_systems_air_source_hp.py b/unittests/test_energy_systems_air_source_hp.py index ca9ab04e..6f4edad8 100644 --- a/unittests/test_energy_systems_air_source_hp.py +++ b/unittests/test_energy_systems_air_source_hp.py @@ -1,7 +1,8 @@ """ Test EnergySystemsFactory and various heatpump models SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ import pandas as pd from unittest import TestCase diff --git a/unittests/test_energy_systems_water_to_water_hp.py b/unittests/test_energy_systems_water_to_water_hp.py index 9517476b..889f9127 100644 --- a/unittests/test_energy_systems_water_to_water_hp.py +++ b/unittests/test_energy_systems_water_to_water_hp.py @@ -1,7 +1,8 @@ """ Test EnergySystemsFactory and various heatpump models SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2021 Project Author Peter Yefi peteryefi@gmail.com +Copyright © 2022 Concordia CERC group +Project Coder Peter Yefi peteryefi@gmail.com """ from unittest import TestCase from imports.geometry_factory import GeometryFactory diff --git a/unittests/test_enrichement.py b/unittests/test_enrichement.py index 95861429..b8e10551 100644 --- a/unittests/test_enrichement.py +++ b/unittests/test_enrichement.py @@ -1,7 +1,8 @@ """ TestGeometryFactory test and validate the city model structure geometric parameters SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from unittest import TestCase diff --git a/unittests/test_exports.py b/unittests/test_exports.py index 20900b6f..25bbf6fe 100644 --- a/unittests/test_exports.py +++ b/unittests/test_exports.py @@ -1,8 +1,9 @@ """ TestExports test and validate the city export formats SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca -Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Code contributors: Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path diff --git a/unittests/test_geometry_factory.py b/unittests/test_geometry_factory.py index d3fc1473..7686f185 100644 --- a/unittests/test_geometry_factory.py +++ b/unittests/test_geometry_factory.py @@ -1,7 +1,8 @@ """ TestGeometryFactory test and validate the city model structure geometric parameters SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from unittest import TestCase diff --git a/unittests/test_greenery_catalog.py b/unittests/test_greenery_catalog.py index 74869808..9cf75a3d 100644 --- a/unittests/test_greenery_catalog.py +++ b/unittests/test_greenery_catalog.py @@ -1,7 +1,8 @@ """ TestGeometryFactory test and validate the city model structure geometric parameters SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ from unittest import TestCase diff --git a/unittests/test_life_cycle_assessment_factory.py b/unittests/test_life_cycle_assessment_factory.py index f7134f20..2c5de645 100644 --- a/unittests/test_life_cycle_assessment_factory.py +++ b/unittests/test_life_cycle_assessment_factory.py @@ -1,8 +1,8 @@ """ Building test SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Atiya atiya.atiya@mail.concordia.ca -Contributor Mohammad Reza mohammad.seyedabadi@mail.concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Atiya atiya.atiya@mail.concordia.ca """ from pathlib import Path from unittest import TestCase diff --git a/unittests/test_schedules_factory.py b/unittests/test_schedules_factory.py index f59f3cf6..1f9dbc02 100644 --- a/unittests/test_schedules_factory.py +++ b/unittests/test_schedules_factory.py @@ -1,7 +1,8 @@ """ TestSchedulesFactory test and validate the city model structure schedules SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from unittest import TestCase diff --git a/unittests/test_usage_factory.py b/unittests/test_usage_factory.py index 2bcb6ceb..641be4ea 100644 --- a/unittests/test_usage_factory.py +++ b/unittests/test_usage_factory.py @@ -1,7 +1,8 @@ """ TestUsageFactory test and validate the city model structure usage parameters SPDX - License - Identifier: LGPL - 3.0 - or -later -Copyright © 2020 Project Author Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca +Copyright © 2022 Concordia CERC group +Project Coder Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca """ from pathlib import Path from unittest import TestCase