topologicpy 0.7.37__py3-none-any.whl → 0.7.38__py3-none-any.whl

topologicpy/Graph.py

@@ -1289,7 +1289,7 @@ class Graph:
         return values
     
     @staticmethod
-    def ByAdjacencyMatrixCSVPath(path):
+    def ByAdjacencyMatrixCSVPath(path: str, dictionaries: list = None, silent: bool = False):
         """
         Returns graphs according to the input path. This method assumes the CSV files follow an adjacency matrix schema.
 
@@ -1297,6 +1297,11 @@ class Graph:
         ----------
         path : str
             The file path to the adjacency matrix CSV file.
+        dictionaries : list , optional
+            A list of dictionaries to assign to the vertices of the graph. This list should be in
+            the same order and of the same length as the rows in the adjacency matrix.
+        silent : bool , optional
+            If set to True, no warnings or error messages are displayed. The default is False.
         
         Returns
         -------
@@ -1310,10 +1315,10 @@ class Graph:
         
         # Convert DataFrame to a nested list
         adjacency_matrix = adjacency_matrix_df.values.tolist()
-        return Graph.ByAdjacencyMatrix(adjacencyMatrix=adjacency_matrix)
+        return Graph.ByAdjacencyMatrix(adjacencyMatrix=adjacency_matrix, dictionaries=dictionaries, silent=silent)
 
     @staticmethod
-    def ByAdjacencyMatrix(adjacencyMatrix, xMin=-0.5, yMin=-0.5, zMin=-0.5, xMax=0.5, yMax=0.5, zMax=0.5):
+    def ByAdjacencyMatrix(adjacencyMatrix, dictionaries = None, xMin=-0.5, yMin=-0.5, zMin=-0.5, xMax=0.5, yMax=0.5, zMax=0.5, silent=False):
         """
         Returns graphs according to the input folder path. This method assumes the CSV files follow DGL's schema.
 
@@ -1321,18 +1326,23 @@ class Graph:
         ----------
         adjacencyMatrix : list
             The adjacency matrix expressed as a nested list of 0s and 1s.
-        xMin : float, optional
+        dictionaries : list , optional
+            A list of dictionaries to assign to the vertices of the graph. This list should be in
+            the same order and of the same length as the rows in the adjacency matrix.
+        xMin : float , optional
             The desired minimum value to assign for a vertex's X coordinate. The default is -0.5.
-        yMin : float, optional
+        yMin : float , optional
             The desired minimum value to assign for a vertex's Y coordinate. The default is -0.5.
-        zMin : float, optional
+        zMin : float , optional
             The desired minimum value to assign for a vertex's Z coordinate. The default is -0.5.
-        xMax : float, optional
+        xMax : float , optional
             The desired maximum value to assign for a vertex's X coordinate. The default is 0.5.
-        yMax : float, optional
+        yMax : float , optional
             The desired maximum value to assign for a vertex's Y coordinate. The default is 0.5.
-        zMax : float, optional
+        zMax : float , optional
             The desired maximum value to assign for a vertex's Z coordinate. The default is 0.5.
+        silent : bool , optional
+            If set to True, no warnings or error messages are displayed. The default is False.
         
         Returns
         -------
@@ -1342,16 +1352,25 @@ class Graph:
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
+        from topologicpy.Topology import Topology
         import  random
 
         if not isinstance(adjacencyMatrix, list):
             print("Graph.ByAdjacencyMatrix - Error: The input adjacencyMatrix parameter is not a valid list. Returning None.")
             return None
+        if isinstance(dictionaries, list):
+            if not len(dictionaries) == len(adjacencyMatrix):
+                if not silent:
+                    print("Graph.ByAdjacencyMatrix - Error: The length of the dictionaries list and the adjacency matrix are different. Returning None.")
+                return None
+
         # Add vertices with random coordinates
         vertices = []
         for i in range(len(adjacencyMatrix)):
             x, y, z = random.uniform(xMin,xMax), random.uniform(yMin,yMax), random.uniform(zMin,zMax)
-            vertices.append(Vertex.ByCoordinates(x, y, z))
+            v = Vertex.ByCoordinates(x, y, z)
+            v = Topology.SetDictionary(v, dictionaries[i])
+            vertices.append(v)
 
         # Create the graph using vertices and edges
         if len(vertices) == 0:

topologicpy/Sun.py

@@ -132,7 +132,6 @@ class Sun():
         -------
         datetime
             The datetime of the summer solstice
