topologicpy 0.7.79__py3-none-any.whl → 0.7.80__py3-none-any.whl

topologicpy/ANN.py

@@ -827,7 +827,7 @@ class ANN():
         Returns
         -------
         _ANNModel
-            Returns the trained model.
+            Returns the initialized model.
 
         """
         def prepare_data(dataset, task_type='classification'):
@@ -898,7 +898,7 @@ class ANN():
         Returns
         -------
         list, list
-            Returns two lists: metrics, and predictions.
+            Returns four lists: y_test, predictions, metrics, and confusion_matrix.
 
         """
         def prepare_data(dataset, task_type='classification'):

topologicpy/Helper.py

@@ -125,7 +125,6 @@ class Helper:
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Helper import Helper
         import inspect
-
         keys_list = list(keys)
         keys_list = Helper.Flatten(keys_list)
         keys_list = [x for x in keys_list if isinstance(x, str)]
@@ -155,9 +154,7 @@ class Helper:
         values = []
         new_dictionaries = []
         for i, d in enumerate(dictionaries):
-            element = elements[i]
-
-            d_keys = Dictionary.Keys(d)
+            d_keys = Dictionary.Keys(dictionaries[i])
             if len(d_keys) > 0:
                 values_list = []
                 for key in keys_list:
@@ -165,9 +162,13 @@ class Helper:
                     if not v == None:
                         values_list.append(v)
                 values_list = str(values_list)
-                d = Dictionary.SetValueAtKey(d, "_clustering_key_", values_list)
-                new_dictionaries.append(d)
+                dictionaries[i] = Dictionary.SetValueAtKey(dictionaries[i], "_clustering_key_", values_list)
                 values.append(values_list)
+            else:
+                dictionaries[i] = Dictionary.SetValueAtKey(dictionaries[i], "_clustering_key_", "_NONE_")
+                values.append("_NONE_")
+            new_dictionaries.append(dictionaries[i])
+
         
         values = list(set(values))
         remaining_dictionaries = [x for x in new_dictionaries]

topologicpy/Plotly.py

@@ -609,12 +609,13 @@ class Plotly:
             n = len(str(len(elements_clusters)))
             labels = []
             for j, elements_cluster in enumerate(elements_clusters):
+                d_color = color
                 labels.append("Edge_"+str(j+1).zfill(n))
                 d = dict_clusters[j][0] # All dicitonaries have same values in dictionaries, so take first one.
                 if d:
                     if not colorKey == None:
                         d_color = Dictionary.ValueAtKey(d, key=colorKey) or color
-                        color = Color.AnyToHex(d_color)
+                        d_color = Color.AnyToHex(d_color)
                     if not labelKey == None:
                         label = str(Dictionary.ValueAtKey(d, key=labelKey)) or ""
                     if not widthKey == None:
@@ -632,7 +633,6 @@ class Plotly:
                                 d_color = Color.ByValueInRange(group, minValue=minGroup, maxValue=maxGroup, colorScale=colorScale)
                             else:
                                 d_color = Color.ByValueInRange(groups.index(group), minValue=minGroup, maxValue=maxGroup, colorScale=colorScale)
-                            color = d_color
 
                 x = []
                 y = []
@@ -658,7 +658,7 @@ class Plotly:
                                     showlegend=showLegend,
                                     marker=dict(symbol="circle", size=marker_width),
                                     mode=mode,
-                                    line=dict(color=color, width=width),
+                                    line=dict(color=d_color, width=width),
                                     legendgroup=legendGroup,
                                     legendrank=legendRank,
                                     text=label,

topologicpy/Topology.py

@@ -1116,14 +1116,6 @@ class Topology():
         """
         return Topology.Boolean(topologyA=topologyA, topologyB=topologyB, operation="slice", tranDict=tranDict, tolerance=tolerance)
     
-    @staticmethod
-    def Merge(topologyA, topologyB, tranDict=False, tolerance=0.0001):
-        """
-        See Topology.Boolean().
-
-        """
-        return Topology.Boolean(topologyA=topologyA, topologyB=topologyB, operation="merge", tranDict=tranDict, tolerance=tolerance)
-    
     @staticmethod
     def Impose(topologyA, topologyB, tranDict=False, tolerance=0.0001):
         """
@@ -1567,7 +1559,7 @@ class Topology():
                 return edges[0]
 
             output = Cluster.ByTopologies(edges)
