topologicpy 0.4.7__py3-none-any.whl → 0.4.9__py3-none-any.whl

topologicpy/DGL.py

@@ -1567,10 +1567,11 @@ class DGL:
 
         """
         from sklearn import metrics
+        import numpy
         if normalize:
-            cm = metrics.confusion_matrix(y_true=actual, y_pred=predicted, normalize="true")
+            cm = numpy.transpose(metrics.confusion_matrix(y_true=actual, y_pred=predicted, normalize="true"))
         else:
-            cm = metrics.confusion_matrix(y_true=actual, y_pred=predicted)
+            cm = numpy.transpose(metrics.confusion_matrix(y_true=actual, y_pred=predicted))
         return cm
     
     @staticmethod
@@ -2048,6 +2049,7 @@ class DGL:
         for item in tqdm(dataset, desc='Predicting', leave=False):
             graph = item[0]
             pred = model(graph, graph.ndata[node_attr_key].float())
+            print(pred)
             values.append(round(pred.item(), 3))
         return values
     

topologicpy/Plotly.py

@@ -1032,7 +1032,10 @@ class Plotly:
             new_row = []
             maxRow = sum(row)
             for j in range(len(row)):
-                new_row.append(round(float(row[j])/float(maxRow), 3))
+                if maxRow == 0:
+                    new_row.append(round(0, 3))
+                else:
+                    new_row.append(round(float(row[j])/float(maxRow), 3))
             new_matrix.append(new_row)
         data = go.Heatmap(z=new_matrix, y=yCategories, x=xCategories, zmin=minValue, zmax=maxValue, showscale=showScale, colorscale=colors)
         

topologicpy/Topology.py

@@ -1771,8 +1771,8 @@ class Topology():
 
         Parameters
         ----------
-        path : str
-            The file path to the OBJ file.
+        file : file object
+            The input OBJ file.
         transposeAxes : bool , optional
             If set to True the Z and Y coordinates are transposed so that Y points "up" 
         tolerance : float , optional
@@ -1827,7 +1827,9 @@ class Topology():
         
         if not file:
             return None
-        lines = file.readlines()
+        lines = []
+        for lineo, line in enumerate(file):
+                lines.append(line)
         if lines:
             if progressBar:
                 if renderer.lower() == "notebook":
@@ -1934,6 +1936,134 @@ class Topology():
             returnTopology = None
         return returnTopology
     
+    @staticmethod
+    def ByXYZFile(file, frameIdKey="id", vertexIdKey="id"):
+        """
+        Imports the topology from an XYZ file path. This is a very experimental method. While variants of the format exist, topologicpy reads XYZ files that conform to the following:
+        An XYZ file can be made out of one or more frames. Each frame will be stored in a sepatate topologic cluster.
+        First line: total number of vertices in the frame. This must be an integer. No other words or characters are allowed on this line.
+        Second line: frame label. This is free text and will be stored in the dictionary of each frame (topologic.Cluster)
+        All other lines: vertex_label, x, y, and z coordinates, separated by spaces, tabs, or commas. The vertex label must be one word with no spaces. It is stored in the dictionary of each vertex.
+
+        Example:
+        3
+        Frame 1
+        A 5.67 -3.45 2.61
+        B 3.91 -1.91 4
+        A 3.2 1.2 -12.3
+        4
+        Frame 2
+        B 5.47 -3.45 2.61
+        B 3.91 -1.93 3.1
+        A 3.2 1.2 -22.4
+        A 3.2 1.2 -12.3
+        3
+        Frame 3
+        A 5.67 -3.45 2.61
+        B 3.91 -1.91 4
+        C 3.2 1.2 -12.3
+
+        Parameters
+        ----------
+        file : file object
+            The input XYZ file.
+        frameIdKey : str , optional
+            The desired id key to use to store the ID of each frame in its dictionary. The default is "id".
+        vertexIdKey : str , optional
+            The desired id key to use to store the ID of each point in its dictionary. The default is "id".
+
+        Returns
+        -------
+        list
+            The list of frames (topologic.Cluster).
+
+        """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Cluster import Cluster
+        from topologicpy.Dictionary import Dictionary
+
+        def parse(lines):
+            frames = []
+            line_index = 0
+            while line_index < len(lines):
+                try:
+                    n_vertices = int(lines[line_index])
+                except:
+                    return frames
+                frame_label = lines[line_index+1][:-1]
+                vertices = []
+                for i in range(n_vertices):
+                    one_line = lines[line_index+2+i]
+                    s = one_line.split()
+                    vertex_label = s[0]
+                    v = Vertex.ByCoordinates(float(s[1]), float(s[2]), float(s[3]))
+                    vertex_dict = Dictionary.ByKeysValues([vertexIdKey], [vertex_label])
+                    v = Topology.SetDictionary(v, vertex_dict)
+                    vertices.append(v)
+                frame = Cluster.ByTopologies(vertices)
+                frame_dict = Dictionary.ByKeysValues([frameIdKey], [frame_label])
+                frame = Topology.SetDictionary(frame, frame_dict)
+                frames.append(frame)
+                line_index = line_index + 2 + n_vertices
+            return frames
+        
+        if not file:
+            return None
+        lines = []
+        for lineo, line in enumerate(file):
+                lines.append(line)
+        if len(lines) > 0:
+            frames = parse(lines)
+        file.close()
+        return frames
+    
+    @staticmethod
+    def ByXYZPath(path, frameIdKey="id", vertexIdKey="id"):
+        """
+        Imports the topology from an XYZ file path. This is a very experimental method. While variants of the format exist, topologicpy reads XYZ files that conform to the following:
+        An XYZ file can be made out of one or more frames. Each frame will be stored in a sepatate topologic cluster.
+        First line: total number of vertices in the frame. This must be an integer. No other words or characters are allowed on this line.
+        Second line: frame label. This is free text and will be stored in the dictionary of each frame (topologic.Cluster)
+        All other lines: vertex_label, x, y, and z coordinates, separated by spaces, tabs, or commas. The vertex label must be one word with no spaces. It is stored in the dictionary of each vertex.
+
+        Example:
+        3
+        Frame 1
+        A 5.67 -3.45 2.61
+        B 3.91 -1.91 4
+        A 3.2 1.2 -12.3
+        4
+        Frame 2
+        B 5.47 -3.45 2.61
+        B 3.91 -1.93 3.1
+        A 3.2 1.2 -22.4
+        A 3.2 1.2 -12.3
+        3
+        Frame 3
+        A 5.67 -3.45 2.61
+        B 3.91 -1.91 4
+        C 3.2 1.2 -12.3
+
+        Parameters
+        ----------
+        path : str
+            The input XYZ file path.
+        frameIdKey : str , optional
+            The desired id key to use to store the ID of each frame in its dictionary. The default is "id".
+        vertexIdKey : str , optional
+            The desired id key to use to store the ID of each point in its dictionary. The default is "id".
+
+        Returns
+        -------
+        list
+            The list of frames (topologic.Cluster).
+
+        """
+        if not path:
+            return None
+        file = open(path)
+        return Topology.ByXYZFile(file, frameIdKey=frameIdKey, vertexIdKey=frameIdKey)
+    
     @staticmethod
     def CenterOfMass(topology):
         """

