Pilar e353a7c800 Merge remote-tracking branch 'origin/master' ... # Conflicts: # city_model_structure/building.py		2021-03-25 09:15:05 -04:00
..
attributes	testing building separation in storeys with the new configuration of geometry using polygons and polyhedrons (NOT working yet).	2021-03-25 09:11:42 -04:00
bixi_feature.py	fixing format and cleaning todos	2020-11-26 09:26:55 -05:00
building.py	Merge remote-tracking branch 'origin/master'	2021-03-25 09:15:05 -04:00
city_object.py	testing building separation in storeys with the new configuration of geometry using polygons and polyhedrons (NOT working yet).	2021-03-25 09:11:42 -04:00
city.py	testing building separation in storeys with the new configuration of geometry using polygons and polyhedrons (NOT working yet).	2021-03-25 09:11:42 -04:00
composting_plant.py	fixing format and cleaning todos	2020-11-26 09:26:55 -05:00
monthly_to_hourly_demand.py	modifications in classes for energyADE	2021-03-16 12:19:35 -04:00
subway_entrance.py	fixing format and cleaning todos	2020-11-26 09:26:55 -05:00
tree.py	fixing format and cleaning todos	2020-11-26 09:26:55 -05:00