topologicpy 0.5.2__py3-none-any.whl → 0.5.3__py3-none-any.whl

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/Graph.py

@@ -5146,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):
@@ -6348,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/__init__.py

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

{topologicpy-0.5.2.dist-info → topologicpy-0.5.3.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 topologicpy/Aperture.py,sha256=vENYlFaM6Pu-xCJB1YsW1I1_u5yDj-A70aU3bo3lpFA,2819
 topologicpy/Cell.py,sha256=m3hra2X7VoWyqa4iXy_MBzqk_M-ylfbi23mHxc-AnfQ,98985
-topologicpy/CellComplex.py,sha256=s6zOuamZzo4y1Eltz517GvHh3uugJtAFdjU_EQE5NT8,47409
+topologicpy/CellComplex.py,sha256=_ASHRgEUTCvFYvIXA2KC6TOuOMKh2MZe1Go6MPjPvFE,47524
 topologicpy/Cluster.py,sha256=yPeFvHiRVKBxHVnz6xH8I5ZDBG-Pc0hOnrHLQEATPDU,54972
 topologicpy/Color.py,sha256=I_Sm0F-5Hr3y6tFCBaLOplslLnu-wpA8T0VQkH8x54g,17057
 topologicpy/Context.py,sha256=bgwslZSu8Ijuz3fusdhP6XcDnCdwGhtbI0-uhVjB36U,2977
@@ -9,7 +9,7 @@ topologicpy/Dictionary.py,sha256=vGhiXPu7e7GsgQyTsX6rZBncnnrDlcYfM9xRb9h-l3U,247
 topologicpy/Edge.py,sha256=C4VKk8leXTQySsGKCE4RSt3HiUhA12Ny_rGhEr71LWY,50009
 topologicpy/EnergyModel.py,sha256=VPWkMP2uhJORiVqEomb2Dlx5VgKcVUbqnZBZX1IpF_Y,51771
 topologicpy/Face.py,sha256=81sURmH5TjbvSUzzSTGWPwb4jjqle4vplPeEo4Cwuvk,82576
-topologicpy/Graph.py,sha256=kGaEI8ayPFxa1cg-rHG_dwisEBP5Ujzbwp_jhk6h0XM,329184
+topologicpy/Graph.py,sha256=e18vs3uEVn62pt0kHWxA638tqMlxIuyt0In7pRnK9yU,329418
 topologicpy/Grid.py,sha256=q6uAs8MGbdteYNbjqRjqlhFMquYAvSngwzxsFl9-338,17371
 topologicpy/Helper.py,sha256=dsMU4BAt6zKsYG-YiT_OE4kX2rq3dtl3AqMMd35-6DA,18250
 topologicpy/Honeybee.py,sha256=p5OZi8tGPxUNH91_8peChEkYJdg5vpRyeqHVz8S9OS0,20356
@@ -23,7 +23,7 @@ topologicpy/Topology.py,sha256=7zmDexNyS9v4hQLPj7YWbrcYgKBk9DCsqzM1BHhgcJE,30526
 topologicpy/Vector.py,sha256=EZ4vJbZfxcUVtKkmiUJnOM_II2Z4l6_zEWTJyfNEtiY,30362
 topologicpy/Vertex.py,sha256=bzjLi-4XSg2Jg9hO9iH4g1CpF-_CHzjAd3kdDYi78ao,66449
 topologicpy/Wire.py,sha256=RUeD_bDfUpc5iLZtUMuK-e6lXpvSRHBHuEzxJUBrbaY,131490
-topologicpy/__init__.py,sha256=zMF9ijEMKVNNMXX0ZXgQKr8J8NWG5Ljxjrk27bwcKlU,1444
+topologicpy/__init__.py,sha256=FDAppmvWA0gZbsNvjMV5KK1_srJsuhxTgw6jkWBvxNE,1444
 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.5.2.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.5.2.dist-info/METADATA,sha256=Zjqt31LlO5-8ME6sOs7Ml10tNh4aqTkd65VVd3klXo8,7277
-topologicpy-0.5.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.5.2.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.5.2.dist-info/RECORD,,
+topologicpy-0.5.3.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.5.3.dist-info/METADATA,sha256=-OvexvtudRFYXh5FvdyUZi7fsOqOIjRedmLI2O4P2GY,7277
+topologicpy-0.5.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.5.3.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.5.3.dist-info/RECORD,,