topologicpy 0.4.87__py3-none-any.whl → 0.4.89__py3-none-any.whl

topologicpy/Graph.py

@@ -4112,7 +4112,11 @@ class Graph:
                 if not key in node_attributes.keys():
                     node_attributes[key] = valueType(values[m])
                 if isinstance(values[m], str):
-                    values[m] = values[m].replace('&','_and_')
+                    values[m] = values[m].replace('&','&')
+                    values[m] = values[m].replace('<','&lt;')
+                    values[m] = values[m].replace('>','&gt;')
+                    values[m] = values[m].replace('"','&quot;')
+                    values[m] = values[m].replace('\'','&apos;')
                 node_dict[key] = values[m]
             dict_color = None
             if not defaultVertexColor in Color.CSSNamedColors():
@@ -4148,6 +4152,12 @@ class Graph:
                 vertex_label = Dictionary.ValueAtKey(d, vertexLabelKey)
             if not isinstance(vertex_label, str):
                 vertex_label = "Node "+str(i)
+            if isinstance(vertex_label, str):
+                vertex_label = vertex_label.replace('&','&amp;')
+                vertex_label = vertex_label.replace('<','&lt;')
+                vertex_label = vertex_label.replace('>','&gt;')
+                vertex_label = vertex_label.replace('"','&quot;')
+                vertex_label = vertex_label.replace('\'','&apos;')
             node_dict['label'] = vertex_label
 
             nodes[i] = node_dict
@@ -5036,12 +5046,14 @@ 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)
+                longest_path = Wire.OrientEdges(longest_path, Wire.StartVertex(longest_path), tolerance=tolerance)
         if not costKey == None:
             lengths.sort()
             d = Dictionary.ByKeysValues([costKey], [cost])
@@ -5692,7 +5704,7 @@ class Graph:
         return scores
     
     @staticmethod
-    def Path(graph, vertexA, vertexB):
+    def Path(graph, vertexA, vertexB, tolerance=0.0001):
         """
         Returns a path (wire) in the input graph that connects the input vertices.
 
@@ -5704,6 +5716,8 @@ class Graph:
             The first input vertex.
         vertexB : topologic.Vertex
             The second input vertex.
+        tolerance : float, optional
+            The desired tolerance. The default is 0.0001.
 
         Returns
         -------
@@ -5711,6 +5725,8 @@ class Graph:
             The path (wire) in the input graph that connects the input vertices.
 
         """
+        from topologicpy.Wire import Wire
+
         if not isinstance(graph, topologic.Graph):
             print("Graph.Path - Error: The input graph is not a valid graph. Returning None.")
             return None
@@ -5720,7 +5736,11 @@ class Graph:
         if not isinstance(vertexB, topologic.Vertex):
             print("Graph.Path - Error: The input vertexB is not a valid vertex. Returning None.")
             return None