-
         """
         import os
         import warnings
@@ -173,7 +172,6 @@ class Sun():
         -------
         datetime
             The datetime of the summer solstice
-
         """
         import os
         import warnings
@@ -216,7 +214,6 @@ class Sun():
         -------
         float
             The azimuth angle.
-
         """
         import os
         import warnings
@@ -263,7 +260,6 @@ class Sun():
         -------
         float
             The altitude angle.
-
         """
         import os
         import warnings
@@ -310,8 +306,8 @@ class Sun():
         -------
         datetime
             The Sunrise datetime.
-
         """
+
         import os
         import warnings
         try:
@@ -355,8 +351,8 @@ class Sun():
         -------
         datetime
             The Sunset datetime.
-
         """
+
         import os
         import warnings
         try:
@@ -383,7 +379,7 @@ class Sun():
         return sunset
 
     @staticmethod
-    def Vector(latitude: float, longitude: float, date, north: float = 0, mantissa: int = 6, tolerance: float = 0.0001):
+    def Vector(latitude, longitude, date, north=0):
         """
         Returns the Sun as a vector.
 
@@ -402,12 +398,11 @@ class Sun():
         -------
         list
             The sun vector pointing from the location of the sun towards the origin.
-        
         """
         from topologicpy.Vector import Vector
         azimuth = Sun.Azimuth(latitude=latitude, longitude=longitude, date=date)
         altitude = Sun.Altitude(latitude=latitude, longitude=longitude, date=date)
-        return Vector.ByAzimuthAltitude(azimuth=azimuth, altitude=altitude, north=north, reverse=True, mantissa=mantissa, tolerance=tolerance)
+        return Vector.ByAzimuthAltitude(azimuth=azimuth, altitude=altitude, north=north, reverse=True)
 
     @staticmethod
     def Position(latitude, longitude, date, origin=None, radius=0.5, north=0, mantissa=6):
@@ -422,7 +417,7 @@ class Sun():
             The input longitude. See https://en.wikipedia.org/wiki/Longitude.
         date : datetime
             The input datetime.
-        origin : topologic_core.Vertex , optional
+        origin : topologic.Vertex , optional
             The desired origin of the world. If set to None, the origin will be set to (0,0,0). The default is None.
         radius : float , optional
             The desired radius of the sun orbit. The default is 0.5.
@@ -431,14 +426,13 @@ class Sun():
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         
+        
         Returns
         -------
-        topologic_core.Vertex
+        topologic.Vertex
             The sun represented as a vertex.
-
         """
         from topologicpy.Vertex import Vertex
-
         sun_v = Sun.Vertex(latitude=latitude, longitude=longitude, date=date, origin=origin, radius=radius, north=north)
         return Vertex.Coordinates(sun_v, mantissa=mantissa)
     
@@ -455,7 +449,7 @@ class Sun():
             The input longitude. See https://en.wikipedia.org/wiki/Longitude.
         date : datetime
             The input datetime.
-        origin : topologic_core.Vertex , optional
+        origin : topologic.Vertex , optional
             The desired origin of the world. If set to None, the origin will be set to (0,0,0). The default is None.
         radius : float , optional
             The desired radius of the sun orbit. The default is 0.5.
@@ -464,14 +458,14 @@ class Sun():
 
         Returns
         -------
-        topologic_core.Vertex
+        topologic.Vertex
             The sun represented as a vertex.
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
 
-        if not Topology.IsInstance(origin, "Vertex"):
+        if origin == None:
             origin = Vertex.Origin()
         vector = Vector.Reverse(Sun.Vector(latitude=latitude, longitude=longitude, date=date, north=north))
         sun_v = Topology.TranslateByDirectionDistance(origin, direction=vector, distance=radius)
@@ -490,7 +484,7 @@ class Sun():
             The input longitude. See https://en.wikipedia.org/wiki/Longitude.
         date : datetime
             The input datetime.
-        origin : topologic_core.Vertex , optional
+        origin : topologic.Vertex , optional
             The desired origin of the world. If set to None, the origin will be set to (0,0,0). The default is None.
         radius : float , optional
             The desired radius of the sun orbit. The default is 0.5.
@@ -499,7 +493,7 @@ class Sun():
 
         Returns
         -------
-        topologic_core.Edge
+        topologic.Edge
             The sun represented as an edge pointing from the location of the sun towards the origin.
         """
         from topologicpy.Vertex import Vertex