-            if topologyType.lower() == "wire":
+            if topologyType == "wire":
                 output = Topology.SelfMerge(output, tolerance=tolerance)
                 if Topology.IsInstance(output, "Wire"):
                     return output
@@ -6471,7 +6463,31 @@ class Topology():
             print("Topology.MergeAll - Error: the input topologyList does not contain any valid topologies. Returning None.")
             return None
         return Topology.SelfMerge(Cluster.ByTopologies(topologyList), tolerance=tolerance)
-            
+    
+    @staticmethod
+    def Move(topology, x=0, y=0, z=0):
+        """
+        Moves the input topology.
+
+        Parameters
+        ----------
+        topology : topologic_core.topology
+            The input topology.
+        x : float , optional
+            The x distance value. The default is 0.
+        y : float , optional
+            The y distance value. The default is 0.
+        z : float , optional
+            The z distance value. The default is 0.
+
+        Returns
+        -------
+        topologic_core.Topology
+            The moved topology.
+
+        """
+        return Topology.Translate(topology, x=x, y=y, z=z)
+    
     @staticmethod
     def OCCTShape(topology):
         """
@@ -7227,12 +7243,12 @@ class Topology():
         if not Topology.IsInstance(origin, "Vertex"):
             print("Topology.Rotate - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
             return None
-        returnTopology = topology
+        return_topology = topology
         d = Topology.Dictionary(topology)
         if abs(angle) >= angTolerance:
             try:
                 x, y, z = axis
-                returnTopology = topologic.TopologyUtility.Rotate(topology, origin, x, y, z, angle)
+                return_topology = topologic.TopologyUtility.Rotate(topology, origin, x, y, z, angle)
             except:
                 print("Topology.Rotate - Warning: (topologic.TopologyUtility.Rotate) operation failed. Trying a workaround.")
                 vertices = [Vertex.Coordinates(v) for v in Topology.Vertices(topology)]
@@ -7241,14 +7257,43 @@ class Topology():
                 for v in vertices:
                     rot_vertices.append(rotate_vertex_3d(v, axis, angle, origin))
                 rot_vertices = [Vertex.ByCoordinates(rot_v) for rot_v in rot_vertices]
-                new_topology = Topology.ReplaceVertices(topology, verticesA=Topology.Vertices(topology), verticesB=rot_vertices)
-                new_topology = Topology.SelfMerge(new_topology, tolerance=tolerance)
-                if len(Dictionary.Keys(d)) > 0:
-                    new_topology = Topology.SetDictionary(new_topology, d)
-                return new_topology
+                return_topology = Topology.ReplaceVertices(topology, verticesA=Topology.Vertices(topology), verticesB=rot_vertices)
+                return_topology = Topology.SelfMerge(return_topology, tolerance=tolerance)
         if len(Dictionary.Keys(d)) > 0:
-                    returnTopology = Topology.SetDictionary(returnTopology, d)
-        return returnTopology
+                    return_topology = Topology.SetDictionary(return_topology, d)
+
+        vertices = Topology.Vertices(topology)
+        edges = Topology.Edges(topology)
+        wires = Topology.Wires(topology)
+        faces = Topology.Faces(topology)
+        shells = Topology.Shells(topology)
+        cells = Topology.Cells(topology)
+        cellComplexes = Topology.CellComplexes(topology)
+        
+        r_vertices = Topology.Vertices(return_topology)
+        r_edges = Topology.Edges(return_topology)
+        r_wires = Topology.Wires(return_topology)
+        r_faces = Topology.Faces(return_topology)
+        r_shells = Topology.Shells(return_topology)
+        r_cells = Topology.Cells(return_topology)
+        r_cellComplexes = Topology.CellComplexes(return_topology)
+
+        for i, t in enumerate(r_vertices):
+            t = Topology.SetDictionary(t, Topology.Dictionary(vertices[i]), silent=True)
+        for i, t in enumerate(r_edges):
+            t = Topology.SetDictionary(t, Topology.Dictionary(edges[i]), silent=True)
+        for i, t in enumerate(r_wires):
+            t = Topology.SetDictionary(t, Topology.Dictionary(wires[i]), silent=True)
+        for i, t in enumerate(r_faces):
+            t = Topology.SetDictionary(t, Topology.Dictionary(faces[i]), silent=True)
+        for i, t in enumerate(r_shells):
+            t = Topology.SetDictionary(t, Topology.Dictionary(shells[i]), silent=True)
+        for i, t in enumerate(r_cells):
+            t = Topology.SetDictionary(t, Topology.Dictionary(cells[i]), silent=True)
+        for i, t in enumerate(r_cellComplexes):
+            t = Topology.SetDictionary(t, Topology.Dictionary(cellComplexes[i]), silent=True)
+        
+        return return_topology
     
     @staticmethod
     def RotateByEulerAngles(topology, origin = None, roll: float = 0, pitch: float = 0, yaw: float = 0,  angTolerance: float = 0.001, tolerance: float = 0.0001):
@@ -7402,20 +7447,53 @@ class Topology():
             The scaled topology.
 
         """
