Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #625 from RWTH-EBC/development
Development
- Loading branch information
Showing
297 changed files
with
69,682 additions
and
213,149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| test3.6-subset: | ||
| image: python:3.6 | ||
| stage: test | ||
| script: | ||
|
|
||
| - pip install --upgrade pip setuptools wheel | ||
| - pip install --only-binary=numpy,scipy numpy scipy | ||
| - pip install pyxb | ||
| - pip install pytest | ||
| - pip install PyGithub==1.39 | ||
| - pip install flake8==3.4.1 | ||
| - pip install -e . | ||
| - flake8 --count --ignore W503,F401 --exclude teaser/data/bindings,doc,tests,.eggs --max-line-length=120 | ||
| - py.test --ignore=tests/test_modelicaversion.py | ||
|
|
||
| test3.6-full: | ||
| image: python:3.6 | ||
| stage: test | ||
| only: | ||
| - master | ||
| script: | ||
|
|
||
| - pip install --upgrade pip setuptools wheel | ||
| - pip install --only-binary=numpy,scipy numpy scipy | ||
| - pip install pyxb | ||
| - pip install pytest | ||
| - pip install PyGithub==1.39 | ||
| - pip install flake8==3.4.1 | ||
| - pip install -e . | ||
| - flake8 --count --ignore W503,F401 --exclude teaser/data/bindings,doc,tests,.eggs --max-line-length=120 | ||
| - py.test | ||
|
|
||
| test3.7: | ||
| image: python:3.7 | ||
| stage: test | ||
| script: | ||
|
|
||
| - pip install --upgrade pip setuptools wheel | ||
| - pip install --only-binary=numpy,scipy numpy scipy | ||
| - pip install pyxb | ||
| - pip install pytest | ||
| - pip install PyGithub==1.39 | ||
| - pip install flake8==3.4.1 | ||
| - pip install -e . | ||
| - flake8 --count --ignore W503,F401 --exclude teaser/data/bindings,doc,tests,.eggs --max-line-length=120 | ||
| - py.test --ignore=tests/test_modelicaversion.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| @article{VOGT201894, | ||
| title = "Selecting statistical indices for calibrating building energy models", | ||
| journal = "Building and Environment", | ||
| volume = "144", | ||
| pages = "94 - 107", | ||
| year = "2018", | ||
| issn = "0360-1323", | ||
| doi = "https://doi.org/10.1016/j.buildenv.2018.07.052", | ||
| url = "http://www.sciencedirect.com/science/article/pii/S0360132318304608", | ||
| author = "Marcus Vogt and Peter Remmen and Moritz Lauster and Marcus Fuchs and Dirk Müller", | ||
| keywords = "Dynamic building energy simulation, Statistical indices, Automated model calibration, Measured energy data, Non-residential sector", | ||
| abstract = "A well-known problem in the dynamic simulation of buildings energy consumption are the discrepancies between the simulated and measured data, which call for calibration techniques to obtain more accurate and reliable building models. The most recognized calibration techniques use statistical indices to assess and improve the quality of simulation models. While there are already well known statistical indices available to evaluate the simulation outputs, the combination of indices offers potential for further improvements in this field. To assess the procedure of calibrating building simulation models, we present a ranking of six tested statistical indices and their combinations (63 statistical metrics), produced by an automated evaluation procedure, in the specific case of calibrating to annual heat demand curves. The developed evaluation procedure is also able to account for eventual deterioration of other statistical metrics, which are not tuned during the calibration. We apply the new method in dynamic, hourly simulations to a use case with 200 buildings, for which extensive measurement data are available. Based on the generated ranking, we recommend using combinations of four statistical indices: the Coefficient of Variation of Root Mean Square Error (CV(RMSE)), the Normalized Mean Error (NME), the standardized contingency coefficient (Cχ2) and the coefficient of determination (R2). In our use case, these combinations lead to better results than the commonly used indices CV(RMSE) and Normalized Mean Bias Error (NMBE). In addition, we could show that it is beneficial to use another index for evaluation than for calibration, because it detects eventual deterioration of the simulation output results." | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1,87 @@ | ||
| from setuptools import setup | ||
|
|
||
| setup(name='teaser', | ||
| version='0.6.9', | ||
| description='Tool for Energy Analysis and Simulation for ' | ||
| 'Efficient Retrofit ', | ||
| url='https://github.com/RWTH-EBC/TEASER', | ||
| author='RWTH Aachen University, E.ON Energy Research Center, ' | ||
| 'Institute of Energy Efficient Buildings and Indoor Climate', | ||
| author_email='ebc-teaser@eonerc.rwth-aachen.de', | ||
| license='MIT', | ||
| packages=[ | ||
| 'teaser', | ||
| 'teaser.logic', | ||
| 'teaser.logic.archetypebuildings', | ||
| 'teaser.logic.archetypebuildings.tabula', | ||
| 'teaser.logic.archetypebuildings.tabula.de', | ||
| 'teaser.logic.archetypebuildings.bmvbs', | ||
| 'teaser.logic.archetypebuildings.bmvbs.custom', | ||
| 'teaser.logic.archetypebuildings.urbanrenet', | ||
| 'teaser.logic.buildingobjects', | ||
| 'teaser.logic.buildingobjects.boundaryconditions', | ||
| 'teaser.logic.buildingobjects.buildingphysics', | ||
| 'teaser.logic.buildingobjects.buildingsystems', | ||
| 'teaser.logic.buildingobjects.calculation', | ||
| 'teaser.logic.simulation', | ||
| 'teaser.data', | ||
| 'teaser.data.bindings', | ||
| 'teaser.data.bindings.opengis', | ||
| 'teaser.data.bindings.opengis.citygml', | ||
| 'teaser.data.bindings.opengis.citygml.raw', | ||
| 'teaser.data.bindings.opengis.misc', | ||
| 'teaser.data.bindings.opengis.misc.raw', | ||
| 'teaser.data.bindings.opengis.raw', | ||
| 'teaser.data.bindings.schemas', | ||
| 'teaser.data.bindings.v_0_3_9', | ||
| 'teaser.data.bindings.v_0_4', | ||
| 'teaser.data.bindings.v_0_5', | ||
| 'teaser.data.bindings.v_0_6', | ||
| 'teaser.data.input', | ||
| 'teaser.data.input.inputdata', | ||
| 'teaser.data.input.inputdata.weatherdata', | ||
| 'teaser.data.output', | ||
| 'teaser.data.output.texttemplate', | ||
| 'teaser.data.output.modelicatemplate', | ||
| 'teaser.data.output.modelicatemplate.AixLib', | ||
| 'teaser.data.output.modelicatemplate.IBPSA', | ||
| 'teaser.examples', | ||
| 'teaser.examples.simulation', | ||
| 'teaser.examples.verification', | ||
| 'teaser.examples.examplefiles', | ||
| 'teaser.examples.examplefiles.MelatenXML'], | ||
| package_data={ | ||
| 'teaser.data.input.inputdata': ['*.xml'], | ||
| 'teaser.data.input.inputdata.weatherdata': [ | ||
| 'DEU_BW_Mannheim_107290_TRY2010_12_Jahr_BBSR.mos'], | ||
| 'teaser.data.output.modelicatemplate': [ | ||
| 'package', | ||
| 'package_order', | ||
| 'conversion', | ||
| 'modelica_language'], | ||
| 'teaser.data.output.modelicatemplate.AixLib': [ | ||
| 'AixLib_Multizone', | ||
| 'AixLib_ThermalZoneRecord_OneElement', | ||
| 'AixLib_ThermalZoneRecord_TwoElement', | ||
| 'AixLib_ThermalZoneRecord_ThreeElement', | ||
| 'AixLib_ThermalZoneRecord_FourElement'], | ||
| 'teaser.data.output.modelicatemplate.IBPSA': [ | ||
| 'IBPSA_OneElement', | ||
| 'IBPSA_TwoElements', | ||
| 'IBPSA_ThreeElements', | ||
| 'IBPSA_FourElements'], | ||
| 'teaser.data.output.texttemplate': [ | ||
| 'ReadableBuilding_OneElement', | ||
| 'ReadableBuilding_TwoElement', | ||
| 'ReadableBuilding_ThreeElement', | ||
| 'ReadableBuilding_FourElement'], | ||
| 'teaser.data.bindings.schemas': ['*.xsd'], | ||
| 'teaser.examples.examplefiles': ['*.teaserXML', '*.gml'], | ||
| 'teaser.examples.examplefiles.MelatenXML': ['*.xml']}, | ||
| classifiers=[ | ||
| 'License :: OSI Approved :: MIT License', | ||
| 'Operating System :: Microsoft :: Windows', | ||
| 'Operating System :: POSIX :: Linux', | ||
| 'Programming Language :: Python :: 2.7', | ||
| 'Programming Language :: Python :: 3.3', | ||
| 'Programming Language :: Python :: 3.4', | ||
| 'Programming Language :: Python :: 3.5', | ||
| 'Intended Audience :: Science/Research', | ||
| 'Topic :: Software Development :: Code Generators', | ||
| 'Topic :: Scientific/Engineering', | ||
| 'Topic :: Utilities'], | ||
| install_requires=['mako', 'pyxb==1.2.5', 'pytest', 'scipy']) | ||
| setup( | ||
| name="teaser", | ||
| version="0.7.0", | ||
| description="Tool for Energy Analysis and Simulation for " "Efficient Retrofit ", | ||
| url="https://github.com/RWTH-EBC/TEASER", | ||
| author="RWTH Aachen University, E.ON Energy Research Center, " | ||
| "Institute of Energy Efficient Buildings and Indoor Climate", | ||
| author_email="ebc-teaser@eonerc.rwth-aachen.de", | ||
| license="MIT", | ||
| packages=[ | ||
| "teaser", | ||
| "teaser.logic", | ||
| "teaser.logic.archetypebuildings", | ||
| "teaser.logic.archetypebuildings.tabula", | ||
| "teaser.logic.archetypebuildings.tabula.de", | ||
| "teaser.logic.archetypebuildings.tabula.dk", | ||
| "teaser.logic.archetypebuildings.bmvbs", | ||
| "teaser.logic.archetypebuildings.bmvbs.custom", | ||
| "teaser.logic.archetypebuildings.urbanrenet", | ||
| "teaser.logic.buildingobjects", | ||
| "teaser.logic.buildingobjects.buildingphysics", | ||
| "teaser.logic.buildingobjects.buildingsystems", | ||
| "teaser.logic.buildingobjects.calculation", | ||
| "teaser.logic.simulation", | ||
| "teaser.data", | ||
| "teaser.data.input", | ||
| "teaser.data.input.inputdata", | ||
| "teaser.data.input.inputdata.weatherdata", | ||
| "teaser.data.output", | ||
| "teaser.data.output.modelicatemplate", | ||
| "teaser.data.output.modelicatemplate.AixLib", | ||
| "teaser.data.output.modelicatemplate.IBPSA", | ||
| "teaser.examples", | ||
| "teaser.examples.verification", | ||
| "teaser.examples.examplefiles", | ||
| ], | ||
| package_data={ | ||
| "teaser.data.input.inputdata": ["*.json"], | ||
| "teaser.data.input.inputdata.weatherdata": [ | ||
| "DEU_BW_Mannheim_107290_TRY2010_12_Jahr_BBSR.mos", | ||
| "ASHRAE140.mos", | ||
| ], | ||
| "teaser.data.output.modelicatemplate": [ | ||
| "package", | ||
| "package_order", | ||
| "conversion", | ||
| "modelica_language", | ||
| ], | ||
| "teaser.data.output.modelicatemplate.AixLib": [ | ||
| "AixLib_Multizone", | ||
| "AixLib_ThermalZoneRecord_OneElement", | ||
| "AixLib_ThermalZoneRecord_TwoElement", | ||
| "AixLib_ThermalZoneRecord_ThreeElement", | ||
| "AixLib_ThermalZoneRecord_FourElement", | ||
| ], | ||
| "teaser.data.output.modelicatemplate.IBPSA": [ | ||
| "IBPSA_OneElement", | ||
| "IBPSA_TwoElements", | ||
| "IBPSA_ThreeElements", | ||
| "IBPSA_FourElements", | ||
| ], | ||
| "teaser.data.output.texttemplate": [ | ||
| "ReadableBuilding_OneElement", | ||
| "ReadableBuilding_TwoElement", | ||
| "ReadableBuilding_ThreeElement", | ||
| "ReadableBuilding_FourElement", | ||
| ], | ||
| "teaser.examples.examplefiles": ["*.json"], | ||
| }, | ||
| classifiers=[ | ||
| "License :: OSI Approved :: MIT License", | ||
| "Operating System :: Microsoft :: Windows", | ||
| "Operating System :: POSIX :: Linux", | ||
| "Programming Language :: Python :: 2.7", | ||
| "Programming Language :: Python :: 3.3", | ||
| "Programming Language :: Python :: 3.4", | ||
| "Programming Language :: Python :: 3.5", | ||
| "Programming Language :: Python :: 3.6", | ||
| "Intended Audience :: Science/Research", | ||
| "Topic :: Software Development :: Code Generators", | ||
| "Topic :: Scientific/Engineering", | ||
| "Topic :: Utilities", | ||
| ], | ||
| install_requires=["mako", "pytest", "pandas", "numpy"], | ||
| ) |
Empty file.
Empty file.
Empty file.
Oops, something went wrong.