topologicpy 0.7.54__py3-none-any.whl → 0.7.56__py3-none-any.whl

topologicpy/Cell.py

@@ -969,12 +969,7 @@ class Cell():
             return code
 
         def getApertures(topology):
-            apTopologies = []
-            apertures = Topology.Apertures(topology)
-            if isinstance(apertures, list):
-                for aperture in apertures:
-                    apTopologies.append(Aperture.Topology(aperture))
-            return apTopologies
+            return Topology.Apertures(topology)
 
         if not Topology.IsInstance(cell, "Cell"):
             print("Cell.Decompose - Error: The input cell parameter is not a valid topologic cell. Returning None.")

topologicpy/CellComplex.py

@@ -493,12 +493,7 @@ class CellComplex():
             return code
 
         def getApertures(topology):
-            apertures = []
-            apTopologies = []
-            apertures = Topology.Apertures(topology)
-            for aperture in apertures:
-                apTopologies.append(Aperture.Topology(aperture))
-            return apTopologies
+            return Topology.Apertures(topology)
 
         if not Topology.IsInstance(cellComplex, "CellComplex"):
             print("CellComplex.Decompose - Error: The input cellcomplex parameter is not a valid topologic cellcomplex. Returning None.")

topologicpy/Dictionary.py

@@ -625,7 +625,7 @@ class Dictionary():
             return None
     
     @staticmethod
-    def ValueAtKey(dictionary, key):
+    def ValueAtKey(dictionary, key, silent=False):
         """
         Returns the value of the input key in the input dictionary.
 
@@ -635,6 +635,8 @@ class Dictionary():
             The input dictionary.
         key : string
             The input key.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -645,10 +647,12 @@ class Dictionary():
         from topologicpy.Topology import Topology
         
         if not Topology.IsInstance(dictionary, "Dictionary") and not isinstance(dictionary, dict):
-            print("Dictionary.ValueAtKey - Error: The input dictionary parameter is not a valid topologic or python dictionary. Returning None.")
+            if not silent == True:
+                print("Dictionary.ValueAtKey - Error: The input dictionary parameter is not a valid topologic or python dictionary. Returning None.")
             return None
         if not isinstance(key, str):
-            print("Dictionary.ValueAtKey - Error: The input key parameter is not a valid str. Returning None.")
+            if not silent == True:
+                print("Dictionary.ValueAtKey - Error: The input key parameter is not a valid str. Returning None.")
             return None
         if isinstance(dictionary, dict):
             attr = dictionary[key]

topologicpy/EnergyModel.py

@@ -382,12 +382,11 @@ class EnergyModel:
                             osSurface.setName(osSpace.name().get() + "_ExternalVerticalFace_" + str(faceNumber))
                             # Check for exterior apertures
                             faceDictionary = buildingFace.GetDictionary()
-                            apertures = []
-                            _ = buildingFace.Apertures(apertures)
+                            #apertures = []
+                            apertures = Topology.Apertures(buildingFace)
                             if len(apertures) > 0:
-                                for aperture in apertures:
+                                for apertureFace in apertures:
                                     osSubSurfacePoints = []
-                                    apertureFace = Aperture.Topology(aperture)
                                     for vertex in Topology.SubTopologies(apertureFace.ExternalBoundary(), "Vertex"):
                                         osSubSurfacePoints.append(openstudio.Point3d(Vertex.X(vertex, mantissa=mantissa), Vertex.Y(vertex, mantissa=mantissa), Vertex.Z(vertex, mantissa=mantissa)))
                                     osSubSurface = openstudio.model.SubSurface(osSubSurfacePoints, osModel)
@@ -420,12 +419,11 @@ class EnergyModel:
                             osSurface.setName(osSpace.name().get() + "_InternalVerticalFace_" + str(faceNumber))
                         # Check for interior apertures
                         faceDictionary = buildingFace.GetDictionary()
-                        apertures = []
-                        _ = buildingFace.Apertures(apertures)
+                        #apertures = []
+                        apertures = Topology.Apertures(buildingFace)
                         if len(apertures) > 0:
-                            for aperture in apertures:
+                            for apertureFace in apertures:
                                 osSubSurfacePoints = []
-                                apertureFace = Aperture.Topology(aperture)
                                 for vertex in Topology.SubTopologies(apertureFace.ExternalBoundary(), "Vertex"):
                                     osSubSurfacePoints.append(openstudio.Point3d(Vertex.X(vertex, mantissa=mantissa), Vertex.Y(vertex, mantissa=mantissa), Vertex.Z(vertex.Z, mantissa=mantissa)))
                                 osSubSurface = openstudio.model.SubSurface(osSubSurfacePoints, osModel)