+        
         from topologicpy.Vertex import Vertex
+
         if not Topology.IsInstance(topology, "Topology"):
             return None
         if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.ByCoordinates(0, 0, 0)
         if not Topology.IsInstance(origin, "Vertex"):
             return None
-        newTopology = None
+        return_topology = None
         try:
-            newTopology = topologic.TopologyUtility.Scale(topology, origin, x, y, z)
+            return_topology = topologic.TopologyUtility.Scale(topology, origin, x, y, z)
         except:
             print("Topology.Scale - ERROR: (Topologic>TopologyUtility.Scale) operation failed. Returning None.")
-            newTopology = None
-        return newTopology
+            return_topology = None
+        
+        vertices = Topology.Vertices(topology)
+        edges = Topology.Edges(topology)
+        wires = Topology.Wires(topology)
+        faces = Topology.Faces(topology)
+        shells = Topology.Shells(topology)
+        cells = Topology.Cells(topology)
+        cellComplexes = Topology.CellComplexes(topology)
+        
+        r_vertices = Topology.Vertices(return_topology)
+        r_edges = Topology.Edges(return_topology)
+        r_wires = Topology.Wires(return_topology)
+        r_faces = Topology.Faces(return_topology)
+        r_shells = Topology.Shells(return_topology)
+        r_cells = Topology.Cells(return_topology)
+        r_cellComplexes = Topology.CellComplexes(return_topology)
+
+        for i, t in enumerate(r_vertices):
+            t = Topology.SetDictionary(t, Topology.Dictionary(vertices[i]), silent=True)
+        for i, t in enumerate(r_edges):
+            t = Topology.SetDictionary(t, Topology.Dictionary(edges[i]), silent=True)
+        for i, t in enumerate(r_wires):
+            t = Topology.SetDictionary(t, Topology.Dictionary(wires[i]), silent=True)
+        for i, t in enumerate(r_faces):
+            t = Topology.SetDictionary(t, Topology.Dictionary(faces[i]), silent=True)
+        for i, t in enumerate(r_shells):
+            t = Topology.SetDictionary(t, Topology.Dictionary(shells[i]), silent=True)
+        for i, t in enumerate(r_cells):
+            t = Topology.SetDictionary(t, Topology.Dictionary(cells[i]), silent=True)
+        for i, t in enumerate(r_cellComplexes):
+            t = Topology.SetDictionary(t, Topology.Dictionary(cellComplexes[i]), silent=True)
+        return return_topology
 
     
     @staticmethod
@@ -8950,8 +9028,42 @@ class Topology():
         kTranslationY = matrix[3][1]
         kTranslationZ = matrix[3][2]
 
-        return topologic.TopologyUtility.Transform(topology, kTranslationX, kTranslationY, kTranslationZ, kRotation11, kRotation12, kRotation13, kRotation21, kRotation22, kRotation23, kRotation31, kRotation32, kRotation33)
+        return_topology = topologic.TopologyUtility.Transform(topology, kTranslationX, kTranslationY, kTranslationZ, kRotation11, kRotation12, kRotation13, kRotation21, kRotation22, kRotation23, kRotation31, kRotation32, kRotation33)
+        
+        vertices = Topology.Vertices(topology)
+        edges = Topology.Edges(topology)
+        wires = Topology.Wires(topology)
+        faces = Topology.Faces(topology)
+        shells = Topology.Shells(topology)
+        cells = Topology.Cells(topology)
+        cellComplexes = Topology.CellComplexes(topology)
 
