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
..
tests_data	Fixing bugs in idf export	2022-03-16 13:21:51 -04:00
tests_outputs	Review overall code quality and refactor tests folders	2021-08-30 11:38:28 -04:00
test_construction_factory.py	Link materials and lca_materials in the city	2022-03-02 12:56:20 -05:00
test_customized_imports_factory.py	created customized imports factory and correspondent test	2021-11-15 11:02:52 -05:00
test_doe_idf.py	fixed bug saving values	2022-02-17 12:48:23 -05:00
test_energy_systems_air_source_hp.py	Changed how coefficients are generated	2022-03-10 12:44:04 -05:00
test_energy_systems_water_to_water_hp.py	Added Reactivation and Deactivation Temps	2022-02-02 07:03:22 -05:00
test_exports.py	Test driven partial corrections	2021-11-16 12:27:49 -05:00
test_geometry_factory.py	Partial test corrections	2021-09-23 09:17:23 -04:00
test_greenery_catalog.py	Complete implementation for the greenery catalog integration	2022-03-09 11:40:06 -05:00
test_life_cycle_assessment_factory.py	Link materials and lca_materials in the city	2022-03-02 12:56:20 -05:00
test_schedules_factory.py	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
test_sensors_factory.py	Partial commit for dompark project including sensors, lca materials and overall improvements	2022-03-02 12:13:11 -05:00
test_usage_factory.py	Merge remote-tracking branch 'origin/master' into heat_pump	2022-03-17 14:34:11 -04:00