topologicpy 0.5.1__tar.gz → 0.5.3__tar.gz

{topologicpy-0.5.1/src/topologicpy.egg-info → topologicpy-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.5.1
+Version: 0.5.3
 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.5.1 → topologicpy-0.5.3}/pyproject.toml

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

{topologicpy-0.5.1 → topologicpy-0.5.3}/src/topologicpy/CellComplex.py

@@ -443,20 +443,21 @@ class CellComplex(Topology):
         -------
         dictionary
             A dictionary with the following keys and values:
-            1. "externalVerticalFaces": list of external vertical faces
-            2. "internalVerticalFaces": list of internal vertical faces
-            3. "topHorizontalFaces": list of top horizontal faces
-            4. "bottomHorizontalFaces": list of bottom horizontal faces
-            5. "internalHorizontalFaces": list of internal horizontal faces
-            6. "externalInclinedFaces": list of external inclined faces
-            7. "internalInclinedFaces": list of internal inclined faces
-            8. "externalVerticalApertures": list of external vertical apertures
-            9. "internalVerticalApertures": list of internal vertical apertures
-            10. "topHorizontalApertures": list of top horizontal apertures
-            11. "bottomHorizontalApertures": list of bottom horizontal apertures
-            12. "internalHorizontalApertures": list of internal horizontal apertures
-            13. "externalInclinedApertures": list of external inclined apertures
-            14. "internalInclinedApertures": list of internal inclined apertures
+            1. "cells": list of cells
+            2. "externalVerticalFaces": list of external vertical faces
+            3. "internalVerticalFaces": list of internal vertical faces
+            4. "topHorizontalFaces": list of top horizontal faces
+            5. "bottomHorizontalFaces": list of bottom horizontal faces
+            6. "internalHorizontalFaces": list of internal horizontal faces
+            7. "externalInclinedFaces": list of external inclined faces
+            8. "internalInclinedFaces": list of internal inclined faces
+            9. "externalVerticalApertures": list of external vertical apertures
+            10. "internalVerticalApertures": list of internal vertical apertures
+            11. "topHorizontalApertures": list of top horizontal apertures
+            12. "bottomHorizontalApertures": list of bottom horizontal apertures
+            13. "internalHorizontalApertures": list of internal horizontal apertures
+            14. "externalInclinedApertures": list of external inclined apertures
+            15. "internalInclinedApertures": list of internal inclined apertures
 
         """
         from topologicpy.Face import Face
@@ -553,7 +554,9 @@ class CellComplex(Topology):
                     internalInclinedFaces.append(aFace)
                     internalInclinedApertures += getApertures(aFace)
         
+        cells = Topology.Cells(cellComplex)
         d = {
+            "cells" : cells,
             "externalVerticalFaces" : externalVerticalFaces,
             "internalVerticalFaces" : internalVerticalFaces,
             "topHorizontalFaces" : topHorizontalFaces,

{topologicpy-0.5.1 → topologicpy-0.5.3}/src/topologicpy/Graph.py

@@ -1765,18 +1765,19 @@ class Graph:
                                     edges.append(tempe)
                     if viaSharedApertures:
                         for sharedAperture in sharedApertures:
+                            sharedAp = sharedAperture.Topology()
                             if useInternalVertex == True:
-                                vst = Topology.InternalVertex(sharedAperture.Topology(), tolerance)
+                                vst = Topology.InternalVertex(sharedAp, tolerance)
                             else:
-                                vst = sharedAperture.Topology().CenterOfMass()
-                            d1 = sharedAperture.Topology().GetDictionary()
+                                vst = sharedAp.CenterOfMass()
+                            d1 = sharedAp.GetDictionary()
+                            vst = topologic.Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
                             if storeBRep:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(sharedAperture), Topology.Type(sharedAperture), Topology.TypeAsString(sharedAperture)])
                                 d3 = mergeDictionaries2([d1, d2])
                                 _ = vst.SetDictionary(d3)
                             else:
                                 _ = vst.SetDictionary(d1)
-                            vst = topologic.Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vst, tolerance=tolerance)
                             tempd = Dictionary.ByKeysValues(["relationship"],["Via Shared Apertures"])
@@ -2608,11 +2609,12 @@ class Graph:
                                     edges.append(tempe)
                     if viaSharedApertures:
                         for sharedAperture in sharedApertures:
+                            sharedTop = sharedAperture.Topology()
                             if useInternalVertex == True:
-                                vst = Topology.InternalVertex(sharedAperture.Topology(), tolerance)
+                                vst = Topology.InternalVertex(sharedTop, tolerance)
                             else:
-                                vst = sharedAperture.Topology().CenterOfMass()
-                            d1 = sharedAperture.Topology().GetDictionary()
+                                vst = sharedTop.CenterOfMass()
+                            d1 = sharedTop.GetDictionary()
                             vst = topologic.Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
                             if storeBRep:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(Aperture.Topology(sharedAperture)), Topology.Type(Aperture.Topology(sharedAperture)), Topology.TypeAsString(Aperture.Topology(sharedAperture))])
@@ -2684,7 +2686,6 @@ class Graph:
                                 vst = content.CenterOfMass()
                             vst = topologic.Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
                             d1 = content.GetDictionary()
-                            vst = topologic.Vertex.ByCoordinates(vst.X(), vst.Y(), vst.Z())
                             if storeBRep:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -2928,6 +2929,7 @@ class Graph:
         if not isinstance(topology, topologic.Topology):
             print("Graph.ByTopology - Error: The input topology is not a valid topology. Returning None.")
             return None
+        topology = Topology.Copy(topology)
         graph = None
         item = [topology, None, None, None, direct, directApertures, viaSharedTopologies, viaSharedApertures, toExteriorTopologies, toExteriorApertures, toContents, None, useInternalVertex, storeBRep, tolerance]
         vertices = []
@@ -5144,7 +5146,7 @@ class Graph:
         j_data = {}
         j_data['nodes'] = {}
         j_data['edges'] = {}
-        n = len(str(len(vertices)))
+        n = max(len(str(len(vertices))),4)
         v_labels = []
         v_dicts = []
         for i, v in enumerate(vertices):
@@ -6346,7 +6348,7 @@ class Graph:
     @staticmethod
     def ShortestPath(graph, vertexA, vertexB, vertexKey="", edgeKey="Length", tolerance=0.0001):
         """
