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
|
508513f702
|
changed return to continue to process the rest of the buildings
|
2023-03-16 15:56:24 -04:00 |
|
Pilar
|
d672eee762
|
changed percentage to per one (-)
|
2023-03-16 12:24:09 -04:00 |
|
Pilar
|
ae6655fe3d
|
added logger to inform about not calculated buildings in MEB
|
2023-03-16 12:19:07 -04:00 |
|
|
|
89254891b8
|
Merge pull request 'shared_surfaces_method' (#5) from shared_surfaces_method into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/5
|
2023-03-16 12:04:19 -04:00 |
|
|
|
6ea41b1c85
|
export to obj completed
|
2023-03-16 12:03:23 -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 |
|
|
|
725e7a098f
|
Fix hub logger
|
2023-03-16 11:27:46 -04:00 |
|
|
|
fdef2152d9
|
export to obj partial implementation
|
2023-03-16 10:51:41 -04:00 |
|
Pilar
|
64384876a4
|
updating costs catalog -> not completed
|
2023-03-16 10:06:32 -04:00 |
|
|
|
20b88fbccb
|
Custom extrusion and volume calculation for Geojson
|
2023-03-15 14:21:38 -04:00 |
|
|
|
f0a07d9c0e
|
Reintroduce debug information in the geometry_helper
|
2023-03-15 11:30:25 -04:00 |
|
|
|
9a7bc6644c
|
Merge branch 'main' into shared_surfaces_method
|
2023-03-14 12:32:26 -04:00 |
|
|
|
cdfda7a475
|
version 0.1.7.10
|
2023-03-14 11:41:00 -04:00 |
|
|
|
5637f219f8
|
Correct small bug in merge city
|
2023-03-14 11:28:34 -04:00 |
|
Pilar
|
24a77d2c5b
|
Merge branch 'main' into costs_catalog
|
2023-03-13 18:24:03 -04:00 |
|
Pilar
|
34477c6d8f
|
updating costs catalog -> not completed
|
2023-03-13 18:23:35 -04:00 |
|
Peter Yefi
|
f7276d8c41
|
Added w2w output file
|
2023-03-13 17:30:30 -04:00 |
|
Peter Yefi
|
0d3d4a3ab9
|
Rounded global irradiance values. Removed tear down in water to water
|
2023-03-13 17:24:44 -04:00 |
|
|
|
658c44389e
|
Version 0.1.7.9
|
2023-03-13 15:02:28 -04:00 |
|
|
|
ecb09edcfb
|
Reintroduce function in business logic
|
2023-03-13 15:01:55 -04:00 |
|
|
|
a3a382dae9
|
Reintroduce function in business logic
|
2023-03-13 14:41:25 -04:00 |
|
Pilar
|
4cc9c2dcdb
|
added dhw classes to catalogs and CDM including importers
|
2023-03-13 14:40:07 -04:00 |
|
|
|
fc25c12149
|
Partial correction of persistence business logic
|
2023-03-13 14:18:04 -04:00 |
|
Pilar
|
a0e52b3e8d
|
added shared walls to geojson. geojson importer test raises an error because the surfaces are triangulated. It should be solved when extrusion is finished
|
2023-03-10 15:15:18 -05:00 |
|
Pilar
|
d198ac9141
|
Merge branch 'main' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-03-10 14:15:29 -05:00 |
|
Pilar
|
10acb712f1
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-03-10 14:14:09 -05: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 |
|
|
|
591107f8cf
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
# hub/unittests/test_geometry_factory.py
|
2023-03-10 14:05:53 -05:00 |
|
|
|
0ed6c2d935
|
Partial correction of persistence business logic
|
2023-03-10 14:04:00 -05:00 |
|
Pilar
|
44aed37ef4
|
Merge branch 'main' into shared_surfaces_method
|
2023-03-10 14:01:04 -05:00 |
|
Pilar
|
91e688d910
|
working test of percentage shared by walls
|
2023-03-10 14:00:51 -05:00 |
|
Pilar
|
ac0c4ea186
|
Merge remote-tracking branch 'origin/main' into main
|
2023-03-10 13:59:39 -05:00 |
|
|
|
7092e75a52
|
small test correction remove deprecated db_export calls
|
2023-03-10 12:22:28 -05:00 |
|
|
|
42a0d3887c
|
small test correction
|
2023-03-10 12:13:56 -05:00 |
|
Pilar
|
28914a7402
|
working test of percentage shared by walls
|
2023-03-09 12:40:45 -05:00 |
|
Pilar
|
a72e0d11fd
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into main
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-03-09 12:38:52 -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 |
|
|
|
fdb9f4d834
|
Correct bug in geojson naming
|
2023-03-08 15:29:16 -05:00 |
|
|
|
bfc3f84c09
|
Complete neighbours detection (with shared lines)
|
2023-03-08 14:25:11 -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 |
|
Pilar
|
63b17e74b5
|
erased parameters of nomass materials in energyplus exporter not needed
|
2023-03-07 15:56:26 -05:00 |
|
Pilar
|
0378d60100
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
|
2023-03-07 15:04:27 -05:00 |
|
Pilar
|
ffc956b2d0
|
a bug in usage -> division by 0
|
2023-03-07 15:03:24 -05:00 |
|
|
|
35ed9050e6
|
Merge remote-tracking branch 'origin/master'
|
2023-03-06 17:03:55 -05:00 |
|
|
|
3b23e9ffd4
|
Skip if unknown
|
2023-03-06 17:03:47 -05:00 |
|
Peter Yefi
|
9b12e3589b
|
Added exporters for simulation results
|
2023-03-03 17:19:36 -05:00 |
|
Peter Yefi
|
c0c3dc4694
|
Updated branch with master origin
|
2023-03-01 20:42:23 -05:00 |
|
Peter Yefi
|
c71821fd78
|
added test for global irradiance calculation
|
2023-03-01 20:36:01 -05:00 |
|
|
|
3a7dccff8c
|
Set usage to unknown if it cannot be determined.
|
2023-02-24 16:33:42 -05:00 |
|
|
|
3d883fc068
|
Skip buildings that doesn't have internal zone in the MEB export
|
2023-02-24 16:02:34 -05:00 |
|
|
|
34172055a6
|
Store the meb as float
|
2023-02-24 15:49:40 -05:00 |
|
|
|
cc26a8004b
|
Change FUNTION_UT to CODE_UTILI
|
2023-02-24 15:36:20 -05:00 |
|
|
|
274c8f0f8e
|
Correct bug in insel meb import
|
2023-02-24 15:33:53 -05:00 |
|
|
|
43030626ce
|
Correct bug in insel meb import
|
2023-02-24 15:24:08 -05: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 |
|
|
|
e070ee5779
|
Merge remote-tracking branch 'origin/mapping'
# Conflicts:
# hub/imports/geometry/citygml.py
|
2023-02-24 07:11:33 -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 |
|
Pilar
|
49d178faa3
|
Merge branch 'master' into bug_in_nrcan_construction_importer
|
2023-02-23 15:46:02 -05:00 |
|
Pilar
|
6f58f22638
|
a bug in citygml importer. 'yearOfConstruction' not recognized
|
2023-02-23 15:45:50 -05:00 |
|
|
|
511361b70b
|
Correct bug in citygml year_of_construction field default value
|
2023-02-23 15:40:09 -05:00 |
|
|
|
c5110585c7
|
untested neighbours detection implemented.
|
2023-02-23 15:35:13 -05:00 |
|
Pilar
|
66f0e4e32b
|
a bug in nrcan importer
|
2023-02-23 15:26:34 -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 |
|
Pilar
|
e04b713416
|
Merge branch 'mapping' into shared_surfaces_method
|
2023-02-23 07:04:06 -05:00 |
|
Pilar
|
776a54d7b5
|
Merge remote-tracking branch 'origin/mapping' into shared_surfaces_method
|
2023-02-23 06:57:28 -05:00 |
|
Pilar
|
b437cdf290
|
partially implemented shared walls
|
2023-02-23 06:57:14 -05:00 |
|
|
|
8a4fdc0397
|
Partial implementation neighbours detection.
|
2023-02-23 06:56:13 -05:00 |
|
Peter Yefi
|
0ab96ec226
|
Completed changes for new models
|
2023-02-22 22:45:33 -05:00 |
|
Peter Yefi
|
a06eced6f4
|
Modified city merge function in city
|
2023-02-22 20:17:04 -05:00 |
|
Pilar
|
09f0c43ced
|
Merge branch 'master' into nrcan_catalog_importer
|
2023-02-22 08:36:16 -05:00 |
|
Pilar
|
f741e03d88
|
Merge remote-tracking branch 'origin/master'
|
2023-02-22 08:36:04 -05:00 |
|
Pilar
|
ee495bf41a
|
added nrcan catalog
|
2023-02-22 08:35:45 -05:00 |
|
Pilar
|
536a3fe414
|
added nrcan catalog
|
2023-02-22 08:31:14 -05:00 |
|
Pilar
|
8469674b18
|
added nrcan catalog
|
2023-02-21 10:14:55 -05:00 |
|
|
|
7dbfdf188a
|
Version 0.1.7.8
|
2023-02-21 10:04:02 -05:00 |
|
|
|
018c3d24a5
|
Bug fix in user info
|
2023-02-21 10:03:37 -05:00 |
|
|
|
30dbea0edc
|
varsion 0.1.7.7
|
2023-02-21 09:42:26 -05:00 |
|
|
|
f10830dce2
|
Merge remote-tracking branch 'origin/master'
|
2023-02-21 09:41:37 -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 |
|
Guillermo Gutierrez Morote
|
c348fb0134
|
Merge branch 'hp_results' into 'master'
Hp results
See merge request Guille/hub!56
|
2023-02-21 04:38:47 +00:00 |
|
KoaCWells
|
9209cf624a
|
Fix import/export user factories, update repository/user.py for proper StartSession API call, fix setup.py
|
2023-02-20 22:12:01 -05:00 |
|
Peter Yefi
|
c3f4c27811
|
Added heat pump energy demand and fossil fuel consumption results
|
2023-02-20 18:36:34 -05:00 |
|
Pilar
|
bdc8598bc6
|
Merge remote-tracking branch 'origin/master'
|
2023-02-20 07:30:54 -05:00 |
|
Pilar
|
8ca95ddde0
|
implementing shared_surfaces method. Not working
|
2023-02-20 07:30:38 -05:00 |
|
|
|
b280949451
|
Add nrcan archetypes
|
2023-02-20 07:24:27 -05:00 |
|
Peter Yefi
|
f4ce207284
|
Saved local changes
|
2023-02-19 14:04:11 -05:00 |
|
Peter Yefi
|
bf10ba82a6
|
Saved local changes
|
2023-02-19 13:57:24 -05:00 |
|
Pilar
|
491cee92da
|
implementing shared_surfaces method
|
2023-02-13 07:55:25 -05:00 |
|
|
|
9f579bf93a
|
version 0.1.7.6
|
2023-02-13 07:02:26 -05:00 |
|
Pilar
|
ef659b3798
|
modified meb exporter to accept mire than 200 surfaces
|
2023-02-13 06:49:55 -05:00 |
|
|
|
4621ed7b1a
|
correct the path name
|
2023-02-13 06:12:07 -05:00 |
|
|
|
ce29d35af9
|
Merge remote-tracking branch 'origin/master'
|
2023-02-13 06:11:42 -05:00 |
|
Pilar
|
85e445ae96
|
modified meb exporter to accept mire than 200 surfaces
|
2023-02-13 06:08:55 -05:00 |
|
|
|
486a861477
|
small corrections
|
2023-02-13 05:17:25 -05:00 |
|
Pilar
|
8876d1eafa
|
Merge branch 'master' into changing_triangulate
|
2023-02-10 06:20:39 -05:00 |
|
Pilar
|
62d0fc23fd
|
modified triangulation method
|
2023-02-10 06:09:48 -05:00 |
|
Pilar
|
074156f464
|
modified triangulation method
|
2023-02-10 05:43:04 -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 |
|
Pilar
|
e66bac33ae
|
Merge branch 'master' into more_errors_from_merge
|
2023-02-09 04:31:13 -05:00 |
|
Pilar
|
abc893ede0
|
erased two files that reappeared after a merge between branches with many changes
|
2023-02-09 04:30:38 -05:00 |
|
|
|
5ae78e7c00
|
version 0.1.7.5
|
2023-02-08 13:46:11 -05:00 |
|
|
|
22cbede8d5
|
Added the full functionality to create meb
|
2023-02-08 13:40:06 -05:00 |
|
|
|
11e8949b30
|
Added the importer for sra results
|
2023-02-07 13:01:49 -05:00 |
|
|
|
d91b6edfff
|
Add lod1
|
2023-02-07 07:40:28 -05:00 |
|
|
|
aa4b7829e4
|
Repair energy ade export
|
2023-02-07 07:20:36 -05:00 |
|
|
|
b85a111a11
|
Repair energy ade export
|
2023-02-07 06:16:08 -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 |
|
|
|
fb534c6b8f
|
Release 0.1.7.4
|
2023-02-03 04:57:49 -05:00 |
|
|
|
7bafbba240
|
remove unwanted print
|
2023-02-02 13:01:56 -05:00 |
|
|
|
16adfaa1a8
|
Full implementation of basic persistence tasks for the one_shot admin tool.
|
2023-02-02 13:00:58 -05:00 |
|
|
|
a34206e6ff
|
Persistence up and running with small fix
|
2023-02-02 07:14:41 -05:00 |
|
|
|
f99b8497ff
|
Persistence up and running with basic app applicartion
|
2023-02-02 06:12:24 -05:00 |
|
|
|
d6c3f3ef67
|
Merge remote-tracking branch 'origin/master'
|
2023-02-01 10:56:33 -05:00 |
|
Pilar
|
37d345c185
|
costs catalog reformatted
|
2023-02-01 10:38:38 -05:00 |
|
|
|
30bd7678fc
|
Preliminary version of persistence ready for testing
|
2023-02-01 07:29:06 -05:00 |
|
|
|
672b9874f2
|
Persistence refactory
|
2023-02-01 06:05:12 -05:00 |
|
|
|
5978757348
|
Partial correction of persistence
|
2023-01-31 13:11:39 -05:00 |
|
|
|
2c2fc025eb
|
Correct error in db table creation (user_applications)
|
2023-01-30 07:01:05 -05:00 |
|
|
|
17f8223023
|
Add basic application handling to the persistence
|
2023-01-30 06:49:08 -05:00 |
|
|
|
ba011d9517
|
Delete construction_helpers.py
|
2023-01-30 11:42:31 +00:00 |
|
Pilar
|
d9be11eb92
|
Merge remote-tracking branch 'origin/master'
|
2023-01-27 10:35:25 -05:00 |
|
Pilar
|
4980fa8c95
|
erased not used classes
|
2023-01-27 10:34:28 -05:00 |
|
|
|
2823e6a1fc
|
update deployment documentation
|
2023-01-27 05:26:44 -05:00 |
|
Pilar
|
3e46da13d4
|
erased not used classes
|
2023-01-26 09:02:22 -05:00 |
|
Pilar
|
c61dca2fe6
|
from usage_zone to usage
|
2023-01-26 08:53:00 -05:00 |
|
|
|
1b47ea64b5
|
Clean up:
Some old not implemented classes have been removed
Some pep8 improvements done too
|
2023-01-26 07:41:56 -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 |
|
|
|
ec9878eaf8
|
Remove unwanted print
|
2023-01-25 06:39:03 -05:00 |
|
|
|
b4b75b5e12
|
Small correction in unittests
|
2023-01-25 06:38:08 -05:00 |
|
|
|
9700e5ce21
|
packaging version
|
2023-01-24 10:51:50 -05:00 |
|
