|
|
8c6e34cd22
|
Merge remote-tracking branch 'origin/master' into geojson
# Conflicts:
# city_model_structure/building.py
# city_model_structure/bus_system.py
# city_model_structure/city_object.py
# city_model_structure/city_objects_cluster.py
# city_model_structure/energy_system.py
# imports/energy_systems/air_source_hp_parameters.py
# imports/energy_systems/water_to_water_hp_parameters.py
# imports/geometry/citygml.py
# imports/geometry/gpandas.py
# imports/geometry/obj.py
# imports/geometry/rhino.py
# imports/geometry_factory.py
|
2022-11-28 13:13:55 -05:00 |
|
|
|
5dc471dd2a
|
base classes for lod at city level
|
2022-11-25 15:03:27 -05:00 |
|
|
|
b5dd5bf7ed
|
initial implementation of Geojson importer
Bug correction overall code quality improvement
|
2022-11-24 17:58:45 -05:00 |
|
|
|
1e24e43b64
|
Refactoring building creation and bringing code up to date
|
2022-11-23 10:20:33 -05:00 |
|
|
|
c621e33466
|
Add method to merge cities
|
2022-10-20 11:34:22 -04:00 |
|
|
|
920cb3015a
|
License header change to better reflect the coder and code contributors, remove the Model creators from the contributors as it may be misleading
|
2022-04-08 09:35:33 -04:00 |
|
|
|
7498be0e1d
|
Remove prints
|
2022-04-04 19:51:30 -04:00 |
|
|
|
ee8549bf98
|
Correct import issue
|
2022-04-04 08:37:21 -04:00 |
|
|
|
ceb6ae1856
|
correct small error in merge
|
2022-03-17 14:49:18 -04:00 |
|
|
|
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 |
|
|
|
024469ac0a
|
Link materials and lca_materials in the city
|
2022-03-02 12:56:20 -05:00 |
|
|
|
6b9e09ba88
|
Partial commit for dompark project including sensors, lca materials and overall improvements
|
2022-03-02 12:13:11 -05:00 |
|
atiya
|
a40c1a0154
|
Machines added into City class
|
2022-02-22 16:24:12 -05:00 |
|
|
|
651151c6ac
|
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 |
|
|
|
d2d86bc942
|
Test driven partial corrections
|
2021-11-16 12:27:49 -05:00 |
|
|
|
9837bb8427
|
Base implementation for the fuel life cicle analisis
|
2021-11-15 11:06:55 -05:00 |
|
|
|
eeff2eec18
|
Integrate Peter's head pump branch into master
|
2021-11-15 09:47:09 -05:00 |
|
|
|
c07a6f6c34
|
Base implementation for the fuel life cicle analisis
|
2021-11-12 04:41:17 -05:00 |
|
Peter Yefi
|
567fde0012
|
Included energy systems attribute
|
2021-10-21 13:49:26 +00:00 |
|
|
|
ba72bd9043
|
Partial test corrections
|
2021-09-23 09:17:23 -04:00 |
|
|
|
e40926e74d
|
Remove tree, bixi_features and compostring classes
|
2021-09-23 07:43:32 -04:00 |
|
|
|
fde837150d
|
Small in the factories documentation
|
2021-09-22 07:25:53 -04:00 |
|
|
|
5752c5d31d
|
Small corrections in doe_idf import
|
2021-09-16 13:45:27 -04:00 |
|
Pilar
|
2780dd5b7e
|
Forced types in attributes
|
2021-09-14 13:46:48 -04:00 |
|
Pilar
|
f4d62bb505
|
Forced the type in setters
|
2021-09-13 15:14:54 -04:00 |
|
|
|
5282e51695
|
Review comments and homogenize getter and setters code comment texts
|
2021-08-30 14:39:24 -04:00 |
|
|
|
338adb399e
|
Overall code quality review for the city_model_structure
|
2021-08-26 09:19:38 -04:00 |
|
Pilar
|
e4cf62b2ff
|
updating comments in classes for documentation
|
2021-06-09 14:23:45 -04:00 |
|
Pilar
|
1d4841df83
|
city_objects_clusters are now city_objects
test_sensors_factory.py passes
|
2021-06-03 15:56:59 -04:00 |
|
|
|
de471ee88a
|
Temporary fix sensor test
|
2021-06-03 12:42:00 -04:00 |
|
|
|
eb249f84d3
|
Temporary fix sensor test
|
2021-06-03 11:52:00 -04:00 |
|
Pilar
|
311342e17e
|
added clusters to the city
|
2021-06-03 11:45:17 -04:00 |
|
Pilar
|
f5e32e16ea
|
finished the new sensors and added to the factory (concordia_temperature and concordia_gas_flow)
|
2021-06-02 11:56:38 -04:00 |
|
Pilar
|
33ac71d5a6
|
added 'year' to 'minute' as constants in constants.py and adapted the code to that
|
2021-05-25 13:34:57 -04:00 |
|
Pilar
|
146162165f
|
created epw_weather_parameters.py
|
2021-04-13 19:00:28 -04:00 |
|
Pilar
|
a0613201e3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# city_model_structure/attributes/surface.py
# city_model_structure/city.py
|
2021-04-13 15:11:39 -04:00 |
|
Pilar
|
ac902c6c97
|
created epw_weather_parameters.py
|
2021-04-13 15:09:13 -04:00 |
|
|
|
bfd4868005
|
Rollback behnam changes and add sra export to the export factory
|
2021-04-13 14:12:45 -04:00 |
|
Pilar
|
9a40cfa54b
|
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 |
|
Pilar
|
dbbe3d56fc
|
before behnam changes in libs
|
2021-03-23 10:13:01 -04:00 |
|
Pilar
|
b8e5d74e39
|
reestablished name and country_code in city.py
|
2021-03-15 12:44:33 -04:00 |
|
Pilar
|
69d7f9d7af
|
actualized requirements.txt
|
2021-03-15 11:47:30 -04:00 |
|
Pilar
|
2ef357b5d9
|
erased self._buildings in city.py
|
2021-02-03 09:20:35 -05:00 |
|
Pilar
|
6f58fde55b
|
added region to city.py
|
2021-01-27 16:08:11 -05:00 |
|
pilar
|
4faa02d18b
|
substitute print by sys.write
|
2021-01-07 17:33:55 -05:00 |
|
Guille
|
46a88bf890
|
Code cleaning and adding new functions to save and load a city
|
2020-12-02 11:56:33 -05:00 |
|
Guille
|
5bfac5b01b
|
Partial implementation for non-triangular surfaces
|
2020-11-27 11:31:25 -05:00 |
|
|
|
5249a8fc76
|
change reverse_geocoder for openmaps api call
|
2020-06-26 14:42:52 -04:00 |
|
|
|
b6bc582201
|
change reverse_geocoder for openmaps api call
|
2020-06-26 14:38:42 -04:00 |
|
|
|
106fe545fa
|
change reverse_geocoder for openmaps api call
|
2020-06-26 14:34:37 -04:00 |
|
