topologicpy 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

topologicpy/Face.py

@@ -1391,7 +1391,7 @@ class Face(Topology):
         return returnResult
     
     @staticmethod
-    def NormalEdge(face: topologic.Face, length: float = 1.0) -> topologic.Edge:
+    def NormalEdge(face: topologic.Face, length: float = 1.0, tolerance: float = 0.0001, silent: bool = False) -> topologic.Edge:
         """
         Returns the normal vector to the input face as an edge with the desired input length. A normal vector of a face is a vector perpendicular to it.
 
@@ -1401,6 +1401,8 @@ class Face(Topology):
             The input face.
         length : float , optional
             The desired length of the normal edge. The default is 1.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
 
         Returns
         -------
@@ -1408,7 +1410,21 @@ class Face(Topology):
             The created normal edge to the input face. This is computed at the approximate center of the face.
 
         """
-        return Face.NormalEdgeAtParameters(face, u=0.5, v=0.5, length=length)
+        from topologicpy.Edge import Edge
+
+        if not isinstance(face, topologic.Face):
+            if not silent:
+                print("Face.NormalEdge - Error: The input face parameter is not a valid face. Retuning None.")
+            return None
+        if length < tolerance:
+            if not silent:
+                print("Face.NormalEdge - Error: The input length parameter is less than the input tolerance. Retuning None.")
+            return None
+        iv = Face.InternalVertex(face)
+        u, v = Face.VertexParameters(face, iv)
+        vec = Face.NormalAtParameters(face, u=u, v=v)
+        ev = Topology.TranslateByDirectionDistance(iv, vec, length)
+        return Edge.ByVertices([iv, ev], tolerance=tolerance, silent=silent)
 
     @staticmethod
     def NormalEdgeAtParameters(face: topologic.Face, u: float = 0.5, v: float = 0.5, length: float = 1.0, tolerance: float = 0.0001) -> topologic.Edge:

topologicpy/Graph.py

@@ -1604,8 +1604,8 @@ class Graph:
                                     keys = (Dictionary.Keys(mDict) or [])+["relationship"]
                                     values = (Dictionary.Values(mDict) or [])+["Direct"]
                                 else:
-                                    keys = []
-                                    values = []
+                                    keys = ["relationship"]
+                                    values = ["Direct"]
                                 mDict = Dictionary.ByKeysValues(keys, values)
                                 if mDict:
                                     e.SetDictionary(mDict)
@@ -2041,6 +2041,13 @@ class Graph:
                                     v2 = topFaces[j].CenterOfMass()
                                 e = Edge.ByStartVertexEndVertex(v1, v2, tolerance=tolerance)
                                 mDict = mergeDictionaries(sharedt)
+                                if not mDict == None:
+                                    keys = (Dictionary.Keys(mDict) or [])+["relationship"]
+                                    values = (Dictionary.Values(mDict) or [])+["Direct"]
+                                else:
+                                    keys = ["relationship"]
+                                    values = ["Direct"]
+                                mDict = Dictionary.ByKeysValues(keys, values)
                                 if mDict:
                                     e.SetDictionary(mDict)
                                 edges.append(e)
@@ -2472,6 +2479,13 @@ class Graph:
                                     v2 = topEdges[j].CenterOfMass()
                                 e = Edge.ByStartVertexEndVertex(v1, v2, tolerance=tolerance)
                                 mDict = mergeDictionaries(sharedt)
+                                if not mDict == None:
+                                    keys = (Dictionary.Keys(mDict) or [])+["relationship"]
+                                    values = (Dictionary.Values(mDict) or [])+["Direct"]
+                                else:
+                                    keys = ["relationship"]
+                                    values = ["Direct"]
+                                mDict = Dictionary.ByKeysValues(keys, values)
                                 if mDict:
                                     e.SetDictionary(mDict)
                                 edges.append(e)
@@ -4392,6 +4406,66 @@ class Graph:
         create_gexf_file(nodes, edges, defaultEdgeType, node_attributes, edge_attributes, path)
         return True
 