@@ -507,7 +501,7 @@ class Sun():
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
 
-        if not Topology.IsInstance(origin, "Vertex"):
+        if origin == None:
             origin = Vertex.Origin()
         vector = Vector.Reverse(Sun.Vector(latitude=latitude, longitude=longitude, date=date, north=north))
         sun_v = Topology.TranslateByDirectionDistance(origin, direction=vector, distance=radius)
@@ -533,7 +527,7 @@ class Sun():
             The desired end time to compute the sun location. If set to None, Sun.Sunset is used. The default is None.
         interval : int , optional
             The interval in minutes to compute the sun location. The default is 60.
-        origin : topologic_core.Vertex , optional
+        origin : topologic.Vertex , optional
             The desired origin of the world. If set to None, the origin will be set to (0,0,0). The default is None.
         radius : float , optional
             The desired radius of the sun orbit. The default is 0.5.
@@ -577,7 +571,7 @@ class Sun():
             The desired end time to compute the sun location. If set to None, Sun.Sunset is used. The default is None.
         interval : int , optional
             The interval in minutes to compute the sun location. The default is 60.
-        origin : topologic_core.Vertex , optional
+        origin : topologic.Vertex , optional
             The desired origin of the world. If set to None, the origin will be set to (0,0,0). The default is None.
         radius : float , optional
             The desired radius of the sun orbit. The default is 0.5.
@@ -589,16 +583,14 @@ class Sun():
 
         Returns
         -------
-        topologic_core.Wire
+        topologic.Wire
             The sun path represented as a wire.
-
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Wire import Wire
-        from topologicpy.Dictionary import Dictionary
         from topologicpy.Topology import Topology
-
-        if not Topology.IsInstance(origin, "Vertex"):
+        from topologicpy.Dictionary import Dictionary
+        if origin == None:
             origin = Vertex.Origin()
         if startTime == None:
             startTime = Sun.Sunrise(latitude=latitude, longitude=longitude, date=date)
@@ -641,7 +633,7 @@ class Sun():
             The desired end day to compute the sun location. The default is 365.
         interval : int , optional
             The interval in days to compute the sun location. The default is 5.
-        origin : topologic_core.Vertex , optional
+        origin : topologic.Vertex , optional
             The desired origin of the world. If set to None, the origin will be set to (0,0,0). The default is None.
         radius : float , optional
             The desired radius of the sun orbit. The default is 0.5.
@@ -652,11 +644,9 @@ class Sun():
         -------
         list
             The sun locations represented as a list of vertices.
-
         """
         from datetime import datetime
         from datetime import timedelta
-
         def day_of_year_to_datetime(year, day_of_year):
             # Construct a datetime object for the first day of the year
             base_date = datetime(year, 1, 1)
@@ -694,7 +684,7 @@ class Sun():
             The desired end day of the year to compute the sun location. The default is 365.
         interval : int , optional
             The interval in days to compute the sun location. The default is 5.
-        origin : topologic_core.Vertex , optional
+        origin : topologic.Vertex , optional
             The desired origin of the world. If set to None, the origin will be set to (0,0,0). The default is None.
         radius : float , optional
             The desired radius of the sun orbit. The default is 0.5.
@@ -706,13 +696,13 @@ class Sun():
 
         Returns
         -------
-        topologic_core.Wire
+        topologic.Wire
             The sun path represented as a topologic wire.
-
         """
+
         from topologicpy.Wire import Wire
-        from topologicpy.Dictionary import Dictionary
         from topologicpy.Topology import Topology
