Pilar 398a114333 Merge remote-tracking branch 'origin/master' ... # Conflicts: # city_model_structure/building_demand/thermal_zone.py		2021-08-11 16:39:46 -04:00
..
attributes	Added first version of traffic classes.	2021-08-06 12:28:20 -04:00
building_demand	Merge remote-tracking branch 'origin/master'	2021-08-11 16:39:46 -04:00
energy_systems	Added first version of traffic classes.	2021-08-06 12:28:20 -04:00
iot	Added first version of traffic classes.	2021-08-06 12:28:20 -04:00
transport	added one more class in transport	2021-08-09 11:27:25 -04:00
bixi_feature.py	just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca	2021-06-10 08:29:24 -04:00
building.py	Merge remote-tracking branch 'origin/master'	2021-08-11 16:39:46 -04:00
buildings_cluster.py	updating comments in classes for documentation	2021-06-09 14:23:45 -04:00
city_object.py	Added first version of traffic classes.	2021-08-06 12:28:20 -04:00
city_objects_cluster.py	Added first version of traffic classes.	2021-08-06 12:28:20 -04:00
city.py	updating comments in classes for documentation	2021-06-09 14:23:45 -04:00
composting_plant.py	just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca	2021-06-10 08:29:24 -04:00
parts_consisting_building.py	just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca	2021-06-10 08:29:24 -04:00
subway_entrance.py	just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca	2021-06-10 08:29:24 -04:00
traffic_network.py	added one more class in transport	2021-08-09 11:29:18 -04:00
tree.py	just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca	2021-06-10 08:29:24 -04:00