|
|
9b5577c677
|
Small bug corrections + rename libs to hub
|
2022-05-02 17:39:37 -04:00 |
|
Guillermo Gutierrez Morote
|
6414ceedaf
|
Merge branch 'idf_export' into 'master'
Idf export
See merge request Guille/libs!16
|
2022-05-02 19:51:21 +00:00 |
|
Pilar
|
fc733eb950
|
erased a not wanted print
|
2022-05-02 15:18:52 -04:00 |
|
Pilar
|
d0fa0c1f8a
|
windows included in idf export
|
2022-05-02 15:02:06 -04:00 |
|
Pilar
|
9c3ac59866
|
Merge branch 'master' into installation_in_macos
|
2022-04-28 14:44:42 -04:00 |
|
Pilar
|
06ecae7e88
|
looking for a bug
|
2022-04-28 14:41:09 -04:00 |
|
Pilar
|
0e7acd89d1
|
looking for a bug
|
2022-04-28 14:34:23 -04:00 |
|
Guillermo Gutierrez Morote
|
4dcd44150f
|
Merge branch 'fix' into 'master'
Fix
See merge request Guille/libs!15
|
2022-04-28 17:08:22 +00:00 |
|
Peter Yefi
|
d3a52c8bfc
|
Fixed pandas append deprecation warning
|
2022-04-28 10:58:45 -04:00 |
|
Peter Yefi
|
574cc2e11c
|
Updated file
|
2022-04-28 10:33:29 -04:00 |
|
|
|
d5565530c1
|
Merge initial version for Catalogs as factories data sources
|
2022-04-26 19:41:00 -04:00 |
|
|
|
b1e74daa48
|
Merge remote-tracking branch 'origin/installation_in_macos'
|
2022-04-26 19:35:52 -04:00 |
|
Pilar
|
aca1bab882
|
Merge branch 'master' into installation_in_macos
|
2022-04-26 19:14:52 -04:00 |
|
Pilar
|
74dfa69aea
|
modified year of construction in tests to be able to run ConstructionFactory with nrel
|
2022-04-26 19:14:12 -04:00 |
|
|
|
196f7774b0
|
Merge remote-tracking branch 'origin/installation_in_macos'
|
2022-04-26 19:05:33 -04:00 |
|
|
|
8f1096ba1d
|
Merge remote-tracking branch 'origin/master'
|
2022-04-26 18:43:53 -04:00 |
|
|
|
1d48adf570
|
Add dompark aechetype
|
2022-04-26 18:43:48 -04:00 |
|
Pilar
|
88c0e9fa5f
|
modifications in idf to import more complex schedules and schedules by file
|
2022-04-26 18:39:42 -04:00 |
|
Pilar
|
b135a97ad2
|
Modified workflow to include Sanam's schedules
|
2022-04-26 18:30:31 -04:00 |
|
Peter Yefi
|
04d13e50d1
|
modified ignore file
|
2022-04-25 15:16:22 -04:00 |
|
Guillermo Gutierrez Morote
|
d4cd966447
|
Merge branch 'last_comment_in_documentation' into 'master'
one more comment in CONTRIBUTING_CENTRAL_DATA_MODEL.md
See merge request Guille/libs!14
|
2022-04-21 17:16:37 +00:00 |
|
Pilar
|
b4054fcf84
|
one more comment in CONTRIBUTING_CENTRAL_DATA_MODEL.md
|
2022-04-21 10:50:19 -04:00 |
|
Guillermo Gutierrez Morote
|
36519aa24f
|
Merge branch 'updating_documentation' into 'master'
finished CONTRIBUTING_CENTRAL_DATA_MODEL.md
See merge request Guille/libs!13
|
2022-04-21 14:46:06 +00:00 |
|
Pilar
|
03f692be67
|
finished CONTRIBUTING_CENTRAL_DATA_MODEL.md
|
2022-04-20 18:33:10 -04:00 |
|
Guillermo Gutierrez Morote
|
b0c2f52dd4
|
Merge branch 'update_documentation' into 'master'
check merge branches
See merge request Guille/libs!12
|
2022-04-19 20:34:40 +00:00 |
|
Pilar
|
bff362ed05
|
check merge branches
|
2022-04-19 16:20:41 -04:00 |
|
Guillermo Gutierrez Morote
|
4daec98dba
|
Merge branch 'updating_documentation' into 'master'
Updating documentation
See merge request Guille/libs!11
|
2022-04-19 20:12:40 +00:00 |
|
Pilar
|
146a02fa58
|
Merge remote-tracking branch 'origin/master'
|
2022-04-19 15:50:04 -04:00 |
|
Pilar
|
e2b882723b
|
Modified construction factory to read from catalogs instead of file
|
2022-04-19 15:49:41 -04:00 |
|
|
|
a35fca9876
|
bug fix:
Properly return window id instead window name
|
2022-04-19 13:42:53 -04:00 |
|
Pilar
|
01af205d9d
|
bug in CONTRIBUTING_CENTRAL_DATA_MODEL.md
|
2022-04-13 19:34:09 -04:00 |
|
Pilar
|
b3e51c26d4
|
Merge remote-tracking branch 'origin/to_erase'
|
2022-04-13 19:31:08 -04:00 |
|
Pilar
|
61649a69d0
|
added CONTRIBUTING_CENTRAL_DATA_MODEL.md file
|
2022-04-13 19:26:44 -04:00 |
|
|
|
24c1ac387a
|
Merge remote-tracking branch 'origin/master'
|
2022-04-13 18:31:59 -04:00 |
|
|
|
59f3b548c7
|
bug correction on construction catalogs
|
2022-04-13 18:31:54 -04:00 |
|
Pilar
|
c4a6ea61fc
|
editing WINDOWS_INSTALL.md and CONTRIBUTING.md
|
2022-04-12 14:14:20 -04:00 |
|
Pilar
|
f93bdbe5c3
|
editing WINDOWS_INSTALL.md and CONTRIBUTING.md
|
2022-04-12 10:47:22 -04:00 |
|
Pilar
|
43c0abdd04
|
editing WINDOWS_INSTALL.md
|
2022-04-12 09:42:43 -04:00 |
|
Pilar
|
d2f4b1b106
|
added how to install images
|
2022-04-12 09:31:46 -04:00 |
|
Pilar
|
58108b3bf0
|
Merge remote-tracking branch 'origin/master'
|
2022-04-12 09:29:09 -04:00 |
|
|
|
5cddbd363f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .gitignore
|
2022-04-12 07:05:13 -04:00 |
|
|
|
a0bae83ff5
|
commit
|
2022-04-12 07:04:53 -04:00 |
|
Pilar
|
1bb471cbe8
|
changes in PYGUIDE.md and WINDOWS_INSTALL.md
|
2022-04-11 19:29:29 -04:00 |
|
Guillermo Gutierrez Morote
|
c876e3d74b
|
Merge branch 'heat_pump' into 'master'
Changed return type
See merge request Guille/libs!10
|
2022-04-11 22:59:25 +00:00 |
|
|
|
d062c5654e
|
change back city object name as readonly, add new property human_readable_name for building
|
2022-04-11 14:53:22 -04:00 |
|
|
|
a273c38a45
|
remove nrcan construction library and fix some unit tests
|
2022-04-11 14:32:44 -04:00 |
|
|
|
3e03ca6f08
|
remove debug function
|
2022-04-11 12:45:00 -04:00 |
|
|
|
9287da7a66
|
correct merge errors
|
2022-04-11 12:44:23 -04:00 |
|
|
|
8b952e3254
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# catalog_factories/construction_catalog_factory.py
# unittests/test_greenery_catalog.py
|
2022-04-11 12:39:45 -04:00 |
|
|
|
d7f1b46cf5
|
complete test and correct errors in construction catalog
|
2022-04-11 12:37:46 -04:00 |
|