+    @staticmethod
+    def ExportToJSON(graph, path, vertexLabelKey="", edgeLabelKey="", indent=4, sortKeys=False, mantissa=6, overwrite=False):
+        """
+        Exports the input graph to a JSON file.
+
+        Parameters
+        ----------
+        graph : topologic.Graph
+            The input graph.
+        path : str
+            The path to the JSON file.
+        vertexLabelKey : str , optional
+            If set to a valid string, the vertex label will be set to the value at this key. Otherwise it will be set to Vertex_XXXX where XXXX is a sequential unique number.
+            Note: If vertex labels are not unique, they will be forced to be unique.
+        edgeLabelKey : str , optional
+            If set to a valid string, the edge label will be set to the value at this key. Otherwise it will be set to Edge_XXXX where XXXX is a sequential unique number.
+            Note: If edge labels are not unique, they will be forced to be unique.
+        indent : int , optional
+            The desired amount of indent spaces to use. The default is 4.
+        sortKeys : bool , optional
+            If set to True, the keys will be sorted. Otherwise, they won't be. The default is False.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
+        overwrite : bool , optional
+            If set to True the ouptut file will overwrite any pre-existing file. Otherwise, it won't. The default is False.
+
+        Returns
+        -------
+        bool
+            The status of exporting the JSON file. If True, the operation was successful. Otherwise, it was unsuccesful.
+
+        """
+        import json
+        from os.path import exists
+        # Make sure the file extension is .json
+        ext = path[len(path)-5:len(path)]
+        if ext.lower() != ".json":
+            path = path+".json"
+        if not overwrite and exists(path):
+            print("Graph.ExportToJSON - Error: a file already exists at the specified path and overwrite is set to False. Returning None.")
+            return None
+        f = None
+        try:
+            if overwrite == True:
+                f = open(path, "w")
+            else:
+                f = open(path, "x") # Try to create a new File
+        except:
+            raise Exception("Graph.ExportToJSON - Error: Could not create a new file at the following location: "+path)
+        if (f):
+            jsondata = Graph.JSONData(graph, vertexLabelKey=vertexLabelKey, edgeLabelKey=edgeLabelKey, mantissa=mantissa)
+            if jsondata != None:
+                json.dump(jsondata, f, indent=indent, sort_keys=sortKeys)
+                f.close()
+                return True
+            else:
+                f.close()
+                return False
+        return False
+    
     @staticmethod
     def Flatten(graph, layout="spring", k=0.8, seed=None, iterations=50, rootVertex=None, tolerance=0.0001):
         """
@@ -5036,6 +5110,122 @@ class Graph:
         _ = graph.IsolatedVertices(vertices)
         return vertices
     
+    @staticmethod
+    def JSONData(graph, vertexLabelKey="", edgeLabelKey="", mantissa=6):
+        """
+        Converts the input graph into JSON data.
+
+        Parameters
+        ----------
+        graph : topologic.Graph
+            The input graph.
+        vertexLabelKey : str , optional
+            If set to a valid string, the vertex label will be set to the value at this key. Otherwise it will be set to Vertex_XXXX where XXXX is a sequential unique number.
+            Note: If vertex labels are not unique, they will be forced to be unique.
+        edgeLabelKey : str , optional
+            If set to a valid string, the edge label will be set to the value at this key. Otherwise it will be set to Edge_XXXX where XXXX is a sequential unique number.
+            Note: If edge labels are not unique, they will be forced to be unique.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
+
+        Returns
+        -------
+        dict
+            The JSON data
+
+        """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
+        from topologicpy.Topology import Topology
+        from topologicpy.Dictionary import Dictionary
+        from topologicpy.Helper import Helper
+
+        vertices = Graph.Vertices(graph)
+        j_data = {}
+        j_data['nodes'] = {}
+        j_data['edges'] = {}
+        n = len(str(len(vertices)))
+        v_labels = []
+        v_dicts = []
+        for i, v in enumerate(vertices):
+            d = Topology.Dictionary(v)
+            d = Dictionary.SetValueAtKey(d, "x", Vertex.X(v, mantissa=mantissa))
+            d = Dictionary.SetValueAtKey(d, "y", Vertex.Y(v, mantissa=mantissa))
+            d = Dictionary.SetValueAtKey(d, "z", Vertex.Z(v, mantissa=mantissa))
+            v_dict = Dictionary.PythonDictionary(d)
+            v_label = Dictionary.ValueAtKey(d, vertexLabelKey)
+            if isinstance(v_label, str):
+                v_label = Dictionary.ValueAtKey(d, vertexLabelKey)
+            else:
+                v_label = "Vertex_"+str(i).zfill(n)
+            v_labels.append(v_label)
+            v_dicts.append(v_dict)
+        v_labels = Helper.MakeUnique(v_labels)
+        for i, v_label in enumerate(v_labels):
+            j_data['nodes'][v_label] = v_dicts[i]
+
+        edges = Graph.Edges(graph)
+        n = len(str(len(edges)))    
+        e_labels = []
+        e_dicts = []
+        for i, e in enumerate(edges):
+            sv = Edge.StartVertex(e)
+            ev = Edge.EndVertex(e)
+            svi = Vertex.Index(sv, vertices)
+            evi = Vertex.Index(ev, vertices)
+            sv_label = v_labels[svi]
+            ev_label = v_labels[evi]
+            d = Topology.Dictionary(e)
+            
+            d = Dictionary.SetValueAtKey(d, "source", sv_label)
+            d = Dictionary.SetValueAtKey(d, "target", ev_label)
+            e_dict = Dictionary.PythonDictionary(d)
+            e_label = Dictionary.ValueAtKey(d, edgeLabelKey)
+            if isinstance(e_label, str):
+                e_label = Dictionary.ValueAtKey(d, edgeLabelKey)
+            else:
+                e_label = "Edge_"+str(i).zfill(n)
+            e_labels.append(e_label)
+            e_dicts.append(e_dict)
+        e_labels = Helper.MakeUnique(e_labels)
+        for i, e_label in enumerate(e_labels):
+            j_data['edges'][e_label] = e_dicts[i]
+
+        return j_data
+    
+    @staticmethod
+    def JSONString(graph, vertexLabelKey="", edgeLabelKey="", indent=4, sortKeys=False, mantissa=6):
+        """
+        Converts the input graph into JSON data.
+
+        Parameters
+        ----------
+        graph : topologic.Graph
+            The input graph.
+        vertexLabelKey : str , optional
+            If set to a valid string, the vertex label will be set to the value at this key. Otherwise it will be set to Vertex_XXXX where XXXX is a sequential unique number.
+            Note: If vertex labels are not unique, they will be forced to be unique.
+        edgeLabelKey : str , optional
+            If set to a valid string, the edge label will be set to the value at this key. Otherwise it will be set to Edge_XXXX where XXXX is a sequential unique number.
+            Note: If edge labels are not unique, they will be forced to be unique.
+        indent : int , optional
+            The desired amount of indent spaces to use. The default is 4.
+        sortKeys : bool , optional
+            If set to True, the keys will be sorted. Otherwise, they won't be. The default is False.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
+
+        Returns
+        -------
+        str
+            The JSON str
+
+        """
+        import json
+        json_data = Graph.JSONData(graph, vertexLabelKey=vertexLabelKey, edgeLabelKey=edgeLabelKey, mantissa=mantissa)
+        json_string = json.dumps(json_data, indent=indent, sort_keys=sortKeys)
+        return json_string
+    
     @staticmethod
     def LocalClusteringCoefficient(graph, vertices=None, mantissa=6):
         """