-        Returns the shortest path that connects the input vertices.
+        Returns the shortest path that connects the input vertices. The shortest path will take into consideration both the vertexKey and the edgeKey if both are specified and will minimize the total "cost" of the path. Otherwise, it will take into consideration only whatever key is specified.
 
         Parameters
         ----------

{topologicpy-0.5.1 → topologicpy-0.5.3}/src/topologicpy/Helper.py

@@ -303,6 +303,40 @@ class Helper:
             normalized_list = [round((x - min_val) / (max_val - min_val), mantissa) for x in l]
         return normalized_list
 
+    @staticmethod
+    def Position(item, listA):
+        """
+        Returns the position of the item in the list or the position it would have been inserts.
+        item is assumed to be numeric. listA is assumed to contain only numeric values and sorted from lowest to highest value.
+
+        Parameters
+        ----------
+        item : int or float
+            The input number to be positioned.
+        listA : list
+            The input sorted list.
+
+        Returns
+        -------
+        int
+            The position of the item within the list.
+
+        """
+        left = 0
+        right = len(listA) - 1
+
+        while left <= right:
+            mid = (left + right) // 2
+            if listA[mid] == item:
+                return mid
+            elif listA[mid] < item:
+                left = mid + 1
+            else:
+                right = mid - 1
+
+        # If the target is not found, return the position where it would be inserted
+        return left
+    
     @staticmethod
     def Repeat(listA):
         """

{topologicpy-0.5.1 → topologicpy-0.5.3}/src/topologicpy/__init__.py

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

{topologicpy-0.5.1 → topologicpy-0.5.3/src/topologicpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.5.1
+Version: 0.5.3
 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