update

Author: HoeppJ

teaser/data/dataclass.py

@@ -29,6 +29,8 @@ class DataClass(object):
     construction_data : ConstructionData
         The prefix of this parameter indicates which statistical data about building
         elements should be used. Its type is the enum class ConstructionData.
+        To utilize custom TypeElements via a JSON file via parameter custom_path_type_elements (cf. below)
+        use ConstructionData.custom.
     custom_path_type_elements: str or Path
         Custom path to JSON file of TypeElements. Default: None
     custom_path_material_templates: str or Path
@@ -64,10 +66,12 @@ def __init__(self,
 
         """Construct DataClass."""
         self.element_bind = None
-        if custom_path_type_elements:
-            self.path_tb = custom_path_type_elements
-        elif not custom_path_type_elements and construction_data.is_custom():
-            raise KeyError("Provide path to custom type elements .json file")
+        if construction_data.is_custom():
+            if custom_path_type_elements:
+                self.path_tb = custom_path_type_elements
+            elif not custom_path_type_elements:
+                raise KeyError("Provide path to custom type elements JSON file "
+                               "or change ConstructionData to a known construction type")
         elif construction_data.is_iwu():
             self.path_tb = utils.get_full_path(
                 "data/input/inputdata/TypeElements_IWU.json"
@@ -112,7 +116,7 @@ def __init__(self,
 
     def load_tb_binding(self):
         """Load TypeBuildingElement json into binding classes."""
-        if self.path_tb.endswith("json"):
+        if str(self.path_tb).endswith("json"):
             if os.path.isfile(self.path_tb):
                 try:
                     with open(self.path_tb, "r") as f:
@@ -127,7 +131,7 @@ def load_tb_binding(self):
 
     def load_uc_binding(self):
         """Load UseConditions json into binding classes."""
-        if self.path_uc.endswith("json"):
+        if str(self.path_uc).endswith("json"):
             if os.path.isfile(self.path_uc):
                 try:
                     with open(self.path_uc, "r") as f:
@@ -142,7 +146,7 @@ def load_uc_binding(self):
 
     def load_mat_binding(self):
         """Load MaterialTemplates json into binding classes."""
-        if self.path_mat.endswith("json"):
+        if str(self.path_mat).endswith("json"):
             if os.path.isfile(self.path_mat):
                 try:
                     with open(self.path_mat, "r") as f:

teaser/data/utilities.py

@@ -77,6 +77,8 @@ class ConstructionData(Enum):
     The ConstructionData enumeration combines the former parameters “method” and “construction_type”.
     The prefix of each value is used to select the appropriate json file as input data.
     The complete value is used to search for the appropriate element within the json file.
+    To utilize custom TypeElements via a JSON file via parameter custom_path_type_elements (cf. below)
+    use ConstructionData.custom.
     """
     iwu_heavy = "iwu_heavy"
     iwu_light = "iwu_light"
@@ -91,7 +93,7 @@ class ConstructionData(Enum):
     kfw_70 = "kfw_70"
     kfw_85 = "kfw_85"
     kfw_100 = "kfw_100"
-    custom = "Custom"
+    custom = "custom"
 
     def get_prefix(self):
         parts = self.value.split("_", 2)
@@ -114,8 +116,7 @@ def is_kfw(self):
         return self.get_prefix() == "kfw"
 
     def is_custom(self):
-        if not any(s in self.value for s in ["iwu", "tabula_de", "tabula_dk", "kfw"]):
-            return "custom" in self.value
+        return self.value == "custom"
 
 # Dictionary that maps GeometryData enumeration values to their corresponding building classes.
 geometries = {