topologicpy/Vector.py

@@ -32,7 +32,46 @@ class Vector(list):
         cosang = np.dot(vectorA, vectorB)
         sinang = la.norm(np.cross(vectorA, vectorB))
         return round(math.degrees(np.arctan2(sinang, cosang)), mantissa)
+    
+    @staticmethod
+    def AzimuthAltitude(vector, mantissa=4):
+        """
+        Returns a dictionary of azimuth and altitude angles in degrees for the input vector. North is assumed to be the positive Y axis [0,1,0]. Up is assumed to be the positive Z axis [0,0,1].
+        Azimuth is calculated in a counter-clockwise fashion from North where 0 is North, 90 is East, 180 is South, and 270 is West. Altitude is calculated in a counter-clockwise fashing where -90 is straight down (negative Z axis), 0 is in the XY plane, and 90 is straight up (positive Z axis).
+        If the altitude is -90 or 90, the azimuth is assumed to be 0.
+
+        Parameters
+        ----------
+        vectorA : list
+            The input vector.
+        mantissa : int, optional
+            The length of the desired mantissa. The default is 4.
 
+        Returns
+        -------
+        dict
+            The dictionary containing the azimuth and altitude angles in degrees. The keys in the dictionary are 'azimuth' and 'altitude'. 
+
+        """
+        x, y, z = vector
+        if x == 0 and y == 0:
+            if z > 0:
+                return {"azimuth":0, "altitude":90}
+            elif z < 0:
+                return {"azimuth":0, "altitude":-90}
+            else:
+                # undefined
+                return None
+        else:
+            azimuth = math.degrees(math.atan2(y, x))
+            if azimuth > 90:
+                azimuth -= 360
+            azimuth = round(90-azimuth, mantissa)
+            xy_distance = math.sqrt(x**2 + y**2)
+            altitude = math.degrees(math.atan2(z, xy_distance))
+            altitude = round(altitude, mantissa)
+            return {"azimuth":azimuth, "altitude":altitude}
+    
     @staticmethod
     def ByAzimuthAltitude(azimuth, altitude, north=0, reverse=False):
         """

topologicpy/__init__.py

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

{topologicpy-0.4.7.dist-info → topologicpy-0.4.9.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ topologicpy/CellComplex.py,sha256=b-JBSWJhIEvtxaT8JYj4DnHmJwt4EiqLFe2SpufYmFg,29
 topologicpy/Cluster.py,sha256=X95HSYD6Vgd1KMlbgH2SYMtzmzl7rRESgDcgVux1ALE,20198
 topologicpy/Color.py,sha256=gTusJtB_PRSS6p7dkF8Eockbf7d3GA6VYXSVxsn0iY4,6585
 topologicpy/Context.py,sha256=cPxfxUScXcJVafSTnCTCNpRzBGSbu90D5i6uu26S5us,1643
-topologicpy/DGL.py,sha256=qcqQ2RpbykhWaV0cS8npny8egaPh2-GcSu-QeoF2xeY,116875
+topologicpy/DGL.py,sha256=dn68mVYP61NsZBX0CEtv5xeK0T_fLgAkrkBUYz3YVLQ,116956
 topologicpy/Dictionary.py,sha256=SMM0wQPySr1AvUX97AQpn1tca5mkkicRN-sUMSR7c_M,17016
 topologicpy/Edge.py,sha256=Q3Y6VsptyRl99pENBiy2uzVQpoqP59JbS1rdxqhgwUE,30629
 topologicpy/EnergyModel.py,sha256=Tah75zLnvvKKEjCbjH-A9ynp6xh8wFBVobSiWPgL9tY,46784
@@ -16,18 +16,18 @@ topologicpy/Helper.py,sha256=51sDsc_bIXa90JKG58yUDl0ocdOmJOtsanS4txMeQiQ,5243
 topologicpy/Honeybee.py,sha256=jeU9PjGjYhVlF8hC8ChjE8Tey53bIQ1uQTS-rac1LYo,18869
 topologicpy/Matrix.py,sha256=GHd_o714eEWbTOhRM5X-fXcgsV5yYJJSj6xFdnkwC14,7625
 topologicpy/Neo4jGraph.py,sha256=_5Mqnwx98EWDA_gfGD93SlivdELSXUhcQ7WjqXLVi_I,10771
-topologicpy/Plotly.py,sha256=erMZDCVzNRD2a6EQPSWbtaslrLvQMfQ1a1fTR01dtdw,64801
+topologicpy/Plotly.py,sha256=dIjhXCqhI6wGeK5g0S8RDcM0nJO3EeCn8gbTElZgLFQ,64910
 topologicpy/Polyskel.py,sha256=jz5k5H6p4QRWe3bbMnyYbP9Iji6EQ1wdk3qQvcnbg08,15156
 topologicpy/Process.py,sha256=YyPYq9HdzIwyEMog7gF_jIBskD_vVWAzTrVS8mcEwOc,53710
 topologicpy/SQL.py,sha256=6pdbdBAkpNi0VbIat996Swna-qQ-Osm31Kq6YCTEOH8,1892
 topologicpy/Shell.py,sha256=yU69Wj6Z-lzgGn8-tbkvWtWOg6SJez3kPWwdDNX-lbY,56757
 topologicpy/Speckle.py,sha256=65IHXjuNhHAusy4kPp70wlPF8QueSPJ-85v6dPc0uo4,11548
-topologicpy/Topology.py,sha256=9w4kZP7K5u26UuT5mqQn0cEqTy3eBBIz8GmcCBGcN0w,232595
+topologicpy/Topology.py,sha256=KkRYZanK3_GH5oa1vQ1iFEnYkvsxZqXOEHoFaOv6cPs,237855
 topologicpy/UnitTest.py,sha256=JBgLkWaJQd4Ee1XSyLVojEbRJKcxj-DbeVSxoeHmiOs,1380
-topologicpy/Vector.py,sha256=7FE_CYn0ja2ABWNHfT7ark4_kixyFeJnlpQOR_1w7Jo,16236
+topologicpy/Vector.py,sha256=TE0Rt7SZ4NQD0YR3ty3crhb7BYbRws_UJ-lj2ihxPXU,17988
 topologicpy/Vertex.py,sha256=sO-CqyiZj_7h9hr-1s5IcRer_uT_FZvg8dozBsVZcEY,26627
 topologicpy/Wire.py,sha256=Xo0F0bXtxJsT1cTVX-pG0-eDlpnOqwSY99pRhpNdKNI,99555
-topologicpy/__init__.py,sha256=Dty3UXMV_C1ZdBArXjEAVQz7ho1YdqnMlzHx7o1w8bA,641
+topologicpy/__init__.py,sha256=IEx4Csm3tHgOLaJn2sDsqPr4iiJHHvMNYwNSPJFrOjQ,641
 topologicpy/bin/linux/topologic/__init__.py,sha256=qdj8gyp_GtYre27ZdFiVdLzLViOgX62woBZLTy9K91c,58
 topologicpy/bin/linux/topologic/topologic.cpython-310-x86_64-linux-gnu.so,sha256=uvar01STZ8qu1c8fRmtYdVnK8evxBv305QScASXY9go,1852112
 topologicpy/bin/linux/topologic/topologic.cpython-311-x86_64-linux-gnu.so,sha256=42yjVWetFu_qn6-eZcDxgd_A8SQN_wHqkdw91txKt9U,1852112
@@ -70,8 +70,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.7.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.4.7.dist-info/METADATA,sha256=D27FzxyAN9gtkVwxbd85pm9i1CHKML62hFp7QTHBLjw,6994
-topologicpy-0.4.7.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-topologicpy-0.4.7.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.4.7.dist-info/RECORD,,
+topologicpy-0.4.9.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.4.9.dist-info/METADATA,sha256=u2bxV0MM92XQAAZuj-Fqww88Ul8O6PFvq36Jw_fr8ac,6994
+topologicpy-0.4.9.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+topologicpy-0.4.9.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.4.9.dist-info/RECORD,,