topologicpy/Helper.py

@@ -232,7 +232,42 @@ class Helper:
                 merged_list.append(listA[i])
 
         return merged_list
+    
+    @staticmethod
+    def MakeUnique(listA):
+        """
+        Forces the strings in the input list to be unique if they have duplicates.
+
+        Parameters
+        ----------
+        listA : list
+            The input list of strings.
+
+        Returns
+        -------
+        list
+            The input list, but with each item ensured to be unique if they have duplicates.
 
+        """
+        # Create a dictionary to store counts of each string
+        counts = {}
+        # Create a list to store modified strings
+        unique_strings = []
+        
+        for string in listA:
+            # If the string already exists in the counts dictionary
+            if string in counts:
+                # Increment the count
+                counts[string] += 1
+                # Append the modified string with underscore and count
+                unique_strings.append(f"{string}_{counts[string]}")
+            else:
+                # If it's the first occurrence of the string, add it to the counts dictionary
+                counts[string] = 0
+                unique_strings.append(string)
+        
+        return unique_strings
+    
     @staticmethod
     def Normalize(listA, mantissa: int = 6):
         """

topologicpy/Vertex.py

@@ -1513,6 +1513,8 @@ class Vertex(Topology):
         if not isinstance(face, topologic.Face):
             return None
         eq = Face.PlaneEquation(face, mantissa= mantissa)
+        if direction == None:
+            direction = Face.Normal(face)
         pt = project_point_onto_plane(Vertex.Coordinates(vertex), [eq["a"], eq["b"], eq["c"], eq["d"]], direction)
         return Vertex.ByCoordinates(pt[0], pt[1], pt[2])
 

topologicpy/__init__.py

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

{topologicpy-0.5.0.dist-info → topologicpy-0.5.1.dist-info}/METADATA

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

@@ -8,10 +8,10 @@ topologicpy/DGL.py,sha256=-FDDTANjQb4fBtLHI433_KPmmGlTEPE7boYybXkoPuI,138321
 topologicpy/Dictionary.py,sha256=vGhiXPu7e7GsgQyTsX6rZBncnnrDlcYfM9xRb9h-l3U,24799
 topologicpy/Edge.py,sha256=C4VKk8leXTQySsGKCE4RSt3HiUhA12Ny_rGhEr71LWY,50009
 topologicpy/EnergyModel.py,sha256=VPWkMP2uhJORiVqEomb2Dlx5VgKcVUbqnZBZX1IpF_Y,51771
-topologicpy/Face.py,sha256=PlrXxQMPpH_ZGSTxZCYQk1JgR5UGi87k-Plz0LmyAec,81747
-topologicpy/Graph.py,sha256=D3JQVPeC1afjsf0yNliUqfJv2UEjYFPi-5HZx0k6Efk,320339
+topologicpy/Face.py,sha256=81sURmH5TjbvSUzzSTGWPwb4jjqle4vplPeEo4Cwuvk,82576
+topologicpy/Graph.py,sha256=IVJnb3JxKs_RwXwjqv2MTFhz7HVw04oqAK52JQYZizY,329199
 topologicpy/Grid.py,sha256=q6uAs8MGbdteYNbjqRjqlhFMquYAvSngwzxsFl9-338,17371
-topologicpy/Helper.py,sha256=MEndR1LzSxLnjyjoQBA1ByQyshGXM1BjqhmcZhOXilA,16064
+topologicpy/Helper.py,sha256=VkOCa3-z31uQj1ZTuufOtg4Ly5WZYHJ6bCmJndDpEGc,17242
 topologicpy/Honeybee.py,sha256=p5OZi8tGPxUNH91_8peChEkYJdg5vpRyeqHVz8S9OS0,20356
 topologicpy/Matrix.py,sha256=1aH7QKP6eNUbUXmZbB7e_4dw1ZSVQ8bsOsKJXtQq3_4,8357
 topologicpy/Neo4j.py,sha256=4B_lYgZIDztqINkHL_J6gsfkZQ043wEsZpD_9uPYOMU,19356
@@ -21,9 +21,9 @@ topologicpy/Shell.py,sha256=ebXCT8pDq3lbWWHZ2yWASAU4mpINoYNT4C3gW1NuAeo,76292
 topologicpy/Speckle.py,sha256=zKqiHYuw7498W_9UWvDn2xsdBskhahNjJejxegMpbJA,14773
 topologicpy/Topology.py,sha256=7zmDexNyS9v4hQLPj7YWbrcYgKBk9DCsqzM1BHhgcJE,305269
 topologicpy/Vector.py,sha256=EZ4vJbZfxcUVtKkmiUJnOM_II2Z4l6_zEWTJyfNEtiY,30362
-topologicpy/Vertex.py,sha256=RVcmTK8G4UHxW4OF0w-1nCyCzzp5eI9lEUEnfu9Vwrc,66375
+topologicpy/Vertex.py,sha256=bzjLi-4XSg2Jg9hO9iH4g1CpF-_CHzjAd3kdDYi78ao,66449
 topologicpy/Wire.py,sha256=RUeD_bDfUpc5iLZtUMuK-e6lXpvSRHBHuEzxJUBrbaY,131490
-topologicpy/__init__.py,sha256=yEDkogZubOWdlQtzadmVyxfer3nqiJLkfvaUQahUVu8,1444
+topologicpy/__init__.py,sha256=f8czF2FmoUshgIKYVdvf00lAuKQIcvYQRhuwHVmNJFU,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.0.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.5.0.dist-info/METADATA,sha256=2nFTApTy5IsKdEAASDRuQgwGE_BLZwWJ5dwuLKIVsoM,7277
-topologicpy-0.5.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.5.0.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.5.0.dist-info/RECORD,,
+topologicpy-0.5.1.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.5.1.dist-info/METADATA,sha256=khzpXTId9tt4uLByqWsgneDO-DdCeyb38qlm2Yv0JMk,7277
+topologicpy-0.5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.5.1.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.5.1.dist-info/RECORD,,