e9b50beea8
merche main branch changes
2022-11-21 14:21:43 -05:00
b357e4d6c7
Merge remote-tracking branch 'origin/master' into geojson
...
# Conflicts:
# unittests/test_geometry_factory.py
2022-11-21 14:12:18 -05:00
cfa4241213
rollback quick fix
2022-11-21 14:00:12 -05:00
6be5325f75
Correct unit tests due latest changes in gpandas handler.
...
Partial rollback of some changes
2022-11-21 13:53:58 -05:00
Guillermo Gutierrez Morote
e68830a16b
Merge branch 'change_in_geopandas_importer' into 'master'
...
Temporary fixed in geopandas importer
See merge request Guille/hub!35
2022-11-21 16:36:10 +00:00
Pilar
ac9b51b8b9
Temporary fixed in geopandas importer
2022-11-21 11:31:30 -05:00
Guillermo Gutierrez Morote
feb54b7e68
Merge branch 'add/geopandas/importer' into 'master'
...
fixed importer and geometr factory issue
See merge request Guille/hub!34
2022-11-18 22:08:18 +00:00
991e3df240
partial geojson implementation
2022-11-18 16:05:43 -05:00
home-imac
c24ad62081
fixed importer and geometr factory issue
2022-11-18 15:36:03 -05:00
Guillermo Gutierrez Morote
a8b0438864
Merge branch 'add/geopandas/importer' into 'master'
...
merge new gpandas changes into master
See merge request Guille/hub!33
2022-11-18 18:40:52 +00:00
home-imac
5b99d3b190
ignore __pycache__
2022-11-17 17:28:24 -05:00
13fa69b438
partial geojson implementation
2022-11-17 15:56:49 -05:00
c090fd8025
Add geojson test
2022-11-17 11:38:31 -05:00
b47a21dbfa
Remove custom idd
2022-11-17 11:26:18 -05:00
bacd6bab20
correct typo
2022-11-16 19:44:59 -05:00
3b598de4d7
Add up to 154 vertex per polygon
2022-11-16 19:19:52 -05:00
Guillermo Gutierrez Morote
e3b9c84d63
Merge branch 'add/geopandas/importer' into 'master'
...
variable name correction, it will overwrite index and most likely case bugs in...
See merge request Guille/hub!32
2022-11-16 22:04:32 +00:00
37187b7046
small style correction
2022-11-16 16:27:34 -05:00
a617f598ff
Add unit tests and requirements for geopandas factory.
...
Geopandas factory now can receive a geojson file or a pandas data frame by using the optional variable data_frame in the constructor to be consistent with the rest of the factories
So from:
ConstructionFactory('gpandas', dataframe)
to:
ConstructionFactory('gpandas, '', dataframe)
2022-11-16 16:26:45 -05:00
d91da411fd
variable name correction, it will overwrite index and most likely case bugs in case of more than one scene.
2022-11-15 11:28:23 -05:00
7e5ead2363
small style correction
2022-11-15 11:25:38 -05:00
home-imac
fae577deaa
quick fix for failed archetype search
2022-11-14 03:19:04 -05:00
home-imac
3568255c29
gpandas added in factory
2022-11-13 21:07:04 -05:00
home-imac
de449edc76
added geopandas import support
2022-11-13 20:10:42 -05:00
Guillermo Gutierrez Morote
15eea30d81
Merge branch 'updating_central_data_model' into 'master'
...
Updating central data model
See merge request Guille/hub!31
2022-11-10 19:20:27 +00:00
Guillermo Gutierrez Morote
8a0b526c38
Update recognized_functions_and_usages.md
2022-11-10 17:58:38 +00:00
Pilar
686b04cb6c
new system classes added
2022-11-09 16:19:56 -05:00
Pilar
e9559a8485
finished the reorganization between thermal boundaries and surfaces
2022-11-09 14:22:26 -05:00
Guillermo Gutierrez Morote
779c3116a5
Merge branch 'homogeneize_todos' into 'master'
...
Homogenize todos
See merge request Guille/hub!30
2022-11-09 16:44:34 +00:00
9c482cf142
Homogenize todos
...
IDF export now allows the user to select the target and adjacent buildings
- Only target and adjacent buildings in the city are calculated.
- All other buildings are considered shade objects.
The zones are properly labeled with the building name
The "Building" is labeled as a city
2022-11-09 11:42:44 -05:00
6473ffd6dc
Homogenize todos
...
IDF export now allows the user to select the target and adjacent buildings
- Only target and adjacent buildings in the city are calculated.
- All other buildings are considered shade objects.
The zones are properly labeled with the building name
The "Building" is labeled as a city
2022-11-09 11:42:06 -05:00
Pilar
f5fe1fd4d9
added associated_thermal_boundaries to Surface
2022-11-08 16:28:07 -05:00
Pilar
96afcee56e
changed vegetation from thermal boundary to surface
2022-11-08 15:57:50 -05:00
Guillermo Gutierrez Morote
b81f55b5e5
Merge branch 'fixing_unittests_realted_to_changes_by_PMAU' into 'master'
...
ca is not a usage library anymore, it has been erased from test internal gains are calculated from occupancy and so again for monthly energy balance calculations
See merge request Guille/hub!28
2022-11-07 20:06:48 +00:00
Guillermo Gutierrez Morote
3b9d2e4de9
Merge branch 'energy_plus_export' into 'master'
...
IDF export improvement.
See merge request Guille/hub!29
2022-11-07 20:05:52 +00:00
448845a234
IDF export improvement.
...
IDF export now allows the user to select the target and adjacent buildings
- Only target and adjacent buildings in the city are calculated.
- All other buildings are considered shade objects.
The zones are properly labeled with the building name
The "Building" is labeled as a city
2022-11-07 15:04:51 -05:00
Pilar
406e04ccf8
ca is not a usage library anymore, it has been erased from test
...
internal gains are calculated from occupancy and so again for monthly energy balance calculations
2022-11-07 11:49:59 -05:00
Guillermo Gutierrez Morote
41c66106fa
Merge branch 'bug_thermal_zone' into 'master'
...
Bug thermal zone
See merge request Guille/hub!27
2022-11-01 13:59:32 +00:00
Pilar
3284215b5b
Merge remote-tracking branch 'origin/master'
2022-10-28 17:47:17 -04:00
Pilar
ba35ce361b
solved a bug found in the thermal zone when creating the classes related to the usage
2022-10-28 17:46:53 -04:00
c621e33466
Add method to merge cities
2022-10-20 11:34:22 -04:00
e5e75bfe24
Merge remote-tracking branch 'origin/master'
2022-06-09 11:02:50 -04:00
98769670d9
Correct schedules duplication bug
2022-06-09 11:02:45 -04:00
Guillermo Gutierrez Morote
04ef5d2c2e
Merge branch 'print_erased' into 'master'
...
Print erased
See merge request Guille/hub!26
2022-06-08 21:23:18 +00:00
Pilar
07a925b46b
erased a print
2022-06-08 17:22:17 -04:00
Pilar
e3acabeb74
fixing bug in test_enrichment.py
2022-06-08 16:22:12 -04:00
Guillermo Gutierrez Morote
bf932e5d52
Merge branch 'units_in_comnet_catalog' into 'master'
...
Solved bug in comnet catalog when changing from feet to meter and from fahrenheit to celsius
See merge request Guille/hub!25
2022-06-08 19:06:30 +00:00
Pilar
d1f16fe833
Solved bug in comnet catalog when changing from feet to meter and from fahrenheit to celsius
2022-06-08 15:00:03 -04:00
97f45f1b13
Unit tests corrections
2022-06-08 13:02:24 -04:00
3bf674d107
now schedules are re-calculated on change
2022-06-08 12:55:37 -04:00
