Merge remote-tracking branch 'origin/main' into main

samuelduchesne · Jul 14, 2022 · d1710e9 · d1710e9
2 parents 7cfc957 + b8c66bd
commit d1710e9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/archetypal/template/conditioning.py b/archetypal/template/conditioning.py
@@ -262,16 +262,16 @@ def __init__(
         self.HeatingSchedule = HeatingSchedule
         self.CoolingSchedule = CoolingSchedule
         self.CoolingCoeffOfPerf = CoolingCoeffOfPerf
-        self.CoolingLimitType = IdealSystemLimit(CoolingLimitType)
-        self.CoolingFuelType = FuelType(CoolingFuelType)
+        self.CoolingLimitType = CoolingLimitType
+        self.CoolingFuelType = CoolingFuelType
         self._cooling_setpoint = CoolingSetpoint  # setter without check
-        self.EconomizerType = EconomizerTypes(EconomizerType)
+        self.EconomizerType = EconomizerType
         self.HeatRecoveryEfficiencyLatent = HeatRecoveryEfficiencyLatent
         self.HeatRecoveryEfficiencySensible = HeatRecoveryEfficiencySensible
-        self.HeatRecoveryType = HeatRecoveryTypes(HeatRecoveryType)
+        self.HeatRecoveryType = HeatRecoveryType
         self.HeatingCoeffOfPerf = HeatingCoeffOfPerf
-        self.HeatingLimitType = IdealSystemLimit(HeatingLimitType)
-        self.HeatingFuelType = FuelType(HeatingFuelType)
+        self.HeatingLimitType = HeatingLimitType
+        self.HeatingFuelType = HeatingFuelType
         self.HeatingSetpoint = HeatingSetpoint
         self.IsCoolingOn = IsCoolingOn
         self.IsHeatingOn = IsHeatingOn
@@ -413,7 +413,7 @@ def HeatingLimitType(self, value):
             )
             self._heating_limit_type = IdealSystemLimit[value]
         elif checkers.is_numeric(value):
-            assert IdealSystemLimit[value], (
+            assert IdealSystemLimit(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in IdealSystemLimit)}"
             )
@@ -435,7 +435,7 @@ def HeatingFuelType(self, value):
             )
             self._heating_fuel_type = FuelType[value]
         elif checkers.is_numeric(value):
-            assert FuelType[value], (
+            assert FuelType(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in FuelType)}"
             )
@@ -493,7 +493,7 @@ def CoolingLimitType(self, value):
             )
             self._cooling_limit_type = IdealSystemLimit[value]
         elif checkers.is_numeric(value):
-            assert IdealSystemLimit[value], (
+            assert IdealSystemLimit(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in IdealSystemLimit)}"
             )
@@ -515,7 +515,7 @@ def CoolingFuelType(self, value):
             )
             self._cooling_fuel_type = FuelType[value]
         elif checkers.is_numeric(value):
-            assert FuelType[value], (
+            assert FuelType(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in FuelType)}"
             )
@@ -559,7 +559,7 @@ def EconomizerType(self, value):
             )
             self._economizer_type = EconomizerTypes[value]
         elif checkers.is_numeric(value):
-            assert EconomizerTypes[value], (
+            assert EconomizerTypes(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in EconomizerTypes)}"
             )
@@ -595,7 +595,7 @@ def HeatRecoveryType(self, value):
             )
             self._heat_recovery_type = HeatRecoveryTypes[value]
         elif checkers.is_numeric(value):
-            assert HeatRecoveryTypes[value], (
+            assert HeatRecoveryTypes(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in HeatRecoveryTypes)}"
             )

diff --git a/archetypal/template/load.py b/archetypal/template/load.py
@@ -126,7 +126,7 @@ def __init__(
         self.IsEquipmentOn = IsEquipmentOn
         self.IsLightingOn = IsLightingOn
         self.IsPeopleOn = IsPeopleOn
-        self.DimmingType = DimmingTypes(DimmingType)
+        self.DimmingType = DimmingType
         self.IlluminanceTarget = IlluminanceTarget
         self.area = area
         self.volume = volume
@@ -151,7 +151,7 @@ def DimmingType(self, value):
             )
             self._dimming_type = DimmingTypes[value]
         elif checkers.is_numeric(value):
-            assert DimmingTypes[value], (
+            assert DimmingTypes(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in DimmingTypes)}"
             )

diff --git a/archetypal/template/ventilation.py b/archetypal/template/ventilation.py
@@ -404,12 +404,13 @@ def VentilationType(self, value):
             )
             self._ventilation_type = VentilationType[value]
         elif checkers.is_numeric(value):
-            assert VentilationType[value], (
+            assert VentilationType(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in VentilationType)}"
             )
             self._ventilation_type = VentilationType(value)
-        self._ventilation_type = value
+        elif isinstance(value, VentilationType):
+            self._ventilation_type = value
 
     @property
     def Afn(self):

diff --git a/archetypal/template/window_setting.py b/archetypal/template/window_setting.py
@@ -123,8 +123,8 @@ def __init__(
         self.OperableArea = OperableArea
         self.ShadingSystemSetpoint = ShadingSystemSetpoint
         self.ShadingSystemTransmittance = ShadingSystemTransmittance
-        self.ShadingSystemType = ShadingType(ShadingSystemType)
-        self.Type = WindowType(Type)
+        self.ShadingSystemType = ShadingSystemType
+        self.Type = Type
         self.ZoneMixingDeltaTemperature = ZoneMixingDeltaTemperature
         self.ZoneMixingFlowRate = ZoneMixingFlowRate
         self.ZoneMixingAvailabilitySchedule = ZoneMixingAvailabilitySchedule
@@ -195,7 +195,7 @@ def ShadingSystemType(self, value):
             )
             self._shading_system_type = ShadingType[value]
         elif checkers.is_numeric(value):
-            assert ShadingType[value], (
+            assert ShadingType(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in ShadingType)}"
             )
@@ -336,7 +336,7 @@ def Type(self, value):
             )
             self._type = WindowType[value]
         elif checkers.is_numeric(value):
-            assert WindowType[value], (
+            assert WindowType(value), (
                 f"Input value error for '{value}'. "
                 f"Expected one of {tuple(a for a in WindowType)}"
             )