guille 85a275d7c1 Merge remote-tracking branch 'origin/master' ... # Conflicts: # city_model_structure/attributes/concordia_energy_sensor.py		2021-06-02 09:31:04 -04:00
..
attributes	Merge remote-tracking branch 'origin/master'	2021-06-02 09:31:04 -04:00
bixi_feature.py	reorganized properties in city_object and building	2021-04-01 10:36:07 -04:00
building.py	small improvements in sensors modeling including the posibility to update the measured dataframes	2021-06-02 09:30:01 -04:00
city_object.py	small improvements in sensors modeling including the posibility to update the measured dataframes	2021-06-02 09:30:01 -04:00
city.py	added 'year' to 'minute' as constants in constants.py and adapted the code to that	2021-05-25 13:34:57 -04:00
composting_plant.py	reorganized properties in city_object and building	2021-04-01 10:36:07 -04:00
monthly_to_hourly_demand.py	Sra step repaired. Wall changed to WallSurface in simplified_radiosity_algorithm.py. A decision on the internal names of the surfaces must be also taken (not yet).	2021-05-28 11:53:23 -04:00
subway_entrance.py	reorganized properties in city_object and building	2021-04-01 10:36:07 -04:00
tree.py	reorganized properties in city_object and building	2021-04-01 10:36:07 -04:00