Commit Graph

135 Commits

Author SHA1 Message Date
6809a4fca3 update pylintrc and correct setup.py 2023-05-31 13:51:35 -04:00
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -04:00
e704143333 Merge branch 'retrofit_project' into systems_catalog
# Conflicts:
#	hub/city_model_structure/building_demand/surface.py
#	hub/exports/building_energy/idf.py
#	hub/imports/results/simplified_radiosity_algorithm.py
2023-05-29 12:16:29 -04:00
183807b8e0 adapted systems importer to new catalog 2023-05-29 11:56:56 -04:00
ee58d21b47 solved some small errors in meb exporter 2023-05-23 17:19:50 -04:00
9f00208cbb Complete the persistence update
test_save_result will be failing till systems are completed.
2023-05-23 14:36:48 -04:00
182d01123c remove warnings for opened files and remove code duplication 2023-05-19 16:01:06 -04:00
3680e0356f Merge branch 'idf_lights' into systems_catalog 2023-05-19 11:21:12 -04:00
7b245a69b3 Incorporation of ventilation. Working. 2023-05-19 11:20:44 -04:00
5fb361e74c Partial correction in persistence and geometry_helper.py 2023-05-18 16:15:57 -04:00
84ae32bcdb Code style and logging unification 2023-05-17 17:10:30 -04:00
48dddae525 Merge remote-tracking branch 'origin/systems_catalog' into retrofit_project 2023-05-16 09:37:09 -04:00
d8386d179d energy systems importer finished
energy systems workflow defined in the unittest
2023-05-15 11:03:54 -04:00
e48dec81cf added lod to the city_objects 2023-05-12 09:27:29 -04:00
7b369bae27 Partial correction persistence 2023-05-10 17:06:51 -04:00
ef7addd5b5 Merge branch 'geojson' into systems_catalog
# Conflicts:
#	hub/catalog_factories/energy_systems/nrcan_catalog.py
#	hub/helpers/dictionaries.py
#	hub/imports/construction/nrcan_physics_parameters.py
2023-05-04 10:48:19 -04:00
dbcab5bcb9 energy systems factory test added and solved some bugs. Not working yet 2023-05-04 10:39:23 -04:00
27549e784d Merge branch 'geojson' into idf_lights 2023-05-02 14:47:26 -04:00
9317e46d5e rolled back some changes and hardcoded values 2023-05-02 14:36:04 -04:00
949a6c268f complete peak loads calculation 2023-05-01 10:37:51 -04:00
e6486bc598 Partial correction for peakloads 2023-04-27 13:31:00 -04:00
150614441e erased two prints, fixed a bug in geometry helper and modified name in costs archetype 2023-04-25 10:45:56 -04:00
a3f0478558 Merge remote-tracking branch 'origin/geojson' into geojson 2023-04-25 10:00:18 -04:00
745c1e6843 added dictionary to access montreal custom costs catalog 2023-04-25 10:00:07 -04:00
354923b378 added dictionary to access montreal custom costs catalog 2023-04-25 09:59:52 -04:00
3ccda97830 Add redundancy to improve wall detections 2023-04-22 09:33:06 -04:00
a25215adb8 correct shared walls 2023-04-21 12:57:13 -04:00
86892332e3 correct shared walls 2023-04-21 12:56:32 -04:00
0f8816a053 correct shared walls 2023-04-21 12:48:50 -04:00
e978d56320 correct idf generation for shared walls 2023-04-21 10:31:55 -04:00
bb121512c3 Add utf-8 encoding when reading cities15000 file 2023-04-18 17:55:27 -04:00
7f41e7d017 adding peak loads partial 2023-04-18 12:23:03 -04:00
4ca8975e18 remove openstreetmaps dependency 2023-04-18 12:23:03 -04:00
d37ce01304 Changes hub to incorporate change of units in infiltration 2023-03-31 08:28:50 -04:00
648548ea2c Merge branch 'main' into idf_lights
# Conflicts:
#	hub/exports/building_energy/idf.py
#	hub/unittests/test_exports.py
2023-03-27 16:39:30 -04:00
f5987cfbcc solved bug in ventilation + infiltration calculation 2023-03-24 13:34:37 -04:00
4082a20638 updated usages in dictionary to reduce not recognized archetypes 2023-03-23 16:55:09 -04:00
35f5544a32 Appliances test 2023-03-23 13:24:41 -04:00
053a866443 Merge pull request 'optimization' (#10) from optimization into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/10
2023-03-21 14:31:55 -04:00
6bbc300730 erased not needed max_location_distance_for_shared_walls in configuration 2023-03-20 11:39:41 -04:00
78f3921447 Merge branch 'main' into dhw
# Conflicts:
#	hub/config/configuration.ini
#	hub/helpers/configuration_helper.py
#	hub/helpers/data/hft_function_to_hub_function.py
2023-03-20 11:30:06 -04:00
9f28c2f93d added domestic hot water parameters in catalog and importers 2023-03-20 11:07:43 -04:00
2781696f95 performance improvements in city import 2023-03-17 16:32:54 -04:00
4b3ce016b2 remove jit 2023-03-17 13:40:14 -04:00
d979c74b8d partial; optimization 2023-03-17 13:36:43 -04:00
Pilar
1b90974b77 some refactoring to keep our naming agreement 2023-03-17 10:10:30 -04:00
Pilar
05dcc7a4fb Merge branch 'main' into debuging_meb 2023-03-16 15:56:46 -04:00
Pilar
df7038df80 usage = retail in nrcan bug solved
added default value to swr in sra exporter for those buildings without construction known
2023-03-16 11:43:13 -04:00
Pilar
64384876a4 updating costs catalog -> not completed 2023-03-16 10:06:32 -04:00
f0a07d9c0e Reintroduce debug information in the geometry_helper 2023-03-15 11:30:25 -04:00
Pilar
4cc9c2dcdb added dhw classes to catalogs and CDM including importers 2023-03-13 14:40:07 -04:00
Pilar
77743fea1c rolling back changes 2023-03-10 14:09:41 -05:00
Pilar
2ac1fd045b Merge remote-tracking branch 'origin/main' into main 2023-03-10 14:07:24 -05:00
0ed6c2d935 Partial correction of persistence business logic 2023-03-10 14:04:00 -05:00
Pilar
ae423c51df working test of percentage shared by walls 2023-03-09 12:18:15 -05:00
53ae043d63 optimize imports 2023-03-09 11:11:34 -05:00
8ce25e7956 Merge remote-tracking branch 'origin/shared_surfaces_method'
# Conflicts:
#	hub/unittests/test_geometry_factory.py
2023-03-09 11:10:47 -05:00
fc2add511a Complete neighbours detection (with shared lines) 2023-03-08 14:24:48 -05:00
Pilar
d0cfa90dfe Merge branch 'master' into shared_surfaces_method 2023-03-08 09:16:56 -05:00
Guillermo Gutierrez Morote
50b4db4d69 Merge branch 'solving_a_bug_from_ep_workflow' into 'master'
Solving a bug from ep workflow

See merge request Guille/hub!62
2023-03-07 21:16:25 +00:00
4caea94271 Starting line information dictionary 2023-02-24 15:15:27 -05:00
Pilar
ca5bcfc93c changed strings in dictionary to cte.NAMES 2023-02-24 14:31:44 -05:00
70c0dba6bd Starting line information dictionary 2023-02-24 07:39:08 -05:00
2af1bf2e40 Merge remote-tracking branch 'origin/master' into shared_surfaces_method
# Conflicts:
#	hub/helpers/geometry_helper.py
2023-02-24 07:21:14 -05:00
def1bd221f Clean mapping test 2023-02-24 07:19:01 -05:00
48fbeb488f Neighbours mapping completed. 2023-02-24 07:10:13 -05:00
a8d0d0e6ba Change string values for codes in montreal dictionary 2023-02-24 06:31:28 -05:00
c5110585c7 untested neighbours detection implemented. 2023-02-23 15:35:13 -05:00
Pilar
7092f43f32 partially implemented shared walls 2023-02-23 07:25:04 -05:00
143e48bb7b Partial implementation neighbours detection. 2023-02-23 07:24:36 -05:00
8a4fdc0397 Partial implementation neighbours detection. 2023-02-23 06:56:13 -05:00
580ff5c63c user_login method and bug fix
- Now the geojson missing functions will not crah
- Now a user can login directly with application_uuid, user and password
2023-02-21 09:41:26 -05:00
486a861477 small corrections 2023-02-13 05:17:25 -05:00
Pilar
a258d33dc9 modified triangulation method 2023-02-10 05:42:57 -05:00
Pilar
b61722db2e cleaned some todos 2023-02-09 05:29:53 -05:00
22cbede8d5 Added the full functionality to create meb 2023-02-08 13:40:06 -05:00
19fc822147 Small bug correction in the new dictionary structure 2023-02-06 06:50:58 -05:00
09bfe71d4d Refactor in the dictionaries helper.
Now the dictionaries are wrapped into classes to easier maintenance
Added alkis dictionary skeleton
Added montreal dictionary
2023-02-06 06:29:21 -05:00
5978757348 Partial correction of persistence 2023-01-31 13:11:39 -05:00
Pilar
c61dca2fe6 from usage_zone to usage 2023-01-26 08:53:00 -05:00
4e0b17d7ee Correct the mistakes during the merge.
Now everithing should work as expected.
One minor improvement in the error function for the factories.
2023-01-26 06:35:55 -05:00
ff4fef17fb Merge remote-tracking branch 'origin/master'
# Conflicts:
#	hub/catalog_factories/construction_catalog_factory.py
#	hub/imports/construction_factory.py
#	hub/imports/usage_factory.py
2023-01-26 05:23:22 -05:00
2ebec93ab4 Merge disaster:
I do expect a lot of errors in this merge, this will be review later on, please don't rebase into this one
2023-01-26 05:21:34 -05:00
Peter Yefi
d04906306e Included checks for import handlers and types 2023-01-25 19:13:00 -05:00
9700e5ce21 packaging version 2023-01-24 10:51:50 -05:00