topologicpy 0.4.56__tar.gz → 0.4.57__tar.gz

{topologicpy-0.4.56/src/topologicpy.egg-info → topologicpy-0.4.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.56
+Version: 0.4.57
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 Project-URL: Homepage, https://github.com/wassimj/TopologicPy

{topologicpy-0.4.56 → topologicpy-0.4.57}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.4.56"
+version = "0.4.57"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy/Cell.py

@@ -1537,7 +1537,7 @@ class Cell(Topology):
         from topologicpy.Cell import Cell
         from topologicpy.Topology import Topology
         
-        shell = Shell.Roof(face=face, degree=degree, espilon=epsilon, tolerance=tolerance)
+        shell = Shell.Roof(face=face, degree=degree, epsilon=epsilon, tolerance=tolerance)
         faces = Topology.Faces(shell) + [face]
         cell = Cell.ByFaces(faces, tolerance=tolerance)
         if not cell:

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy/Face.py

@@ -1051,7 +1051,7 @@ class Face(topologic.Face):
             tempVertices = rotate_vertices(tempVertices, temp_v)
             flatInternalBoundaries.append(Wire.ByVertices(tempVertices))
         flatFace = Face.ByWires(flatExternalBoundary, flatInternalBoundaries, tolerance=tolerance)
-        dictionary = Dictionary.ByKeysValues(["xTran", "yTran", "zTran", "phi", "theta"], [cm.X(), cm.Y(), cm.Z(), phi, theta])
+        dictionary = Dictionary.ByKeysValues(["x", "y", "z", "phi", "theta"], [cm.X(), cm.Y(), cm.Z(), phi, theta])
         flatFace = Topology.SetDictionary(flatFace, dictionary)
         return flatFace
 
@@ -1277,7 +1277,6 @@ class Face(topologic.Face):
         except:
             print("Face.IsInternal - Warning: Could not determine if vertex is inside face. Returning False.")
             clus = Cluster.ByTopologies([vertex, face])
-            Topology.Show(clus, renderer="browser")
             status = False
         return status
     

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy/Graph.py

@@ -4183,6 +4183,12 @@ class Graph:
         for edge in Topology.Edges(temp_path):
             new_edges.append(g_edges[Edge.Index(edge, g_edges)])
         longest_path = Topology.SelfMerge(Cluster.ByTopologies(new_edges), tolerance=tolerance)
+        sv = Topology.Vertices(longest_path)[0]
+        if Vertex.Distance(sv, vertexB) < tolerance: # Wire is reversed. Re-reverse it
+            if isinstance(longest_path, topologic.Edges):
+                longest_path = Edge.Reverse(longest_path)
+            if isinstance(longest_path, topologic.Wire):
+                longest_path = Wire.Reverse(longest_path)
         if not costKey == None:
             lengths.sort()
             d = Dictionary.ByKeysValues([costKey], [cost])
@@ -4874,7 +4880,7 @@ class Graph:
         return graph
 
     @staticmethod
-    def ShortestPath(graph, vertexA, vertexB, vertexKey="", edgeKey="Length"):
+    def ShortestPath(graph, vertexA, vertexB, vertexKey="", edgeKey="Length", tolerance=0.0001):
         """
         Returns the shortest path that connects the input vertices.
 
@@ -4890,13 +4896,19 @@ class Graph:
             The vertex key to minimise. If set the vertices dictionaries will be searched for this key and the associated value will be used to compute the shortest path that minimized the total value. The value must be numeric. The default is None.
         edgeKey : string , optional
             The edge key to minimise. If set the edges dictionaries will be searched for this key and the associated value will be used to compute the shortest path that minimized the total value. The value of the key must be numeric. If set to "length" (case insensitive), the shortest path by length is computed. The default is "length".
-
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+        
         Returns
         -------
         topologic.Wire
             The shortest path between the input vertices.
 
         """
+        from topologicpy.Edge import Edge
+        from topologicpy.Wire import Wire
+        from topologicpy.Topology import Topology
+
         if not isinstance(graph, topologic.Graph):
             print("Graph.ShortestPath - Error: The input graph is not a valid graph. Returning None.")
             return None
@@ -4910,7 +4922,16 @@ class Graph:
             if edgeKey.lower() == "length":
                 edgeKey = "Length"
         try:
-            return graph.ShortestPath(vertexA, vertexB, vertexKey, edgeKey)
+            gsv = Graph.NearestVertex(graph, vertexA, tolerance)
+            gev = Graph.NearestVertex(graph, vertexB, tolerance)
+            shortest_path = graph.ShortestPath(gsv, gev, vertexKey, edgeKey)
+            sv = Topology.Vertices(shortest_path)[0]
+            if Vertex.Distance(sv, gev) < tolerance: # Path is reversed. Correct it.
+                if isinstance(shortest_path, topologic.Edges):
+                    shortest_path = Edge.Reverse(shortest_path)
+                if isinstance(shortest_path, topologic.Wire):
+                    shortest_path = Wire.Reverse(shortest_path)
+                return shortest_path
         except:
             return None
 
@@ -4936,62 +4957,49 @@ class Graph:
             The search time limit in seconds. The default is 10 seconds
         pathLimit: int , optional
             The number of found paths limit. The default is 10 paths.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
 
         Returns
         -------
-        topologic.Wire
+        list
             The list of shortest paths between the input vertices.
 
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Wire import Wire
-        def nearestVertex(g, v, tolerance):
-            vertices = Graph.Vertices(g)
-            for aVertex in vertices:
-                d = Vertex.Distance(v, aVertex)
-                if d < tolerance:
-                    return aVertex
-            return None
         
-        def isUnique(paths, wire):
+        def isUnique(paths, path):
+            if path == None:
+                return False
             if len(paths) < 1:
                 return True
             for aPath in paths:
                 copyPath = topologic.Topology.DeepCopy(aPath)
-                dif = copyPath.Difference(wire, False)
+                dif = copyPath.Difference(path, False)
                 if dif == None:
                     return False
             return True
         
         if not isinstance(graph, topologic.Graph):
-            print("Graph.ShortestPaths - Error: The input graph is not a valid graph. Returning None.")
+            print("Graph.ShortestPaths - Error: The input graph parameter is not a valid graph. Returning None.")
             return None
         if not isinstance(vertexA, topologic.Vertex):
-            print("Graph.ShortestPaths - Error: The input vertexA is not a valid vertex. Returning None.")
+            print("Graph.ShortestPaths - Error: The input vertexA parameter is not a valid vertex. Returning None.")
             return None
         if not isinstance(vertexB, topologic.Vertex):
-            print("Graph.ShortestPaths - Error: The input vertexB is not a valid vertex. Returning None.")
+            print("Graph.ShortestPaths - Error: The input vertexB parameter is not a valid vertex. Returning None.")
             return None
         shortestPaths = []
         end = time.time() + timeLimit
         while time.time() < end and len(shortestPaths) < pathLimit:
-            gsv = nearestVertex(graph, vertexA, tolerance)
-            gev = nearestVertex(graph, vertexB, tolerance)
             if (graph != None):
                 if edgeKey:
                     if edgeKey.lower() == "length":
                         edgeKey = "Length"
-                wire = graph.ShortestPath(gsv,gev,vertexKey,edgeKey) # Find the first shortest path
-                wireVertices = []
-                flag = False
-                try:
-                    wireVertices = Wire.Vertices(wire)
-                    flag = True
-                except:
-                    flag = False
-                if (flag):
-                    if isUnique(shortestPaths, wire):
-                        shortestPaths.append(wire)
+                shortest_path = Graph.ShortestPath(graph, vertexA, vertexB, vertexKey=vertexKey, edgeKey=edgeKey, tolerance=tolerance) # Find the first shortest path
+                if isUnique(shortestPaths, shortest_path):
+                    shortestPaths.append(shortest_path)
                 vertices = Graph.Vertices(graph)
                 random.shuffle(vertices)
                 edges = Graph.Edges(graph)
@@ -5399,11 +5407,6 @@ class Graph:
                             e = Topology.Boolean(e, boundaryFace, operation="intersect", tolerance=tolerance)
                             if isinstance(e, topologic.Edge):
                                 edges = addEdge(e, edges, viewpointsA, viewpointsB, 0.0001)
-                            elif isinstance(e, topologic.Cluster):
-                                tempEdges = Cluster.Edges(e)
-                                if tempEdges:
-                                    for tempEdge in tempEdges:
-                                        edges = addEdge(tempEdge, edges, viewpointsA, viewpointsB, 0.0001)
 
         except:
             for i in range(len(viewpointsA)):

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy/Plotly.py

@@ -840,7 +840,9 @@ class Plotly:
                             f_dictionaries.append(d)
                             if d:
                                 _ = Topology.SetDictionary(tri, d)
-                        all_triangles.append(tri)
+                        c = Topology.Centroid(tri)
+                        if Face.IsInternal(tp_face, c):
+                            all_triangles.append(tri)
                 if len(all_triangles) > 0:
                     f_cluster = Cluster.ByTopologies(all_triangles)
                     geo = Topology.Geometry(f_cluster, mantissa=mantissa)

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy/Shell.py

@@ -456,14 +456,11 @@ class Shell(Topology):
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Edge import Edge
         from topologicpy.Wire import Wire
         from topologicpy.Face import Face
-        from topologicpy.Cell import Cell
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
-        from topologicpy.Helper import Helper
         from random import sample
         import sys
         import subprocess
@@ -527,7 +524,10 @@ class Shell(Topology):
             tempTriangleVertices.append(vertices[simplex[0]])
             tempTriangleVertices.append(vertices[simplex[1]])
             tempTriangleVertices.append(vertices[simplex[2]])
-            faces.append(Face.ByWire(Wire.ByVertices(tempTriangleVertices), tolerance=tolerance))
+            tempFace = Face.ByWire(Wire.ByVertices(tempTriangleVertices), tolerance=tolerance)
+            tempCentroid = Topology.Centroid(tempFace)
+            if Face.IsInternal(flatFace, tempCentroid):
+                faces.append(tempFace)
 
         shell = Shell.ByFaces(faces, tolerance=tolerance)
         #if shell == None:
@@ -1361,7 +1361,7 @@ class Shell(Topology):
         degree : float , optioal
             The desired angle in degrees of the roof. The default is 45.
         epsilon : float , optional
-            The desired espilon (another form of tolerance for distance from plane). The default is 0.01. (This is set to a larger number as it was found to work better)
+            The desired epsilon (another form of tolerance for distance from plane). The default is 0.01. (This is set to a larger number as it was found to work better)
         tolerance : float , optional
             The desired tolerance. The default is 0.001. (This is set to a larger number as it was found to work better)
 
@@ -1452,9 +1452,9 @@ class Shell(Topology):
             shell = Topology.RemoveCoplanarFaces(shell, epsilon=epsilon, tolerance=tolerance)
         except:
             pass
-        xTran = Dictionary.ValueAtKey(d,"xTran")
-        yTran = Dictionary.ValueAtKey(d,"yTran")
-        zTran = Dictionary.ValueAtKey(d,"zTran")
+        xTran = Dictionary.ValueAtKey(d,"x")
+        yTran = Dictionary.ValueAtKey(d,"y")
+        zTran = Dictionary.ValueAtKey(d,"z")
         phi = Dictionary.ValueAtKey(d,"phi")
         theta = Dictionary.ValueAtKey(d,"theta")
         shell = Topology.Rotate(shell, origin=Vertex.Origin(), x=0, y=1, z=0, degree=theta)

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy/Topology.py

@@ -4601,7 +4601,7 @@ class Topology():
         angTolerance : float , optional
             The desired angular tolerance for removing coplanar faces. The default is 0.1.
         epsilon : float , optional
-            The desired espilon (another form of tolerance) for finding if two faces are coplanar. The default is 0.01.
+            The desired epsilon (another form of tolerance) for finding if two faces are coplanar. The default is 0.01.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy/Wire.py

@@ -1771,7 +1771,7 @@ class Wire(topologic.Wire):
         Returns
         -------
         float
-            The length of the input wire.
+            The length of the input wire. Test
 
         """
         if not wire:
@@ -2241,9 +2241,9 @@ class Wire(topologic.Wire):
         roof = face_to_skeleton(flat_face, degree)
         if not roof:
             return None
-        xTran = Dictionary.ValueAtKey(d,"xTran")
-        yTran = Dictionary.ValueAtKey(d,"yTran")
-        zTran = Dictionary.ValueAtKey(d,"zTran")
+        xTran = Dictionary.ValueAtKey(d,"x")
+        yTran = Dictionary.ValueAtKey(d,"y")
+        zTran = Dictionary.ValueAtKey(d,"z")
         phi = Dictionary.ValueAtKey(d,"phi")
         theta = Dictionary.ValueAtKey(d,"theta")
         roof = Topology.Rotate(roof, origin=Vertex.Origin(), x=0, y=1, z=0, degree=theta)

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy/__init__.py

@@ -1,22 +1,22 @@
-import sys
-import os, re
-from sys import platform
-
-__version__ = '0.4.56'
-__version_info__ = tuple([ int(num) for num in __version__.split('.')])
-
-if platform == 'win32':
-    os_name = 'windows'
-elif platform == "darwin":
-    os_name = 'macos'
-else:
-    os_name = 'linux'
-
-sitePackagesFolderName = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", os_name)
-test1 = os.path.dirname(os.path.realpath(__file__))
-topologicFolderName = [filename for filename in os.listdir(sitePackagesFolderName) if filename.startswith("topologic")][0]
-topologicPath = os.path.join(sitePackagesFolderName, topologicFolderName)
-sys.path.append(topologicPath.replace(".libs",""))
-
-import topologic
-
+import sys
+import os, re
+from sys import platform
+
+__version__ = '0.4.57'
+__version_info__ = tuple([ int(num) for num in __version__.split('.')])
+
+if platform == 'win32':
+    os_name = 'windows'
+elif platform == "darwin":
+    os_name = 'macos'
+else:
+    os_name = 'linux'
+
+sitePackagesFolderName = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", os_name)
+test1 = os.path.dirname(os.path.realpath(__file__))
+topologicFolderName = [filename for filename in os.listdir(sitePackagesFolderName) if filename.startswith("topologic")][0]
+topologicPath = os.path.join(sitePackagesFolderName, topologicFolderName)
+sys.path.append(topologicPath.replace(".libs",""))
+
+import topologic
+

{topologicpy-0.4.56/src/topologicpy/bin/linux → topologicpy-0.4.57/src/topologicpy/bin/macos}/topologic/__init__.py

@@ -1,2 +1,2 @@
-# re-export the extension module
-from .topologic import *
+# re-export the extension module
+from .topologic import *

{topologicpy-0.4.56/src/topologicpy/bin/macos → topologicpy-0.4.57/src/topologicpy/bin/windows}/topologic/__init__.py

@@ -1,2 +1,2 @@
-# re-export the extension module
-from .topologic import *
+# re-export the extension module
+from .topologic import *

{topologicpy-0.4.56 → topologicpy-0.4.57/src/topologicpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.56
+Version: 0.4.57
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 Project-URL: Homepage, https://github.com/wassimj/TopologicPy

{topologicpy-0.4.56 → topologicpy-0.4.57}/src/topologicpy.egg-info/SOURCES.txt

@@ -54,13 +54,9 @@ src/topologicpy/bin/linux/topologic.libs/libTKPrim-eb1262b3.so.7.7.0
 src/topologicpy/bin/linux/topologic.libs/libTKShHealing-e67e5cc7.so.7.7.0
 src/topologicpy/bin/linux/topologic.libs/libTKTopAlgo-e4c96c33.so.7.7.0
 src/topologicpy/bin/linux/topologic.libs/libTKernel-fb7fe3b7.so.7.7.0
-src/topologicpy/bin/linux/topologic.libs/libgcc_s-b928ac34.so.1
-src/topologicpy/bin/linux/topologic.libs/libstdc++-e9ef912c.so.6.0.32
+src/topologicpy/bin/linux/topologic.libs/libgcc_s-32c1665e.so.1
+src/topologicpy/bin/linux/topologic.libs/libstdc++-672d7b41.so.6.0.30
 src/topologicpy/bin/macos/topologic/__init__.py
-src/topologicpy/bin/macos/topologic/topologic.cpython-310-darwin.so
-src/topologicpy/bin/macos/topologic/topologic.cpython-311-darwin.so
-src/topologicpy/bin/macos/topologic/topologic.cpython-38-darwin.so
-src/topologicpy/bin/macos/topologic/topologic.cpython-39-darwin.so
 src/topologicpy/bin/windows/topologic/TKBO-f6b191de.dll
 src/topologicpy/bin/windows/topologic/TKBRep-e56a600e.dll
 src/topologicpy/bin/windows/topologic/TKBool-7b8d47ae.dll