Merge 94ecdff into 0f838aa

archetypal/__init__.py

@@ -28,6 +28,5 @@
 from .trnsys import *
 from .template import *
 from .core import *
-from .building import *
 from .umi_template import *
 from .cli import *

archetypal/idfclass.py

@@ -958,7 +958,7 @@ def run_eplus(
         version (bool, optional): Display version information (default: False)
 
     Returns:
-        tuple: a 1-tuple or a 2-tuple
+        2-tuple: a 1-tuple or a 2-tuple
             - dict: dict of [(title, table), .....]
             - IDF: The IDF object. Only provided if return_idf is True.
     """

archetypal/template/building_template.py

@@ -73,7 +73,7 @@ def __init__(
         self.Windows = Windows
 
     def __hash__(self):
-        return hash((self.Name, self.idf.name))
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, BuildingTemplate):

archetypal/template/conditioning.py

@@ -178,7 +178,7 @@ def __add__(self, other):
         return self.combine(other)
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, ZoneConditioning):

archetypal/template/dhw.py

@@ -57,7 +57,7 @@ def __add__(self, other):
         return self.combine(other)
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, DomesticHotWaterSetting):

archetypal/template/gas_material.py

@@ -29,7 +29,7 @@ def __init__(self, *args, Category="Gases", Type="Gas", **kwargs):
         self.Type = Type
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, GasMaterial):

archetypal/template/glazing_material.py

@@ -94,7 +94,7 @@ def __add__(self, other):
         return self.combine(other)
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, GlazingMaterial):

archetypal/template/load.py

@@ -99,7 +99,7 @@ def __add__(self, other):
         return self.combine(other)
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, ZoneLoad):

archetypal/template/opaque_construction.py

@@ -104,7 +104,7 @@ def __add__(self, other):
         return self.combine(other)
 
     def __hash__(self):
-        return hash((self.Name))
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, OpaqueConstruction):

archetypal/template/opaque_material.py

@@ -112,7 +112,7 @@ def __add__(self, other):
         return self.combine(other)
 
     def __hash__(self):
-        return hash((self.Name))
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, OpaqueMaterial):

archetypal/template/schedule.py

@@ -82,7 +82,7 @@ def __str__(self):
         return repr(self)
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, UmiSchedule):
@@ -387,7 +387,7 @@ def get_days(self, epbunch):
         ]
         for day in dayname:
             week_day_schedule_name = epbunch["{}_ScheduleDay_Name".format(day)]
-            blocks.append(self.all_objects[("DaySchedule", week_day_schedule_name)])
+            blocks.append(self.all_objects[hash(("DaySchedule", week_day_schedule_name))])
 
         return blocks
 
@@ -478,7 +478,7 @@ def get_parts(self, epbunch):
                     FromMonth,
                     ToDay,
                     ToMonth,
-                    self.all_objects[("WeekSchedule", week_day_schedule_name)],
+                    self.all_objects[hash(("WeekSchedule", week_day_schedule_name))],
                 )
             )
         return parts

archetypal/template/structure.py

@@ -89,7 +89,7 @@ def __init__(
         self.MassRatios = MassRatios
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, StructureDefinition):

archetypal/template/umi_base.py

@@ -28,7 +28,7 @@ def __call__(cls, *args, **kwargs):
             *args:
             **kwargs:
         """
-        key = (cls.mro()[0].__name__, kwargs["Name"])
+        key = hash((cls.mro()[0].__name__, kwargs["Name"]))
         if key not in CREATED_OBJECTS:
             self = cls.__new__(cls, *args, **kwargs)
             cls.__init__(self, *args, **kwargs)
@@ -149,12 +149,12 @@ def _get_predecessors_meta(self, other):
 
     def rename(self, name):
         """renames self as well as the cached object"""
-        key = (self.__class__.mro()[0].__name__, self.Name)
+        key = hash((self.__class__.mro()[0].__name__, self.Name))
         self._cache.pop(key)
         CREATED_OBJECTS.pop(key)
 
         self.Name = name
-        newkey = (self.__class__.mro()[0].__name__, name)
+        newkey = hash((self.__class__.mro()[0].__name__, name))
         self._cache[newkey] = self
         CREATED_OBJECTS[newkey] = self
 
@@ -185,7 +185,7 @@ def get_random_schedule(self):
         )
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.mro()[0].__name__, self.Name))
 
     def to_dict(self):
         return {"$ref": str(self.id)}
@@ -275,13 +275,14 @@ def extend(self, other):
         Returns:
             UmiBase: self
         """
+        self.all_objects.pop(self.__hash__(), None)
         id = self.id
-        new_obj = self + other
+        new_obj = self.combine(other)
         new_obj.__dict__.pop("id")
         new_obj.id = id
         name = new_obj.__dict__.pop("Name")
-        self.__dict__.update(**new_obj.__dict__)
-        self.all_objects.pop((self.__class__.__name__, name))
+        self.__dict__.update(Name=name, **new_obj.__dict__)
+        self.all_objects[self.__hash__()] = self
         return self
 
 
@@ -357,7 +358,7 @@ def __init__(
         self.TransportEnergy = TransportEnergy
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, MaterialBase):

archetypal/template/ventilation.py

@@ -131,7 +131,7 @@ def __add__(self, other):
         return self.combine(other)
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, VentilationSetting):

archetypal/template/window.py

@@ -61,7 +61,7 @@ def __init__(
         self.Layers = None
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, WindowConstruction):
@@ -310,7 +310,7 @@ def __str__(self):
         return repr(self)
 
     def __hash__(self):
-        return hash(self.Name)
+        return hash((self.__class__.__name__, self.Name))
 
     def __eq__(self, other):
         if not isinstance(other, WindowSetting):