+        from topologicpy.Dictionary import Dictionary
         
         vertices = Sun.VerticesByHour(latitude=latitude, longitude=longitude, hour=hour,
                                       startDay=startDay, endDay=endDay, interval=interval,
@@ -749,7 +739,7 @@ class Sun():
             The interval in minutes to compute the sun location for the date path. The default is 30.
         dayInterval : int , optional
             The interval in days for the hourly path to compute the sun location. The default is 15.
-        origin : topologic_core.Vertex , optional
+        origin : topologic.Vertex , optional
             The desired origin of the world. If set to None, the origin will be set to (0,0,0). The default is None.
         radius : float , optional
             The desired radius of the sun orbit. The default is 0.5.
@@ -776,8 +766,8 @@ class Sun():
             - 'center' : This is a cross-shape (wire) at the center of the diagram. This is included only if the compass option is set to True.
             - 'ground' : This is a circle (face) on the ground. It is made of 36 sides. This is included only if
                the compass option is set to False.
-
         """
+
         from datetime import datetime
         from datetime import timedelta
         from topologicpy.Vertex import Vertex
@@ -789,7 +779,7 @@ class Sun():
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
 
-        if not Topology.IsInstance(origin, "Vertex"):
+        if origin == None:
             origin = Vertex.Origin()
 
         cutter = Cell.Prism(origin=origin, width=radius*4, length=radius*4, height=radius*2)

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.37'
+__version__ = '0.7.38'

{topologicpy-0.7.37.dist-info → topologicpy-0.7.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.37
+Version: 0.7.38
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: MIT License

{topologicpy-0.7.37.dist-info → topologicpy-0.7.38.dist-info}/RECORD

@@ -10,7 +10,7 @@ topologicpy/Dictionary.py,sha256=KqJ29YyE23Y3Xc6XmKLSCZXRfBvm-OEOxlMZ4dt-rfM,270
 topologicpy/Edge.py,sha256=vhYHkobSLGSWV-oe2oJFFDobqFToDyb7s71yQ840AAA,65166
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
 topologicpy/Face.py,sha256=SrP7LbOK9wjArYTO2fDVrtxItGXNkCMqmMRNz4-46gA,115473
-topologicpy/Graph.py,sha256=ICwFUYLka6tEPMo43I9QAe24ljItMUZOZYL21xpDPIg,392146
+topologicpy/Graph.py,sha256=PnOjkQ6Zp2ykrY3rS21HhPN7R0YNW-7euz1m-wU0YiU,393433
 topologicpy/Grid.py,sha256=Q-2WNBkvIsJks7pbGkzzkRWVB4fTMYgWipG3lcDXbpE,18496
 topologicpy/Helper.py,sha256=mLwJmhyc-d-JqW82MBf7JwM91zWHVx8RzOmndPWHm-k,17717
 topologicpy/Honeybee.py,sha256=vcBECJlgWVjNNdD9ZmjNik_pA1Y_ZNoOorsQb2CiyGA,21965
@@ -20,15 +20,15 @@ topologicpy/Plotly.py,sha256=qMhBMAYoNMsc-cKdNpqM2p9rqAVXWvBNTzmTKw7iU_0,98963
 topologicpy/Polyskel.py,sha256=4R5_DEdfrmi-4gR6axHNoHTCSAE2TCekOyN8jvb7bHQ,19722
 topologicpy/Shell.py,sha256=bJ8zu5gj-TSOADR-p3YQ9yLPHFTffnv-29uD5b6Zvuc,79912
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
-topologicpy/Sun.py,sha256=_gZfVyH0SDLQmmt775UeeAJ_BtwXO1STQnUMV1qkU0s,37161
+topologicpy/Sun.py,sha256=InnKtX8eKwtAgcScuABH6yp0ljmWh5m_fDR4-n3jJMY,36869
 topologicpy/Topology.py,sha256=Sfw0C5Sd1m3ndLyM_zrCLzegfMd6ytnaK82J_ToK5lQ,366264
 topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
 topologicpy/Vertex.py,sha256=EQdVYHmW85_pZdHZB3N8pEi0GiadCCkF3z_oqohA7B0,71161
 topologicpy/Wire.py,sha256=Ls2ItdNQ_qbC1RUc8bAtGbM5B5A-uShjHdiOFVVwx-8,153711
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=ELkwc8QfDXR6OC99fHNSgYmlBjnbBmo_0j-69MXQmNA,23
-topologicpy-0.7.37.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.37.dist-info/METADATA,sha256=ZOohbLJX-LIHwG-aIFZUdZbgYqxppOt5uroiZvyoobU,10916
-topologicpy-0.7.37.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-topologicpy-0.7.37.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.37.dist-info/RECORD,,
+topologicpy/version.py,sha256=UnhU_ln7vUcinj8Cem2quVLc3nZ_d5hPc8CCYOzG0A8,23
+topologicpy-0.7.38.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.38.dist-info/METADATA,sha256=yquirb6uoTD1IEJsn62E6VtN1bR3zAVPv_KeA5LGK_o,10916
+topologicpy-0.7.38.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+topologicpy-0.7.38.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.38.dist-info/RECORD,,

{topologicpy-0.7.37.dist-info → topologicpy-0.7.38.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any