+        r_vertices = Topology.Vertices(return_topology)
+        r_edges = Topology.Edges(return_topology)
+        r_wires = Topology.Wires(return_topology)
+        r_faces = Topology.Faces(return_topology)
+        r_shells = Topology.Shells(return_topology)
+        r_cells = Topology.Cells(return_topology)
+        r_cellComplexes = Topology.CellComplexes(return_topology)
+        
+        for i, t in enumerate(r_vertices):
+            t = Topology.SetDictionary(t, Topology.Dictionary(vertices[i]), silent=True)
+        for i, t in enumerate(r_edges):
+            t = Topology.SetDictionary(t, Topology.Dictionary(edges[i]), silent=True)
+        for i, t in enumerate(r_wires):
+            t = Topology.SetDictionary(t, Topology.Dictionary(wires[i]), silent=True)
+        for i, t in enumerate(r_faces):
+            t = Topology.SetDictionary(t, Topology.Dictionary(faces[i]), silent=True)
+        for i, t in enumerate(r_shells):
+            t = Topology.SetDictionary(t, Topology.Dictionary(shells[i]), silent=True)
+        for i, t in enumerate(r_cells):
+            t = Topology.SetDictionary(t, Topology.Dictionary(cells[i]), silent=True)
+        for i, t in enumerate(r_cellComplexes):
+            t = Topology.SetDictionary(t, Topology.Dictionary(cellComplexes[i]), silent=True)
+        
+        return_topology = Topology.SetDictionary(return_topology, Topology.Dictionary(topology), silent=True)
+        return return_topology
+    
     @staticmethod
     def Translate(topology, x=0, y=0, z=0):
         """
@@ -8974,13 +9086,55 @@ class Topology():
             The translated topology.
 
         """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Dictionary import Dictionary
+
         if not Topology.IsInstance(topology, "Topology"):
             print("Topology.Translate - Error: The input topology parameter is not a valid topology. Returning None.")
             return None
+        
+        if Topology.IsInstance(topology, "vertex"):
+            old_x, old_y, old_z = Vertex.Coordinates(topology)
+            return_topology = Vertex.ByCoordinates(old_x+x, old_y+y, old_z+z)
+            return_topology = Topology.SetDictionary(return_topology, Topology.Dictionary(topology), silent=True)
+            return return_topology
+        vertices = Topology.Vertices(topology)
+        edges = Topology.Edges(topology)
+        wires = Topology.Wires(topology)
+        faces = Topology.Faces(topology)
+        shells = Topology.Shells(topology)
+        cells = Topology.Cells(topology)
+        cellComplexes = Topology.CellComplexes(topology)        
+
         try:
-            return topologic.TopologyUtility.Translate(topology, x, y, z)
+            return_topology = topologic.TopologyUtility.Translate(topology, x, y, z)
         except:
-            return topology
+            return_topology = topology
+        
+        r_vertices = Topology.Vertices(return_topology)
+        r_edges = Topology.Edges(return_topology)
+        r_wires = Topology.Wires(return_topology)
+        r_faces = Topology.Faces(return_topology)
+        r_shells = Topology.Shells(return_topology)
+        r_cells = Topology.Cells(return_topology)
+        r_cellComplexes = Topology.CellComplexes(return_topology)
+        for i, t in enumerate(r_vertices):
+            t = Topology.SetDictionary(t, Topology.Dictionary(vertices[i]), silent=True)
+        for i, t in enumerate(r_edges):
+            t = Topology.SetDictionary(t, Topology.Dictionary(edges[i]), silent=True)
+        for i, t in enumerate(r_wires):
+            t = Topology.SetDictionary(t, Topology.Dictionary(wires[i]), silent=True)
+        for i, t in enumerate(r_faces):
+            t = Topology.SetDictionary(t, Topology.Dictionary(faces[i]), silent=True)
+        for i, t in enumerate(r_shells):
+            t = Topology.SetDictionary(t, Topology.Dictionary(shells[i]), silent=True)
+        for i, t in enumerate(r_cells):
+            t = Topology.SetDictionary(t, Topology.Dictionary(cells[i]), silent=True)
+        for i, t in enumerate(r_cellComplexes):
+            t = Topology.SetDictionary(t, Topology.Dictionary(cellComplexes[i]), silent=True)
+        
+        return_topology = Topology.SetDictionary(return_topology, Topology.Dictionary(topology), silent=True)
+        return return_topology
     
     @staticmethod
     def TranslateByDirectionDistance(topology, direction: list = [0, 0, 0], distance: float = 0):

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.79'
+__version__ = '0.7.80'

