guille f2ff10ad47 Merge remote-tracking branch 'origin/master' into heat_pump ... # Conflicts: # city_model_structure/city.py # city_model_structure/energy_system.py # city_model_structure/fuel.py # city_model_structure/machine.py # city_model_structure/vehicle.py # data/life_cycle_assessment/lca_data.xml # exports/energy_systems_factory.py # helpers/constants.py # helpers/yearly_from_daily_schedules.py # imports/energy_systems/air_source_hp_parameters.py # imports/geometry/rhino.py # imports/geometry_factory.py # imports/life_cycle_assessment/lca_fuel.py # imports/life_cycle_assessment/lca_machine.py # imports/life_cycle_assessment/lca_vehicle.py # imports/life_cycle_assessment_factory.py # requirements.txt # unittests/test_life_cycle_assessment_factory.py		2022-03-17 14:34:11 -04:00
..
attributes	Partial commit for dompark project including sensors, lca materials and overall improvements	2022-03-02 12:13:11 -05:00
building_demand	Partial commit for dompark project including sensors, lca materials and overall improvements	2022-03-02 12:13:11 -05:00
energy_systems	Modified coefficient computation for water to water hp	2022-03-17 10:37:47 -04:00
iot	Partial implementation of the new iot sensors, this change broke the sensor factories and a few unit tests that will be fixed in next commit.	2022-02-21 13:26:14 -05:00
transport	import changes into typevar to avoid circular references when documentation is created	2021-11-15 11:02:51 -05:00
building.py	Rhino implementation partially completed, need to be fully tested	2022-02-16 15:08:05 -05:00
buildings_cluster.py	Review comments and homogenize getter and setters code comment texts	2021-08-30 14:39:24 -04:00
bus_system.py	added many new classes needed for the transportation group models. The documentation is not done because it is needed the students feed-back	2021-11-15 11:02:42 -05:00
city_object.py	Small corrections in doe_idf import	2021-09-16 13:45:27 -04:00
city_objects_cluster.py	Review comments and homogenize getter and setters code comment texts	2021-08-30 14:39:24 -04:00
city.py	Merge remote-tracking branch 'origin/master' into heat_pump	2022-03-17 14:34:11 -04:00
energy_system.py	Fixed and merged conflicts	2021-12-15 09:30:53 +00:00
fuel.py	Contributors added in LCA code	2021-11-22 20:57:29 -05:00
lca_calculations.py	Partial commit for dompark project including sensors, lca materials and overall improvements	2022-03-02 12:13:11 -05:00
lca_material.py	Partial commit for dompark project including sensors, lca materials and overall improvements	2022-03-02 12:13:11 -05:00
machine.py	Contributors added in LCA code	2021-11-22 20:57:29 -05:00
material.py	extra material deleted	2021-11-18 16:57:27 -05:00
network.py	added many new classes needed for the transportation group models. The documentation is not done because it is needed the students feed-back	2021-11-15 11:02:42 -05:00
parts_consisting_building.py	Review comments and homogenize getter and setters code comment texts	2021-08-30 14:39:24 -04:00
subway_entrance.py	Review comments and homogenize getter and setters code comment texts	2021-08-30 14:39:24 -04:00
vehicle.py	Contributors added in LCA code	2021-11-22 20:57:29 -05:00