Commit Graph

1124 Commits

Author SHA1 Message Date
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
Pilar
5be2e8f1d9 Merge remote-tracking branch 'origin/master' 2023-03-08 09:13:55 -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
960abd44e4 Merge remote-tracking branch 'origin/master' 2023-03-07 15:04:35 -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
Pilar
f91fda80e9 Merge remote-tracking branch 'origin/master' 2023-03-06 15:58:20 -05:00
Guillermo Gutierrez Morote
47db683eea Merge branch 'hp_results' into 'master'
Hp results

See merge request Guille/hub!61
2023-03-06 14:13:12 +00: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
Pilar
88053e107f Merge remote-tracking branch 'origin/master' 2023-02-24 15:35:02 -05:00
Pilar
e4a8f68a3a changed function_field in test_construction_factory.py 2023-02-24 15:34:45 -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
Guillermo Gutierrez Morote
673296f860 Merge branch 'updating_dictionary_functions_montreal' into 'master'
changed strings in dictionary to cte.NAMES

See merge request Guille/hub!60
2023-02-24 19:50:07 +00: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