{topologicpy-0.7.79.dist-info → topologicpy-0.7.80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.79
+Version: 0.7.80
 Summary: An AI-Powered Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: AGPL v3 License

{topologicpy-0.7.79.dist-info → topologicpy-0.7.80.dist-info}/RECORD

@@ -1,4 +1,4 @@
-topologicpy/ANN.py,sha256=XAuUjNvDRK1hhXfo82S-zXmnAPZGEdHJMRdfpu0aJ8I,47901
+topologicpy/ANN.py,sha256=m_WxD1lgQqDhUpaM20Lia6TmJACDYaAE96wigsi-99U,47932
 topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
 topologicpy/BVH.py,sha256=mKVCAu9K8qzcWXtPDVH5usXZV1DNNNJl4n3rU5Lh1ZM,12931
 topologicpy/Cell.py,sha256=2izd-YGqy897_JHHgrGlIo5WwUeEIWVD3KspV1z_sj8,107860
@@ -13,24 +13,24 @@ topologicpy/EnergyModel.py,sha256=AqTtmXE35SxvRXhG3vYAQd7GQDW-6HtjYPHua6ME4Eg,53
 topologicpy/Face.py,sha256=mS7LI3qIo2jfQbibpInArRfXMmTZd7xU8IdvRYUIGSU,124747
 topologicpy/Graph.py,sha256=ZhMVB6ntuhIgTrKLUPryeAJFFBF0cnRsNgESbaohOiw,416914
 topologicpy/Grid.py,sha256=9N6PE84qCm40TRi2WtlVZSBwXXr47zHpscEpZHg_JW4,18205
-topologicpy/Helper.py,sha256=Sv35czP_j0oLDeJcN8usswUm4U3auiK1LQ_Z_HBvxxg,21716
+topologicpy/Helper.py,sha256=vUWbnZJxn0e9YsFUNyJ5Dee8Nh6TmDp9uCzCk4e0qAA,21897
 topologicpy/Honeybee.py,sha256=HfTaEV1R8K1xOVQQy9sBOhBTF_ap8A2RxZOYhirp_Mw,21835
 topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
 topologicpy/Neo4j.py,sha256=t52hgE9cVsqkGc7m7fjRsLnyfRHakVHwdvF4ms7ow78,22342
-topologicpy/Plotly.py,sha256=cI1I6F-hGuN4dG-O-QvByipP0H1n5WsNG7_d0Y6_FNQ,113509
+topologicpy/Plotly.py,sha256=z7xs9Ra2OwJNv5NMapH27R6didS8UMpjZIN35ZnAQcE,113501
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
 topologicpy/Shell.py,sha256=8OJjlWk9eCZ3uGOTht6ZVrcMczCafw-YWoDGueaz7eg,87673
 topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=nZ23yATRXAfM1d81V28qjN7yEgJIFDyCQXDxQGCe3fs,425772
+topologicpy/Topology.py,sha256=nTthwB8vmfdpfoP8tTQCUhHr29WhjuV7l0btAI1rHkQ,433216
 topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
 topologicpy/Vertex.py,sha256=mcLJaWFCct03dkVmT25wAl6k0k2EaYvB1PWNO9WQHWg,73465
 topologicpy/Wire.py,sha256=o6MlOjubkJ_f5s1tUamizCsoPKvcQ2OudtJv0yCF-2o,186477
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=3Y3zBNw07cgNOgxeneZYGRJ45Nq11i2jt5nPu_bH0bA,23
-topologicpy-0.7.79.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.79.dist-info/METADATA,sha256=817TOOJR836AWEB7_nU4TjReG_OHu-6KbOi3pI7jLV8,10513
-topologicpy-0.7.79.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-topologicpy-0.7.79.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.79.dist-info/RECORD,,
+topologicpy/version.py,sha256=aBUXqj0fVv7Q8TFJaUl3kuETKLosGV1MVLaSEclOujg,23
+topologicpy-0.7.80.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.80.dist-info/METADATA,sha256=g22rsF0lEieZmVNOo3LukQGLjnAykoocyDmw2qBPHwg,10513
+topologicpy-0.7.80.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+topologicpy-0.7.80.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.80.dist-info/RECORD,,