Commit Graph

1420 Commits

Author SHA1 Message Date
2e9fa9f1b7 Merge correction 2022-11-25 12:50:23 -05:00
629d73662b Merge remote-tracking branch 'origin/master' into geojson
# Conflicts:
#	unittests/test_doe_idf.py
#	unittests/test_geometry_factory.py
2022-11-25 12:49:39 -05:00
a0485c576b Partial corretion geojson importer 2022-11-25 12:49:09 -05:00
677b021e23 Partial corretion geojson importer 2022-11-25 12:40:13 -05:00
245c218e1f Merge remote-tracking branch 'origin/master' into geojson 2022-11-25 12:39:47 -05:00
Guillermo Gutierrez Morote
3be8de5cd1 Merge branch 'insel_exporter' into 'master'
Insel exporter

See merge request Guille/hub!40
2022-11-25 17:37:49 +00:00
Pilar
07e2ee9773 reorganized the exports factories 2022-11-25 12:34:11 -05:00
Pilar
f387a4be4e monthly energy balance exporter with unittest created 2022-11-25 11:19:06 -05:00
b5dd5bf7ed initial implementation of Geojson importer
Bug correction overall code quality improvement
2022-11-24 17:58:45 -05:00
Pilar
157f7fa2cb monthly energy balance exporter v1.0
No unittest created yet
2022-11-23 16:34:48 -05:00
e8e4b8d236 partial correction of water to water unittest 2022-11-23 10:53:09 -05:00
1e24e43b64 Refactoring building creation and bringing code up to date 2022-11-23 10:20:33 -05:00
Peter Yefi
4d01eeba50 Fixed issue with insel path 2022-11-23 10:10:07 -05:00
Peter Yefi
27456ffddd Added heat pump simulation persistence 2022-11-22 20:20:12 -05:00
Peter Yefi
7974317d13 Merge branch 'hp_energy_demand' into db_persistence 2022-11-22 17:49:09 -05:00
Peter Yefi
30f56c4630 Added a model and repo for hp simulation 2022-11-22 17:49:02 -05:00
Guillermo Gutierrez Morote
f6e049563f Merge branch 'erase_schedules_importer' into 'master'
small bug fixed

See merge request Guille/hub!37
2022-11-21 21:03:32 +00:00
Pilar
9e38be1b2f Merge branch 'master' into fixed_small_bug_in_thermal_zone
# Conflicts:
#	unittests/test_schedules_factory.py
2022-11-21 14:59:46 -05:00
Pilar
87d95a14e6 small bug found 2022-11-21 14:58:32 -05:00
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
ac53ce2f4d Merge remote-tracking branch 'origin/master' into nrcan 2022-11-21 14:02:01 -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
1db5b02847 partial completion of nrcan catalog 2022-11-21 12:46:39 -05:00
Pilar
c1f2ff5c4b erased schedules factory as the schedules are now integrated in usage factory 2022-11-21 11:55:34 -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
Pilar
7a358806f3 starting with the nrcan_usage_parameters class. Not working! 2022-11-21 11:03:28 -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
Peter Yefi
13a74984e0 Fixed key issues with env variables 2022-11-15 21:48:09 -05:00
Peter Yefi
e53e7b09ac Removed .env file 2022-11-15 21:43:04 -05:00
Peter Yefi
43d7d1ee77 Included tests, import and export for db operations 2022-11-15 20:48:42 -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
60b725dad6 Partial nrcan usage implementation 2022-11-15 08:38:41 -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