-        return graph.Path(vertexA, vertexB)
+        path = graph.Path(vertexA, vertexB)
+        if isinstance(path, topologic.Wire):
+            path = Wire.OrientEdges(path, Wire.StartVertex(path), tolerance=tolerance)
+        return path
+
     
     @staticmethod
     def PyvisGraph(graph, path, overwrite=True, height=900, backgroundColor="white", fontColor="black", notebook=False,
@@ -6046,6 +6066,7 @@ class Graph:
             if Vertex.Distance(sv, gev) < tolerance: # Path is reversed. Correct it.
                 if isinstance(shortest_path, topologic.Wire):
                     shortest_path = Wire.Reverse(shortest_path)
+            shortest_path = Wire.OrientEdges(shortest_path, Wire.StartVertex(shortest_path), tolerance=tolerance)
             return shortest_path
         except:
             return None

topologicpy/Wire.py

@@ -281,6 +281,8 @@ class Wire(Topology):
         if not isinstance(wire, topologic.Wire):
             print("Wire.ByEdges - Error: The operation failed. Returning None.")
             wire = None
+        if Wire.IsManifold(wire):
+            wire = Wire.OrientEdges(wire, Wire.StartVertex(wire), tolerance=tolerance)
         return wire
 
     @staticmethod
@@ -567,7 +569,10 @@ class Wire(Topology):
         if len(edges) < 1:
             print("Wire.ByVertices - Error: The number of edges is less than 1. Returning None.")
             return None
-        wire = Topology.SelfMerge(Cluster.ByTopologies(edges), tolerance=tolerance)
+        elif len(edges) == 1:
+            wire = topologic.Wire.ByEdges(edges)
+        else:
+            wire = Topology.SelfMerge(Cluster.ByTopologies(edges), tolerance=tolerance)
         return wire
 
     @staticmethod
@@ -1953,6 +1958,65 @@ class Wire(Topology):
         vertices.append(Edge.EndVertex(edge))
         return Wire.ByVertices(vertices)
     
+    @staticmethod
+    def OrientEdges(wire, vertexA, tolerance=0.0001):
+        """
+        Returns a correctly oriented head-to-tail version of the input wire. The input wire must be manifold.
+
+        Parameters
+        ----------
+        wire : topologic.Wire
+            The input wire.
+        vertexA : topologic.Vertex
+            The desired start vertex of the wire.
+        tolerance : float, optional
+            The desired tolerance. The default is 0.0001.
+
+        Returns
+        -------
+        topologic.Wire
+            The oriented wire.
+
+        """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
+
+        if not isinstance(wire, topologic.Wire):
+            print("Wire.OrientEdges - Error: The input wire parameter is not a valid wire. Returning None.")
+            return None
+        if not isinstance(vertexA, topologic.Vertex):
+            print("Wire.OrientEdges - Error: The input vertexA parameter is not a valid vertex. Returning None.")
+            return None
+        if not Wire.IsManifold(wire):
+            print("Wire.OrientEdges - Error: The input wire parameter is not a manifold wire. Returning None.")
+            return None
+        oriented_edges = []
+        remaining_edges = Topology.Edges(wire)
+
+        current_vertex = vertexA
+        while remaining_edges:
+            next_edge = None
+            for edge in remaining_edges:
+                if Vertex.Distance(Edge.StartVertex(edge), current_vertex) < tolerance:
+                    next_edge = edge
+                    break
+                elif Vertex.Distance(Edge.EndVertex(edge), current_vertex) < tolerance:
+                    next_edge = Edge.Reverse(edge)
+                    break
+
+            if next_edge:
+                oriented_edges.append(next_edge)
+                remaining_edges.remove(next_edge)
+                current_vertex = Edge.EndVertex(next_edge)
+            else:
+                # Unable to find a next edge connected to the current vertex
+                break
+        vertices = [Edge.StartVertex(oriented_edges[0])]
+        for i, edge in enumerate(oriented_edges):
+            vertices.append(Edge.EndVertex(edge))
+            
+        return Wire.ByVertices(vertices, close=Wire.IsClosed(wire))
+
     @staticmethod
     def Planarize(wire: topologic.Wire, origin: topologic.Vertex = None, mantissa: int = 6, tolerance: float = 0.0001) -> topologic.Wire:
         """

topologicpy/__init__.py

@@ -18,7 +18,7 @@ import sys
 import os, re
 from sys import platform
 
-__version__ = '0.4.87'
+__version__ = '0.4.89'
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 
 if platform == 'win32':

{topologicpy-0.4.87.dist-info → topologicpy-0.4.89.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.87
+Version: 0.4.89
 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.87.dist-info → topologicpy-0.4.89.dist-info}/RECORD

@@ -9,7 +9,7 @@ topologicpy/Dictionary.py,sha256=vGhiXPu7e7GsgQyTsX6rZBncnnrDlcYfM9xRb9h-l3U,247
 topologicpy/Edge.py,sha256=425HQJyERHdaCnr7mi5Nbdk8jSuupKyGXE9td01MN7k,45693
 topologicpy/EnergyModel.py,sha256=kl8N-6NsKwKeSUt6vWm0B-MBacw9vMymE6lbvymJdVM,51758
 topologicpy/Face.py,sha256=uQyrXVtFQYlYZxiywl1S4cCHIAfQMbgeJ40Af34-CmI,93617
-topologicpy/Graph.py,sha256=-1Zfs-yvawMDIhYqo9bmsnKlqqRGXpDadCdlLbbcO3M,314209
+topologicpy/Graph.py,sha256=rq0ZStL-1xGOUFGeOsFuUOUP8dSlurWtY-uuLx2C_5c,315393
 topologicpy/Grid.py,sha256=q6uAs8MGbdteYNbjqRjqlhFMquYAvSngwzxsFl9-338,17371
 topologicpy/Helper.py,sha256=vqBZE-CcHBeTCnzC9OzbRaCTx4XT4SZpPF__Vi19nDQ,16049
 topologicpy/Honeybee.py,sha256=ygiGMS7u-YQJWpK2CmkBuJu1DBABVUmpMdg9HewOhN4,20349
@@ -22,8 +22,8 @@ topologicpy/Speckle.py,sha256=zKqiHYuw7498W_9UWvDn2xsdBskhahNjJejxegMpbJA,14773
 topologicpy/Topology.py,sha256=6Pga5O3_awhRUMxF8_JiNOPgSWmCmqTVDfnJygnTtZk,287822
 topologicpy/Vector.py,sha256=57ZoYLd3chEQhjN8Sf1Wv_UR3klltLoaT8TQN0kP-f8,22166
 topologicpy/Vertex.py,sha256=A7hCI-WpHaemow4eDiaqVhZ0ekgifXcWFpa-82txwYM,55187
-topologicpy/Wire.py,sha256=l7EfmBuwl6qMsklkIMj24Mvgb2342YRHPSEdooHYFsw,134108
-topologicpy/__init__.py,sha256=6NwR2-LQXfDa6p91s3dhQS9tQi3sjhwxoHf2rgejCmo,1445
+topologicpy/Wire.py,sha256=pM63N7c0YoNRNvMtt05CPY8bzP62BG5rFTerA0eELIc,136664
+topologicpy/__init__.py,sha256=Y_R-8dvvLH7g2os2OWB_Swtrqf1jK5lFBmVvLWw5caA,1445
 topologicpy/bin/linux/topologic/__init__.py,sha256=XlFReDf3FWlYdM9uXtanYPIafgPb6GVTQczS_xJAXD0,60
 topologicpy/bin/linux/topologic/libTKBO-6bdf205d.so.7.7.0,sha256=ANok9DQKcnWcLd9T_LAt-i-X4nsYYy16q9kQlcTre1E,2996488
 topologicpy/bin/linux/topologic/libTKBRep-2960a069.so.7.7.0,sha256=OJ3XesL79du8LeBHrsleGPXub6OpJdOilxha0mwjqQo,1378768
@@ -84,8 +84,8 @@ topologicpy/bin/windows/topologic/topologic.cp310-win_amd64.pyd,sha256=F0sPLuMpD
 topologicpy/bin/windows/topologic/topologic.cp311-win_amd64.pyd,sha256=aBAJQj3OmJ58MOAF1ZIFybL_5fFK7FNR9hrIps6b6pc,1551872
 topologicpy/bin/windows/topologic/topologic.cp38-win_amd64.pyd,sha256=aLgNf54nbJmGc7Tdmkuy-V0m6B9zLxabIbpRwAy7cBA,1551360
 topologicpy/bin/windows/topologic/topologic.cp39-win_amd64.pyd,sha256=_8cp205hiRxkFHtzQQOweA4DhCPk8caH4kTVLWGQeVw,1411584
-topologicpy-0.4.87.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.4.87.dist-info/METADATA,sha256=ccCHulZrPy4cw_e9eXmUmQpEZFJNscXiYvEHstT8NG4,7278
-topologicpy-0.4.87.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-topologicpy-0.4.87.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.4.87.dist-info/RECORD,,
+topologicpy-0.4.89.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.4.89.dist-info/METADATA,sha256=ZZRlJuY_SBnyqOUJAqYHr89-yPq-neQwL-Sx8XTbOBQ,7278
+topologicpy-0.4.89.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+topologicpy-0.4.89.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.4.89.dist-info/RECORD,,