From 69d7f9d7af8e9615185ae6205723550262f5dc73 Mon Sep 17 00:00:00 2001 From: Pilar Date: Mon, 15 Mar 2021 11:47:30 -0400 Subject: [PATCH] actualized requirements.txt --- .idea/libs.iml | 3 + city_model_structure/attributes/surface.py | 2 +- .../attributes/thermal_zone.py | 6 +- city_model_structure/building.py | 4 +- city_model_structure/city.py | 22 ++- city_model_structure/city_object.py | 1 - requirements.txt | 62 +-------- tests/test_geometry_factory.py | 131 +++++++++--------- tests_data/kelowna_test_case.pickle | Bin 35312 -> 0 bytes 9 files changed, 99 insertions(+), 132 deletions(-) delete mode 100644 tests_data/kelowna_test_case.pickle diff --git a/.idea/libs.iml b/.idea/libs.iml index 7c3d775b..c268a131 100644 --- a/.idea/libs.iml +++ b/.idea/libs.iml @@ -9,4 +9,7 @@ + + \ No newline at end of file diff --git a/city_model_structure/attributes/surface.py b/city_model_structure/attributes/surface.py index b1be28d8..0ff20d18 100644 --- a/city_model_structure/attributes/surface.py +++ b/city_model_structure/attributes/surface.py @@ -16,7 +16,7 @@ class Surface: """ Surface class """ - def __init__(self, coordinates, holes_coordinates=None, surface_type=None, name=None, swr='0.2'): + def __init__(self, coordinates, holes_coordinates=None, surface_type=None, name=None, swr=None): self._coordinates = coordinates self._holes_coordinates = holes_coordinates self._type = surface_type diff --git a/city_model_structure/attributes/thermal_zone.py b/city_model_structure/attributes/thermal_zone.py index a1345312..00c17dc9 100644 --- a/city_model_structure/attributes/thermal_zone.py +++ b/city_model_structure/attributes/thermal_zone.py @@ -32,7 +32,7 @@ class ThermalZone: self._volume = None @property - def heated(self): + def is_heated(self): """ Get thermal zone heated flag :return: Boolean @@ -40,7 +40,7 @@ class ThermalZone: return self._is_heated @property - def cooled(self): + def is_cooled(self): """ Get thermal zone cooled flag :return: Boolean @@ -79,7 +79,7 @@ class ThermalZone: @property def surfaces(self) -> List[Surface]: - # todo: This property should be erased + # todo: This property should be erased (@Guille: why??) """ Get thermal zone surfaces :return: [Surface] diff --git a/city_model_structure/building.py b/city_model_structure/building.py index 54cb5ae6..48f2380f 100644 --- a/city_model_structure/building.py +++ b/city_model_structure/building.py @@ -145,7 +145,7 @@ class Building(CityObject): :return: float """ # ToDo: this need to be calculated based on the basement and attic heated values - return self.volume + raise NotImplementedError @property def year_of_construction(self): @@ -329,7 +329,7 @@ class Building(CityObject): # height = self.average_storey_height number_of_storeys = 4 height = 1.5 - mesh = self.polyhedron.polyhedron_trimesh + mesh = self.simplified_polyhedron.polyhedron_trimesh normal_plane = [0, 0, -1] rest_mesh = mesh for n in range(0, number_of_storeys - 1): diff --git a/city_model_structure/city.py b/city_model_structure/city.py index cb87779d..4a4216ee 100644 --- a/city_model_structure/city.py +++ b/city_model_structure/city.py @@ -31,6 +31,7 @@ class City: self._geometry = GeometryHelper() # todo: right now extracted at city level, in the future should be extracted also at building level if exist self._location = None + self._country_code = None @property def _get_location(self): @@ -53,7 +54,16 @@ class City: City country code :return: str """ - return self._get_location[0] + return self._country_code + + @country_code.setter + def country_code(self, value): + """ + City country code + :param value:str + :return: None + """ + self._country_code = value @property def name(self): @@ -61,7 +71,15 @@ class City: City name :return: str """ - return self._get_location[1] + return self._name + + @name.setter + def name(self, value): + """ + City name + :return: str + """ + self._name = value @property def city_objects(self) -> Union[List[CityObject], None]: diff --git a/city_model_structure/city_object.py b/city_model_structure/city_object.py index d9f6f488..cab047bf 100644 --- a/city_model_structure/city_object.py +++ b/city_model_structure/city_object.py @@ -3,7 +3,6 @@ CityObject module SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca """ -from pathlib import Path from typing import List, Union from city_model_structure.attributes.surface import Surface from helpers.geometry_helper import GeometryHelper diff --git a/requirements.txt b/requirements.txt index 3da4534a..24f9d4f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,58 +1,10 @@ xmltodict~=0.12.0 -numpy~=1.19.0 -trimesh~=3.7.0 -pyproj~=2.6.1.post1 -pyny3d~=0.2 -matplotlib~=3.2.1 -Shapely~=1.7.0 -pandas~=1.0.4 -pip>=20.1.1 -pyzmq~=19.0.1 -pexpect~=4.8.0 -tornado~=6.0.4 -parso~=0.7.0 -jedi~=0.17.0 -pytz~=2020.1 -setuptools~=47.3.0 -scipy~=1.5.0 -six~=1.15.0 -webencodings~=0.5.1 -packaging~=20.4 -bleach~=3.1.5 -MarkupSafe~=1.1.1 -ipywidgets~=7.5.1 -traitlets~=4.3.3 -ipython~=7.15.0 -python-dateutil~=2.8.1 -Pygments~=2.6.1 -ipykernel~=5.3.0 -testpath~=0.4.4 -decorator~=4.4.2 -backcall~=0.2.0 -pickleshare~=0.7.5 -wcwidth~=0.2.4 -ptyprocess~=0.6.0 -notebook~=6.0.3 -nbformat~=5.0.7 -jsonschema~=3.2.0 -Jinja2~=2.11.2 -Send2Trash~=1.5.0 -terminado~=0.8.3 -nbconvert~=5.6.1 -defusedxml~=0.6.0 -pandocfilters~=1.4.2 -mistune~=0.8.4 -entrypoints~=0.3 -pyparsing~=2.4.7 -attrs~=19.3.0 -pyrsistent~=0.16.0 -cycler~=0.10.0 -kiwisolver~=1.2.0 -zipp~=3.1.0 -requests~=2.24.0 +numpy~=1.20.1 +trimesh~=3.9.8 +pyproj~=3.0.1 +pandas~=1.2.3 +requests~=2.25.1 esoreader~=1.2.3 geomeppy~=0.11.8 -pyglet~=1.5.8 -networkx~=2.5 -xlrd~=1.2.0 -open3d~=0.11.2 \ No newline at end of file +open3d~=0.12.0 +pathlib~=1.0.1 \ No newline at end of file diff --git a/tests/test_geometry_factory.py b/tests/test_geometry_factory.py index 97e2901e..cce65763 100644 --- a/tests/test_geometry_factory.py +++ b/tests/test_geometry_factory.py @@ -22,13 +22,10 @@ class TestGeometryFactory(TestCase): """ self._city_gml = None self._example_path = (Path(__file__).parent.parent / 'tests_data').resolve() - self._pickle_file = (self._example_path / 'kelowna_test_case.pickle').resolve() - self._kelowna_pickle_file = (self._example_path / 'kelowna_test_case.pickle').resolve() - self._output_path = (Path(__file__).parent / 'surface_outputs').resolve() - def _get_citygml(self): + def _get_citygml(self, file): if self._city_gml is None: - file_path = (self._example_path / 'lod2_buildings.gml').resolve() + file_path = (self._example_path / file).resolve() self._city_gml = GeometryFactory('citygml', file_path)._city_debug self.assertIsNotNone(self._city_gml, 'city is none') return self._city_gml @@ -48,7 +45,9 @@ class TestGeometryFactory(TestCase): Test the City from citygml serialization de-serialization :return: None """ - city = self._get_citygml() + file = 'lod2_buildings.gml' + pickle_file = (self._example_path / 'lod2_buildings.pickle').resolve() + city = self._get_citygml(file) self.assertIsNotNone(city.city_objects, 'city_objects is none') for building in city.buildings: self.assertIsNotNone(city.city_object(building.name), 'city_object return none') @@ -57,8 +56,8 @@ class TestGeometryFactory(TestCase): self.assertIsNotNone(city.upper_corner, 'upper_corner is none') self.assertIsNotNone(city.name, 'name is none') self.assertIsNotNone(city.country_code, 'country code is none') - city.save(self._pickle_file) - city = City.load(self._pickle_file) + city.save(pickle_file) + city = City.load(pickle_file) # repeat the city tests self.assertIsNotNone(city.city_objects, 'city_objects is none') for building in city.buildings: @@ -68,31 +67,15 @@ class TestGeometryFactory(TestCase): self.assertIsNotNone(city.upper_corner, 'upper_corner is none') self.assertIsNotNone(city.name, 'name is none') self.assertIsNotNone(city.country_code, 'country code is none') - os.remove(self._pickle_file.resolve()) - - def test_surfaces_triangulation(self): - """ - Test city surfaces triangulation and polygon creation - :return: - """ - print(self._pickle_file) - city = City.load(self._pickle_file) - - counter = 0 - for building in city.buildings: - if building.name != 'BLD121958': - print('building name', building.name) - print('volume', building.name, building.volume) - if str(building.volume) == 'inf': - counter += 1 - print('total number of buildings with volume inf', counter) + os.remove(pickle_file) def test_citygml_buildings(self): """ Test city objects in the city :return: None """ - city = self._get_citygml() + file = 'lod2_buildings.gml' + city = self._get_citygml(file) for building in city.buildings: self.assertIsNotNone(building.name, 'building name is none') self.assertIsNotNone(building.lod, 'building lod is none') @@ -102,26 +85,24 @@ class TestGeometryFactory(TestCase): self.assertIsNotNone(building.volume, 'building volume is none') self.assertIsNotNone(building.surfaces, 'building surfaces is none') self.assertIsNotNone(building.surfaces[0].name, 'surface not found') - self.assertIsNotNone(building.basement_heated, 'building basement_heated is none') - self.assertIsNotNone(building.attic_heated, 'building attic_heated is none') + self.assertIsNone(building.basement_heated, 'building basement_heated is not none') + self.assertIsNone(building.attic_heated, 'building attic_heated is not none') self.assertIsNotNone(building.terrains, 'building terrains is none') - self.assertIsNotNone(building.foot_print, 'building foot_print is none') self.assertIsNotNone(building.usage_zones, 'building usage_zones is none') self.assertIsNone(building.average_storey_height, 'building average_storey_height is not none') self.assertIsNone(building.storeys_above_ground, 'building storeys_above_ground is not none') - self.assertIsNotNone(building.heated_volume, 'building heated_volume is none') self.assertIsNotNone(building.thermal_zones, 'building thermal_zones is none') self.assertIsNotNone(building.type, 'building type is none') self.assertIsNotNone(building.max_height, 'building max_height is none') - building.stl_export(self._example_path) - os.remove(Path(self._example_path, building.name + '.stl').resolve()) + self.assertIsNotNone(building.floor_area, 'building floor_area is none') def test_citygml_surfaces(self): """ Test surfaces in city objects :return: None """ - city = self._get_citygml() + file = 'lod2_buildings.gml' + city = self._get_citygml(file) for building in city.buildings: for surface in building.surfaces: self.assertIsNotNone(surface.name, 'surface name is none') @@ -131,36 +112,45 @@ class TestGeometryFactory(TestCase): self.assertIsNotNone(surface.area_below_ground, 'surface area_below_ground is none') self.assertIsNotNone(surface.area_above_ground, 'surface area_above_ground is none') self.assertIsNotNone(surface.points, 'surface points is none') + self.assertIsNone(surface.holes_points, 'surface holes_points is not none') + self.assertIsNotNone(surface.perimeter_points, 'surface perimeter_points is none') self.assertIsNotNone(surface.points_list, 'surface points_list is none') + self.assertIsNone(surface.holes_points_list, 'surface holes_points_list is not none') + self.assertIsNotNone(surface.perimeter_points_list, 'surface perimeter_points_list is none') self.assertIsNotNone(surface.global_irradiance, 'monthly irradiance is none') - self.assertIsNotNone(surface.swr, 'surface swr is none') + self.assertIsNone(surface.swr, 'surface swr is not none') self.assertIsNotNone(surface.min_x, 'surface min_x is none') self.assertIsNotNone(surface.min_y, 'surface min_y is none') self.assertIsNotNone(surface.min_z, 'surface min_z is none') + self.assertIsNotNone(surface.area_above_ground, 'surface area_above_ground is none') + self.assertIsNotNone(surface.perimeter_polygon, 'surface perimeter_polygon is none') + self.assertIsNone(surface.hole_polygons, 'surface hole_polygons is not none') + self.assertIsNotNone(surface.solid_polygon, 'surface solid_polygon is none') def test_citygml_thermal_zone(self): """ Test thermal zones in city objects :return: None """ - city = self._get_citygml() + file = 'lod2_buildings.gml' + city = self._get_citygml(file) for building in city.buildings: for thermal_zone in building.thermal_zones: self.assertIsNotNone(thermal_zone.surfaces, 'thermal_zone surfaces is none') self.assertIsNotNone(thermal_zone.bounded, 'thermal_zone bounded is none') self.assertIsNotNone(thermal_zone.floor_area, 'thermal_zone floor_area is none') - self.assertIsNotNone(thermal_zone.heated, 'thermal_zone heated is none') - self.assertIsNotNone(thermal_zone.cooled, 'thermal_zone cooled is none') - self.assertEqual(thermal_zone.additional_thermal_bridge_u_value, 0.0, - 'thermal_zone additional_thermal_bridge_u_value is not 0.0') + self.assertIsNone(thermal_zone.is_heated, 'thermal_zone heated is not none') + self.assertIsNone(thermal_zone.is_cooled, 'thermal_zone cooled is not none') + self.assertIsNone(thermal_zone.additional_thermal_bridge_u_value, + 'thermal_zone additional_thermal_bridge_u_value is not none') self.assertIsNone(thermal_zone.effective_thermal_capacity, 'thermal_zone effective_thermal_capacity is not none') - self.assertEqual(thermal_zone.indirectly_heated_area_ratio, 0.0, - 'thermal_zone indirectly_heated_area_ratio is not none') + self.assertIsNone(thermal_zone.indirectly_heated_area_ratio, + 'thermal_zone indirectly_heated_area_ratio is not none') self.assertIsNone(thermal_zone.infiltration_rate_system_off, 'thermal_zone infiltration_rate_system_off is not none') - self.assertEqual(thermal_zone.infiltration_rate_system_on, 0.0, - 'thermal_zone infiltration_rate_system_on is not none') + self.assertIsNone(thermal_zone.infiltration_rate_system_on, + 'thermal_zone infiltration_rate_system_on is not none') self.assertIsNone(thermal_zone.usage_zones, 'thermal_zone usage_zones are not none') @@ -169,10 +159,12 @@ class TestGeometryFactory(TestCase): Test thermal boundaries in thermal zones :return: None """ - city = self._get_citygml() + file = 'lod2_buildings.gml' + city = self._get_citygml(file) for building in city.buildings: for thermal_zone in building.thermal_zones: for thermal_boundary in thermal_zone.bounded: + self.assertIsNotNone(thermal_boundary.surface, 'thermal_boundary surface is none') self.assertIsNotNone(thermal_boundary.type, 'thermal_boundary type is none') self.assertIsNotNone(thermal_boundary.area, 'thermal_boundary area is none') self.assertIsNotNone(thermal_boundary.area_above_ground, 'thermal_boundary area_above_ground is none') @@ -180,31 +172,22 @@ class TestGeometryFactory(TestCase): self.assertIsNotNone(thermal_boundary.azimuth, 'thermal_boundary azimuth is none') self.assertIsNotNone(thermal_boundary.delimits, 'thermal_boundary delimits is none') self.assertIsNotNone(thermal_boundary.inclination, 'thermal_boundary inclination is none') - self.assertRaises(Exception, lambda: thermal_boundary.u_value, 'thermal_boundary u_value was initialized') - self.assertIsNone(thermal_boundary.layers, 'thermal_boundary layers was initialized') - self.assertRaises(Exception, lambda: thermal_boundary.outside_solar_absorptance, - 'thermal_boundary outside_solar_absorptance was initialized') - self.assertIsNone(thermal_boundary.outside_thermal_absorptance, - 'thermal_boundary outside_thermal_absorptance was initialized') - self.assertIsNone(thermal_boundary.outside_visible_absorptance, - 'thermal_boundary outside_visible_absorptance was initialized') - self.assertRaises(Exception, lambda: thermal_boundary.shortwave_reflectance, - 'thermal_boundary shortwave_reflectance was initialized') + # todo: assert exception self.assertRaises(Exception, lambda: thermal_boundary.window_area, 'thermal_boundary window_area was initialized') - self.assertIsNone(thermal_boundary.window_ratio, 'thermal_boundary window_ratio was initialized') def test_citygml_thermal_opening(self): """ Test thermal openings in thermal zones :return: None """ - city = self._get_citygml() + file = 'lod2_buildings.gml' + city = self._get_citygml(file) for building in city.buildings: for thermal_zone in building.thermal_zones: for thermal_boundary in thermal_zone.bounded: for thermal_opening in thermal_boundary.thermal_openings: - self.assertTrue(thermal_opening.frame_ratio == 0, 'thermal_opening frame_ratio was not 0') + self.assertIsNone(thermal_opening.frame_ratio, 'thermal_opening frame_ratio was initialized') self.assertIsNone(thermal_opening.g_value, 'thermal_opening g_value was initialized') self.assertIsNone(thermal_opening.conductivity, 'thermal_opening conductivity_w_mk was initialized') self.assertIsNone(thermal_opening.back_side_solar_transmittance_at_normal_incidence, @@ -215,27 +198,39 @@ class TestGeometryFactory(TestCase): 'thermal_opening front_side_solar_transmittance_at_normal_incidence was initialized') self.assertIsNone(thermal_opening.thickness, 'thermal_opening thickness_m was initialized') self.assertRaises(Exception, lambda: thermal_opening.u_value, 'thermal_opening u_value was initialized') + self.assertIsNone(thermal_opening.overall_u_value, 'thermal_opening overall_u_value was initialized') + self.assertIsNone(thermal_opening.hi, 'thermal_opening hi was initialized') + self.assertIsNone(thermal_opening.he, 'thermal_opening he was initialized') + + def test_surfaces_triangulation(self): + """ + Test city surfaces triangulation and polygon creation + :return: + """ + file = (self._example_path / 'gml_17_12_2020.pickle').resolve() + city = City.load(file) - def test_stuttgart_gml(self): - file_path = (self._example_path / '20190815_mitte_out_MC_FloursurfaceADD.gml').resolve() - city = GeometryFactory('citygml', file_path).city - pickle_file = (self._example_path / '20190815_mitte_out_MC_FloursurfaceADD.pickle').resolve() - city.save(pickle_file) counter = 0 for building in city.buildings: if building.name != 'BLD121958': - print('building name', building.name) - print('volume', building.name, building.volume) + print(building.name, building.volume) if str(building.volume) == 'inf': counter += 1 - building.stl_export(self._output_path) print('total number of buildings with volume inf', counter) + def test_stuttgart_gml(self): + file = '20190815_mitte_out_MC_FloursurfaceADD.gml' + city = self._get_citygml(file) + pickle_file = (self._example_path / '20190815_mitte_out_MC_FloursurfaceADD.pickle').resolve() + city.save(pickle_file) + for building in city.buildings: + self.assertIsNotNone(building.volume, 'building volume is none') + def test_divide_mesh_by_plane(self): - file_path = (self._example_path / 'FZK-Haus-LoD-all-KIT-IAI-KHH-B36-V1.gml').resolve() + file = 'FZK-Haus-LoD-all-KIT-IAI-KHH-B36-V1.gml' # todo @Guille: this file has 5 lods (0, 1, 2, 3 and 4), all as one single city_object. # Only lod1 is read and saved - city = GeometryFactory('citygml', file_path).city + city = self._get_citygml(file) for building in city.buildings: print(building.name) print(building.volume) diff --git a/tests_data/kelowna_test_case.pickle b/tests_data/kelowna_test_case.pickle deleted file mode 100644 index af0a71b177d9bc1d258b102820fce1f9f8de7c16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35312 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