Merge pull request #595 from XucYin/buildings_version

update version number of 'Buildings' in ibpsa.py

README.md

@@ -64,7 +64,7 @@ models for all libraries supporting the
 
 ## Version
 
-TEASER is a ongoing research project, the current version is 0.6.8, which is
+TEASER is a ongoing research project, the current version is 0.6.9, which is
 still a pre-release.
 
 ## How to use TEASER

doc/conf.py

@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '0.6.'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.8'
+release = '0.6.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='teaser',
-      version='0.6.8',
+      version='0.6.9',
       description='Tool for Energy Analysis and Simulation for '
                   'Efficient Retrofit ',
       url='https://github.com/RWTH-EBC/TEASER',

teaser/logic/archetypebuildings/bmvbs/singlefamilydwelling.py

@@ -332,7 +332,7 @@ def generate_archetype(self):
             self._est_roof_area = self._top_floor_area
 
         self._est_facade_area = self._est_facade_to_floor_area * \
-            self._living_area_per_floor + self._est_extra_floor_area
+            (self._living_area_per_floor + self._est_extra_floor_area)
 
         self._est_win_area = self.est_factor_win_area * type_bldg_area
 

teaser/logic/buildingobjects/calculation/ibpsa.py

@@ -44,7 +44,7 @@ def __init__(self, parent):
 
         self.parent = parent
         self.file_internal_gains = "InternalGains_" + self.parent.name + ".mat"
-        self.version = {'AixLib': '0.7.3', 'Buildings': '5.1.0',
+        self.version = {'AixLib': '0.7.3', 'Buildings': '6.0.0',
                         'BuildingSystems': '2.0.0-beta2', 'IDEAS': '2.1.0'}
         self.consider_heat_capacity = True
 

tests/test_data.py

@@ -457,10 +457,10 @@ def test_type_bldg_residential_with_calc(self):
 
         assert round(test_residential.get_outer_wall_area(-2), 0) == 1108
         assert round(test_residential.get_outer_wall_area(-1), 0) == 1108
-        assert round(test_residential.get_outer_wall_area(0), 0) == 325
-        assert round(test_residential.get_outer_wall_area(180), 0) == 325
-        assert round(test_residential.get_outer_wall_area(90), 0) == 325
-        assert round(test_residential.get_outer_wall_area(270), 0) == 325
+        assert round(test_residential.get_outer_wall_area(0), 0) == 312
+        assert round(test_residential.get_outer_wall_area(180), 0) == 312
+        assert round(test_residential.get_outer_wall_area(90), 0) == 312
+        assert round(test_residential.get_outer_wall_area(270), 0) == 312
         assert round(test_residential.get_window_area(0), 0) == 125
         assert round(test_residential.get_window_area(180), 0) == 125
         assert round(test_residential.get_window_area(90), 0) == 125
@@ -486,10 +486,10 @@ def test_type_bldg_residential_with_calc(self):
 
         assert round(test_residential.get_outer_wall_area(-2), 0) == 1108
         assert round(test_residential.get_outer_wall_area(-1), 0) == 1108
-        assert round(test_residential.get_outer_wall_area(0), 0) == 398
-        assert round(test_residential.get_outer_wall_area(180), 0) == 398
-        assert round(test_residential.get_outer_wall_area(90), 0) == 398
-        assert round(test_residential.get_outer_wall_area(270), 0) == 398
+        assert round(test_residential.get_outer_wall_area(0), 0) == 393
+        assert round(test_residential.get_outer_wall_area(180), 0) == 393
+        assert round(test_residential.get_outer_wall_area(90), 0) == 393
+        assert round(test_residential.get_outer_wall_area(270), 0) == 393
         assert round(test_residential.get_window_area(0), 0) == 125
         assert round(test_residential.get_window_area(180), 0) == 125
         assert round(test_residential.get_window_area(90), 0) == 125
@@ -515,10 +515,10 @@ def test_type_bldg_residential_with_calc(self):
 
         assert round(test_residential.get_outer_wall_area(-2), 0) == 858
         assert round(test_residential.get_outer_wall_area(-1), 0) == 484
-        assert round(test_residential.get_outer_wall_area(0), 0) == 270
-        assert round(test_residential.get_outer_wall_area(180), 0) == 270
-        assert round(test_residential.get_outer_wall_area(90), 0) == 270
-        assert round(test_residential.get_outer_wall_area(270), 0) == 270
+        assert round(test_residential.get_outer_wall_area(0), 0) == 267
+        assert round(test_residential.get_outer_wall_area(180), 0) == 267
+        assert round(test_residential.get_outer_wall_area(90), 0) == 267
+        assert round(test_residential.get_outer_wall_area(270), 0) == 267
         assert round(test_residential.get_window_area(0), 0) == 125
         assert round(test_residential.get_window_area(180), 0) == 125
         assert round(test_residential.get_window_area(90), 0) == 125
@@ -544,10 +544,10 @@ def test_type_bldg_residential_with_calc(self):
 
         assert round(test_residential.get_outer_wall_area(-2), 0) == 700
         assert round(test_residential.get_outer_wall_area(-1), 0) == 789
-        assert round(test_residential.get_outer_wall_area(0), 0) == 255
-        assert round(test_residential.get_outer_wall_area(180), 0) == 255
-        assert round(test_residential.get_outer_wall_area(90), 0) == 255
-        assert round(test_residential.get_outer_wall_area(270), 0) == 255
+        assert round(test_residential.get_outer_wall_area(0), 0) == 251
+        assert round(test_residential.get_outer_wall_area(180), 0) == 251
+        assert round(test_residential.get_outer_wall_area(90), 0) == 251
+        assert round(test_residential.get_outer_wall_area(270), 0) == 251
         assert round(test_residential.get_window_area(0), 0) == 125
         assert round(test_residential.get_window_area(180), 0) == 125
         assert round(test_residential.get_window_area(90), 0) == 125