Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/DynamicBuildingSimulation.iml
#	.idea/misc.xml
#	main.py
#	tests/tmp/Montreal.cli
#	tests/tmp/Montréal_sra.xml
This commit is contained in:
Pilar 2023-01-10 10:00:28 -05:00
commit 291b66d5a9
9 changed files with 18 additions and 48 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/venv/
.idea/

2
.idea/.gitignore vendored
View File

@ -1,2 +0,0 @@
# Default ignored files
/workspace.xml

View File

@ -1,10 +0,0 @@
<component name="ProjectDictionaryState">
<dictionary name="daimon">
<words>
<w>citygml</w>
<w>openable</w>
<w>setpoint</w>
<w>spdx</w>
</words>
</dictionary>
</component>

View File

@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/DynamicBuildingSimulation.iml" filepath="$PROJECT_DIR$/.idea/DynamicBuildingSimulation.iml" />
</modules>
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -1,24 +1,24 @@
Shapely~=1.7.0
cycler==0.10.0
geographiclib==1.50
geopy~=1.21.0
kiwisolver==1.2.0
matplotlib==3.2.1
numpy~=1.18.4
numpy-stl==2.11.2
pandas~=1.0.3
cycler~=0.10.0
geographiclib~=1.52
geopy~=2.2.0
kiwisolver~=1.3.2
matplotlib~=3.5.1
numpy~=1.21.2
numpy-stl~=2.16.3
pandas~=1.2.5
pip~=20.1
pyny3d==0.2
pyny3d~=0.2
pyparsing~=2.4.7
pyproj~=2.6.1.post1
python-dateutil==2.8.1
python-utils==2.4.0
python-dateutil=2.8.1
python-utils=2.4.0
pytz~=2020.1
scipy==1.4.1
setuptools~=46.1.3
six==1.14.0
stl==0.0.3
xmltodict==0.12.0
scipy~=1.8.0
setuptools~=58.0.4
six~=1.14.0
stl~=0.0.3
xmltodict~=0.12.0
reverse_geocoder~=1.5.1
pathlib~=1.0.1

Binary file not shown.