k_wells/dynamic_building_simulation
1
0
Fork 0
mirror of https://rs-loy-gitlab.concordia.ca/PMAU/DynamicBuildingSimulation.git synced 2024-11-14 23:10:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changes in libs to new concept of keywords in libraries. Missing new tests.

Browse Source
This commit is contained in:
Pilar 2021-05-26 18:17:22 -04:00
parent 3a1d8e2db3
commit aa4132602d
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/dictionaries/pilar.xml
View File

@ -1,13 +1,7 @@
<component name="ProjectDictionaryState"> <component name="ProjectDictionaryState">
<dictionary name="pilar"> <dictionary name="Pilar">
<words> <words>
<w>absorptance</w> <w>nrcan</w>
<w>insel</w>
<w>irradiance</w>
<w>monsalvete</w>
<w>openable</w>
<w>pilar</w>
<w>readd</w>
</words> </words>
</dictionary> </dictionary>
</component> </component>

6
populate.py
View File

@ -4,7 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es Copyright © 2020 Project Author Pilar Monsalvete pilar_monsalvete@yahoo.es
""" """
from imports.physics_factory import PhysicsFactory from imports.construction_factory import ConstructionFactory
from imports.usage_factory import UsageFactory from imports.usage_factory import UsageFactory
from city_model_structure.city import City from city_model_structure.city import City
@ -32,7 +32,7 @@ class Populate:
self._errors = [] self._errors = []
# Step 2.1: Thermal parameters # Step 2.1: Thermal parameters
tmp_city = City(self._city.lower_corner, self._city.upper_corner, self._city.srs_name) tmp_city = City(self._city.lower_corner, self._city.upper_corner, self._city.srs_name)
PhysicsFactory(self.handler, self._city) ConstructionFactory(self.handler, self._city)
print('original:', len(self._city.buildings)) print('original:', len(self._city.buildings))
for building in self._city.buildings: for building in self._city.buildings:
# infiltration_rate_system_off is a mandatory parameter. # infiltration_rate_system_off is a mandatory parameter.
@ -44,7 +44,7 @@ class Populate:
return self._populated_city return self._populated_city
# Step 2.2: Usage parameters # Step 2.2: Usage parameters
print('physics:', len(tmp_city.buildings)) print('construction:', len(tmp_city.buildings))
UsageFactory(self.handler, tmp_city) UsageFactory(self.handler, tmp_city)
self._populated_city = City(self._city.lower_corner, self._city.upper_corner, self._city.srs_name) self._populated_city = City(self._city.lower_corner, self._city.upper_corner, self._city.srs_name)

15
requirements.txt
View File

@ -1,12 +1,12 @@
Shapely==1.7.0 Shapely~=1.7.0
cycler==0.10.0 cycler==0.10.0
geographiclib==1.50 geographiclib==1.50
geopy=1.21.0 geopy~=1.21.0
kiwisolver==1.2.0 kiwisolver==1.2.0
matplotlib==3.2.1 matplotlib==3.2.1
numpy~=1.18.4 numpy~=1.18.4
numpy-stl==2.11.2 numpy-stl==2.11.2
pandas=1.0.3 pandas~=1.0.3
pip~=20.1 pip~=20.1
pyny3d==0.2 pyny3d==0.2
pyparsing~=2.4.7 pyparsing~=2.4.7
@ -15,8 +15,15 @@ python-dateutil==2.8.1
python-utils==2.4.0 python-utils==2.4.0
pytz~=2020.1 pytz~=2020.1
scipy==1.4.1 scipy==1.4.1
setuptools=~46.1.3 setuptools~=46.1.3
six==1.14.0 six==1.14.0
stl==0.0.3 stl==0.0.3
xmltodict==0.12.0 xmltodict==0.12.0
reverse_geocoder~=1.5.1 reverse_geocoder~=1.5.1
pathlib~=1.0.1
pandas~=1.2.3
esoreader~=1.2.3
geomeppy~=0.11.8
trimesh~=3.9.10
requests~=2.25.1