topologicpy 0.4.96__py3-none-any.whl → 0.4.97__py3-none-any.whl

topologicpy/Shell.py

@@ -659,18 +659,18 @@ class Shell(Topology):
 
         """
 
-        from topologicpy.Wire import Wire
+        from topologicpy.Vertex import Vertex
 
         if not isinstance(shell, topologic.Shell):
             return None
         if not isinstance(vertex, topologic.Vertex):
             return None
         boundary = Shell.ExternalBoundary(shell, tolerance=tolerance)
-        if Wire.IsInternal(wire=boundary, vertex=vertex, tolerance=tolerance):
+        if Vertex.IsInternal(vertex, boundary, tolerance=tolerance):
             return True
         internal_boundaries = Shell.InternalBoundaries(shell, tolerance=tolerance)
         for ib in internal_boundaries:
-            if Wire.IsInternal(wire=ib, vertex=vertex, tolerance=tolerance):
+            if Vertex.IsInternal(vertex, ib, tolerance=tolerance):
                 return True
         return False
     

topologicpy/Topology.py

@@ -914,7 +914,15 @@ class Topology():
                 return None
         # Edge:
         elif isinstance(topologyA, topologic.Edge):
-            if isinstance(topologyB, topologic.Shell):
+            if isinstance(topologyB, topologic.Wire):
+                vertices = Topology.Vertices(topologyB)
+                edges = Topology.Edges(topologyB)
+                intersections = [topologyA.Intersect(x) for x in vertices]
+                intersections += [topologyA.Intersect(x) for x in edges]
+                intersections = [x for x in intersections if not x == None]
+                if len(intersections) == 0:
+                    return None
+            elif isinstance(topologyB, topologic.Shell):
                 vertices = Topology.Vertices(topologyB)
                 edges = Topology.Edges(topologyB)
                 faces = Topology.Faces(topologyB)

topologicpy/Wire.py

@@ -2906,6 +2906,21 @@ class Wire(Topology):
 
         """
         from topologicpy.Vertex import Vertex
+        def compute_u(u):
+            def count_decimal_places(number):
+                try:
+                    # Convert the number to a string to analyze decimal places
+                    num_str = str(number)
+                    # Split the number into integer and decimal parts
+                    integer_part, decimal_part = num_str.split('.')
+                    # Return the length of the decimal part
+                    return len(decimal_part)
+                except ValueError:
+                    # If there's no decimal part, return 0
+                    return 0
+            dp = count_decimal_places(u)
+            u = -(int(u) - u)
+            return round(u,dp)
 
         if not isinstance(wire, topologic.Wire):
             print("Wire.VertexByDistance - Error: The input wire parameter is not a valid topologic wire. Returning None.")
@@ -2918,9 +2933,9 @@ class Wire(Topology):
             return Wire.StartVertex(wire)
         if abs(distance - wire_length) < tolerance:
             return Wire.EndVertex(wire)
-        if abs(distance) > wire_length:
-            print("Wire.VertexByDistance - Error: The input distance parameter is larger than the wire's length. Returning None.")
-            return None
+        # if abs(distance) > wire_length:
+        #     print("Wire.VertexByDistance - Error: The input distance parameter is larger than the wire's length. Returning None.")
+        #     return None
         if not Wire.IsManifold(wire):
             print("Wire.VertexAtParameter - Error: The input wire parameter is non-manifold. Returning None.")
             return None
@@ -2929,17 +2944,18 @@ class Wire(Topology):
         if not isinstance(origin, topologic.Vertex):
             print("Wire.VertexByDistance - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
             return None
-        if not Wire.IsInternal(wire, origin, tolerance=tolerance):
+        if not Vertex.IsInternal(origin, wire, tolerance=tolerance):
             print("Wire.VertexByDistance - Error: The input origin parameter is not internal to the input wire parameter. Returning None.")
             return None
-        if distance < 0:
-            if Wire.VertexDistance(wire, Wire.StartVertex(wire), origin) < abs(distance):
-                print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
-                return None
-        else:
-            if Wire.VertexDistance(wire, Wire.EndVertex(wire), origin) < distance:
-                print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
-                return None
+        # if distance < 0:
+        #     if Wire.VertexDistance(wire, Wire.StartVertex(wire), origin) < abs(distance):
+        #         print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
+        #         return None
+        # else:
+        #     if Wire.VertexDistance(wire, Wire.EndVertex(wire), origin) < distance:
+        #         print("Wire.VertexDistance:", Wire.VertexDistance(wire, Wire.EndVertex(wire), origin))
+        #         print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
+        #         return None
         
         if Vertex.Distance(Wire.StartVertex(wire), origin) < tolerance:
             u = distance/wire_length
@@ -2948,7 +2964,8 @@ class Wire(Topology):
         else:
             d = Wire.VertexDistance(wire, origin) + distance
             u = d/wire_length
-        return Wire.VertexByParameter(wire, u=u)
+
+        return Wire.VertexByParameter(wire, u=compute_u(u))
     
     @staticmethod
     def VertexByParameter(wire: topologic.Wire, u: float = 0) -> topologic.Vertex:

topologicpy/__init__.py

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

{topologicpy-0.4.96.dist-info → topologicpy-0.4.97.dist-info}/METADATA

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

@@ -17,13 +17,13 @@ topologicpy/Matrix.py,sha256=1aH7QKP6eNUbUXmZbB7e_4dw1ZSVQ8bsOsKJXtQq3_4,8357
 topologicpy/Neo4j.py,sha256=Wd3GRuTt66AkzJscLNIJCBQhd8y1OntX_9u4_33XQKw,19341
 topologicpy/Plotly.py,sha256=W4nuHVy7xUnRGJRcE2iPl0mLU0dp58CTHC1_YldfZ6I,96904
 topologicpy/Polyskel.py,sha256=-M47SAFWrFOheZ9KWUEgYOmCn-V_rfKPKvU8KY4B-1s,16450
-topologicpy/Shell.py,sha256=LJjdTfXcYNJalu2gAwpmFnxs8re7OBAThGn8irvlbqg,76317
+topologicpy/Shell.py,sha256=Oim9SrR9xYe_hSa5JvXWzmbWnoqQMbYTvRBi60MoCPk,76301
 topologicpy/Speckle.py,sha256=zKqiHYuw7498W_9UWvDn2xsdBskhahNjJejxegMpbJA,14773
-topologicpy/Topology.py,sha256=iRQjNVxC87C8Qi6ykGnsZooxg960FcmjVRqSXCgcQx8,299669
+topologicpy/Topology.py,sha256=8h3mlzzJGCw1q8dR10Q2Picn4HnmwE7QQDFTIdlL9Vg,300139
 topologicpy/Vector.py,sha256=OtPPz0N_bKpXsGNOHYZTEXKHPAy9MgTG1NgoKmh8f0s,30347
 topologicpy/Vertex.py,sha256=b3oPfMNFAXHcrcvOdd1LSFdO8BUeXEVVsQuks_uWtVY,66016
-topologicpy/Wire.py,sha256=px0IB2Y6TIF5QKb4LkQ4ZAjWAgu76eDefT6vnyQ0idM,131506
-topologicpy/__init__.py,sha256=MESltIVetyEsa0zFlilCBcXiUpaalL3H4fI_0IXSr1c,1445
+topologicpy/Wire.py,sha256=GxT43Cptvztrrh3g5_6c45CEz319HRZFovJ--8XkUXM,132346
+topologicpy/__init__.py,sha256=FyhIu7MzmQ3SjqEPrCoL9KOYguHtEvYwrEhESiPYauU,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.96.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.4.96.dist-info/METADATA,sha256=whQaEfI0A_W1FHAhYtkMe6wU96JH0GYQHSRqQ7q4sJs,7278
-topologicpy-0.4.96.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.4.96.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.4.96.dist-info/RECORD,,
+topologicpy-0.4.97.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.4.97.dist-info/METADATA,sha256=fNypu2RWHH2tzuF-oxmVLGThQb-6WhumiFNbnBJUHEI,7278
+topologicpy-0.4.97.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.4.97.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.4.97.dist-info/RECORD,,