topologicpy 0.8.21__py3-none-any.whl → 0.8.22__py3-none-any.whl

topologicpy/Dictionary.py

@@ -773,7 +773,7 @@ class Dictionary():
             return None
     
     @staticmethod
-    def ValueAtKey(dictionary, key, silent=False):
+    def ValueAtKey(dictionary, key, defaultValue=None, silent=False):
         """
         Returns the value of the input key in the input dictionary.
 
@@ -783,6 +783,8 @@ class Dictionary():
             The input dictionary.
         key : string
             The input key.
+        defaultValue : any , optional
+            The default value to return if the key or value are not found. The default is None.
         silent : bool , optional
             If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
@@ -804,10 +806,10 @@ class Dictionary():
             return None
         if Topology.IsInstance(dictionary, "Dictionary"):
             dic = Dictionary.PythonDictionary(dictionary)
-            return dic.get(key, None)
+            return dic.get(key, defaultValue)
         elif isinstance(dictionary, dict):
-            return dictionary.get(key, None)
-        return None
+            return dictionary.get(key, defaultValue)
+        return defaultValue
         
         # if isinstance(dictionary, dict):
         #     attr = dictionary[key]

topologicpy/Graph.py

@@ -4379,12 +4379,17 @@ class Graph:
     
     @staticmethod
     def Compare(graphA, graphB,
-                weightAttributes: float = 1.0,
-                weightGeometry: float = 1.0,
-                weightMetrics: float = 1.0,
-                weightStructure: float = 1.0,
-                weightWL: float = 1.0,
-                weightJaccard: float = 1.0,
+                weightAttributes: float = 0.0,
+                weightGeometry: float = 0.0,
+                weightBetwennessCentrality: float = 0.0,
+                weightClosenessCentrality: float = 0.0,
+                weightDegreeCentrality: float = 0.0,
+                weightDiameter: float = 0.0,
+                weightGlobalClusteringCoefficient: float = 0.0,
+                weightPageRank: float = 0.0,
+                weightStructure: float = 0.0,
+                weightWeisfeilerLehman: float = 0.0,
+                weightJaccard: float = 0.0,
                 vertexIDKey: str = "id",
                 edgeWeightKey: str = None,
                 iterations: int = 3,
@@ -4402,18 +4407,28 @@ class Graph:
         graphB : topologic Graph
             The second input graph.
         weightAttributes : float , optional
-            The desired weight for attribute similarity (dictionary key overlap at vertices). Default is 1.0.
+            The desired weight for attribute similarity (dictionary key overlap at vertices). Default is 0.0.
+        weightBetwennessCentrality : float , optional
+            The desired weight for betweenness centrality similarity (graph-level and node-level). Default is 0.0.
+        weightClosenessCentrality : float , optional
+            The desired weight for closeness centrality similarity (graph-level and node-level). Default is 0.0.
+        weightDegreeCentrality : float , optional
+            The desired weight for degree centrality similarity (graph-level and node-level). Default is 0.0.
+        weightDiameter : float , optional
+            The desired weight for diameter similarity (graph-level and node-level). Default is 0.0.
         weightGeometry : float , optional
-            The desired weight for geometric similarity (vertex positions). Default is 1.0.
-        weightMetrics : float , optional
-            The desired weight for metric similarity (graph-level and node-level). Default is 1.0.
-            The compared metrics are: betweenness centrality, closeness centrality, clustering coefficient, degree, diameter, and pagerank.
-        weightStructure : float , optional
-            The desired weight for structural similarity (number of vertices and edges). Default is 1.0.
-        weightWL : float , optional
-            The desired weight for Weisfeiler-Lehman kernel similarity (iterative label propagation). Default is 1.0.
+            The desired weight for geometric similarity (vertex positions). Default is 0.0.
+        weightGlobalClusteringCoefficient : float , optional
+            The desired weight for global clustering coefficient similarity (graph-level and node-level). Default is 0.0.
         weightJaccard: float , optional
-            The desired weight for the Weighted Jaccard similarity. Default is 1.0.
+            The desired weight for the Weighted Jaccard similarity. Default is 0.0.
+        weightPageRank : float , optional
+            The desired weight for PageRank similarity (graph-level and node-level). Default is 0.0.
+        weightStructure : float , optional
+            The desired weight for structural similarity (number of vertices and edges). Default is 0.0.
+        weightWeisfeilerLehman : float , optional
+            The desired weight for Weisfeiler-Lehman kernel similarity (iterative label propagation). Default is 0.0.
+        
         vertexIDKey: str , optional
             The dictionary key under which to find the unique vertex ID. The default is "id".
         edgeWeightKey: str , optional
@@ -4433,12 +4448,16 @@ class Graph:
             A dictionary of similarity scores between 0 (completely dissimilar) and 1 (identical), based on weighted components.
             The keys in the dictionary are:
             "attribute"
+            "betwenness_centrality"
+            "closeness_centrality"
+            "degree_centrality"
             "geometry"
-            "metrics"
+            "global_clustering_coefficient"
+            "jaccard"
+            "pagerank"
             "structure"
-            "wl"
+            "weisfeiler_lehman"
             "overall"
-
         """
         
         import hashlib
@@ -4551,40 +4570,56 @@ class Graph:
 
             return numerator / denominator if denominator > 0 else 0.0
         
-        def metrics_similarity(graphA, graphB, mantissa=6):
-            # Example using global metrics + mean of node metrics
-            def safe_mean(lst):
+        def safe_mean(lst):
                 return sum(lst)/len(lst) if lst else 0
-
-            metrics1 = {
-                "closeness": safe_mean(Graph.ClosenessCentrality(graphA)),
-                "betweenness": safe_mean(Graph.BetweennessCentrality(graphA)),
-                "degree": safe_mean(Graph.DegreeCentrality(graphA)),
-                "pagerank": safe_mean(Graph.PageRank(graphA)),
-                "clustering": Graph.GlobalClusteringCoefficient(graphA),
-                "diameter": Graph.Diameter(graphA)
-            }
-
-            metrics2 = {
-                "closeness": safe_mean(Graph.ClosenessCentrality(graphB)),
-                "betweenness": safe_mean(Graph.BetweennessCentrality(graphB)),
-                "degree": safe_mean(Graph.DegreeCentrality(graphB)),
-                "pagerank": safe_mean(Graph.PageRank(graphB)),
-                "clustering": Graph.GlobalClusteringCoefficient(graphB),
-                "diameter": Graph.Diameter(graphB)
-            }
-
-            # Compute similarity as 1 - normalized absolute difference
-            similarities = []
-            for key in metrics1:
-                v1, v2 = metrics1[key], metrics2[key]
-                if v1 == 0 and v2 == 0:
-                    similarities.append(1)
-                else:
-                    diff = abs(v1 - v2) / max(abs(v1), abs(v2), 1e-6)
-                    similarities.append(1 - diff)
-
-            return round(sum(similarities) / len(similarities), mantissa)
+        
+        def betweenness_centrality_similarity(graphA, graphB, mantissa=6):
+            v1 = safe_mean(Graph.BetweennessCentrality(graphA))
+            v2 = safe_mean(Graph.BetweennessCentrality(graphB))
+            if v1 == 0 and v2 == 0:
+                return 1
+            diff = abs(v1 - v2) / max(abs(v1), abs(v2), 1e-6)
+            return round((1 - diff), mantissa)
+        
+        def closeness_centrality_similarity(graphA, graphB, mantissa=6):
+            v1 = safe_mean(Graph.ClosenessCentrality(graphA))
+            v2 = safe_mean(Graph.ClosenessCentrality(graphB))
+            if v1 == 0 and v2 == 0:
+                return 1
+            diff = abs(v1 - v2) / max(abs(v1), abs(v2), 1e-6)
+            return round((1 - diff), mantissa)
+        
+        def degree_centrality_similarity(graphA, graphB, mantissa=6):
+            v1 = safe_mean(Graph.DegreeCentrality(graphA))
+            v2 = safe_mean(Graph.DegreeCentrality(graphB))
+            if v1 == 0 and v2 == 0:
+                return 1
+            diff = abs(v1 - v2) / max(abs(v1), abs(v2), 1e-6)
+            return round((1 - diff), mantissa)
+        
+        def diameter_similarity(graphA, graphB, mantissa=6):
+            v1 = Graph.Diameter(graphA)
+            v2 = Graph.Diameter(graphB)
+            if v1 == 0 and v2 == 0:
+                return 1
+            diff = abs(v1 - v2) / max(abs(v1), abs(v2), 1e-6)
+            return round((1 - diff), mantissa)
+        
+        def global_clustering_coefficient_similarity(graphA, graphB, mantissa=6):
+            v1 = Graph.GlobalClusteringCoefficient(graphA)
+            v2 = Graph.GlobalClusteringCoefficient(graphB)
+            if v1 == 0 and v2 == 0:
+                return 1
+            diff = abs(v1 - v2) / max(abs(v1), abs(v2), 1e-6)
+            return round((1 - diff), mantissa)
+        
+        def pagerank_similarity(graphA, graphB, mantissa=6):
+            v1 = safe_mean(Graph.PageRank(graphA))
+            v2 = safe_mean(Graph.PageRank(graphB))
+            if v1 == 0 and v2 == 0:
+                return 1
+            diff = abs(v1 - v2) / max(abs(v1), abs(v2), 1e-6)
+            return round((1 - diff), mantissa)
         
         def structure_similarity(graphA, graphB, mantissa=6):
             v1 = Graph.Vertices(graphA)
@@ -4640,22 +4675,42 @@ class Graph:
                 print("Graph.Compare - Error: The graphB input parameter is not a valid topologic graph. Returning None.")
             return 
         
-        total_weight = weightAttributes + weightGeometry + weightMetrics + weightStructure + weightWL + weightJaccard
+        total_weight = sum([weightAttributes,
+                            weightGeometry,
+                            weightBetwennessCentrality,
+                            weightClosenessCentrality,
+                            weightDegreeCentrality,
+                            weightDiameter,
+                            weightGlobalClusteringCoefficient,
+                            weightPageRank,
+                            weightStructure,
+                            weightWeisfeilerLehman,
+                            weightJaccard])
 
         attribute_score = attribute_similarity(graphA, graphB, mantissa=mantissa) if weightAttributes else 0
+        betweenness_centrality_score = betweenness_centrality_similarity(graphA, graphB, mantissa=mantissa) if weightBetwennessCentrality else 0
+        closeness_centrality_score = closeness_centrality_similarity(graphA, graphB, mantissa=mantissa) if weightClosenessCentrality else 0
+        degree_centrality_score = degree_centrality_similarity(graphA, graphB, mantissa=mantissa) if weightDegreeCentrality else 0
+        diameter_score = diameter_similarity(graphA, graphB, mantissa=mantissa) if weightDiameter else 0
+        global_clustering_coefficient_score = global_clustering_coefficient_similarity(graphA, graphB, mantissa=mantissa) if weightGlobalClusteringCoefficient else 0
         geometry_score = geometry_similarity(graphA, graphB, mantissa=mantissa) if weightGeometry else 0
         jaccard_score = weighted_jaccard_similarity(graphA, graphB, vertexIDKey=vertexIDKey, edgeWeightKey=edgeWeightKey, mantissa=mantissa) if weightJaccard else 0
-        metrics_score = metrics_similarity(graphA, graphB, mantissa=mantissa) if weightMetrics else 0
+        pagerank_score = pagerank_similarity(graphA, graphB, mantissa=mantissa) if weightPageRank else 0
         structure_score = structure_similarity(graphA, graphB, mantissa=mantissa) if weightStructure else 0
-        wl_score = weisfeiler_lehman_similarity(graphA, graphB, iterations, mantissa=mantissa) if weightWL else 0
+        weisfeiler_lehman_score = weisfeiler_lehman_similarity(graphA, graphB, iterations, mantissa=mantissa) if weightWeisfeilerLehman else 0
 
         weighted_sum = (
             attribute_score * weightAttributes +
+            betweenness_centrality_score * weightBetwennessCentrality +
+            closeness_centrality_score * weightClosenessCentrality +
+            degree_centrality_score * weightDegreeCentrality +
+            diameter_score * weightDiameter +
             geometry_score * weightGeometry +
+            global_clustering_coefficient_score * weightGlobalClusteringCoefficient +
             jaccard_score * weightJaccard +
-            metrics_score * weightMetrics +
+            pagerank_score * weightPageRank +
             structure_score * weightStructure +
-            wl_score * weightWL
+            weisfeiler_lehman_score * weightWeisfeilerLehman
         )
 
         if total_weight <= 0:
@@ -4665,11 +4720,15 @@ class Graph:
         
         return  {
                  "attribute": round(attribute_score, mantissa),
+                 "betwenness_centrality": round(betweenness_centrality_score, mantissa),
+                 "closeness_centrality": round(closeness_centrality_score, mantissa),
+                 "degree_centrality": round(degree_centrality_score, mantissa),
                  "geometry": round(geometry_score, mantissa),
+                 "global_clustering_coefficient": round(global_clustering_coefficient_score, mantissa),
                  "jaccard": round(jaccard_score, mantissa),
-                 "metrics": round(metrics_score, mantissa),
+                 "pagerank": round(pagerank_score, mantissa),
                  "structure": round(structure_score, mantissa),
-                 "wl": round(wl_score, mantissa),
+                 "weisfeiler_lehman": round(weisfeiler_lehman_score, mantissa),
                  "overall": round(overall_score, mantissa)
                 }
 

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.21'
+__version__ = '0.8.22'

{topologicpy-0.8.21.dist-info → topologicpy-0.8.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topologicpy
-Version: 0.8.21
+Version: 0.8.22
 Summary: An AI-Powered Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: AGPL v3 License

{topologicpy-0.8.21.dist-info → topologicpy-0.8.22.dist-info}/RECORD

@@ -7,11 +7,11 @@ topologicpy/Cluster.py,sha256=o5jdMRpcGfSGGiXQdFg-e9XcnBF5AqTj3xb1nSpwJWE,58606
 topologicpy/Color.py,sha256=q9xsGmxFMz7sQKmygwSVS12GaTRB-OT0-_i6t3-cthE,20307
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=M_znFtyPBJJz-iXLYZs2wwBj24fhevIo739dGha0chM,139041
-topologicpy/Dictionary.py,sha256=7h-Gszgnt2OEOvOSADJ4pa-mTNlhQ9cuIiB5WHEW6aY,33949
+topologicpy/Dictionary.py,sha256=TO5Ar9j_xUSV325MYbUHdNrKfgo9VcehcZCeZWAn6b0,34126
 topologicpy/Edge.py,sha256=yxkCVDYBflJNEYxnjMmlyvbkpg8TNy7y5bSH3yQ4jzs,71418
 topologicpy/EnergyModel.py,sha256=UoQ9Jm-hYsN383CbcLKw-y6BKitRHj0uyh84yQ-8ACg,53856
 topologicpy/Face.py,sha256=SlhB8L7BpDjd4a9YZE4UJ3zoGuF1oq9MSpuesEWro_Q,184847
-topologicpy/Graph.py,sha256=Iq2UI-CdW3usxpgxRi-caxQeUmkFfGhD37c6mPT2Gd8,523908
+topologicpy/Graph.py,sha256=c2VvEvEM3hGgFR6xP-A58HXcgEVnPyA_heFOoNZ4p_Y,527640
 topologicpy/Grid.py,sha256=2s9cSlWldivn1i9EUz4OOokJyANveqmRe_vR93CAndI,18245
 topologicpy/Helper.py,sha256=4H5KPiv_eiEs489UOOyGLe9RaeoZIfmMh3mk_YCHmXg,29100
 topologicpy/Honeybee.py,sha256=uDVtDbloydNoaBFcSNukKL_2PLyD6XKkCp1VHz1jtaU,21751
@@ -28,9 +28,9 @@ topologicpy/Vector.py,sha256=GkGt-aJ591IJ2IPffMAudvITLDPi2qZibZc4UAav6m8,42407
 topologicpy/Vertex.py,sha256=q99IrWwdNlvVfUXz6iP8icmP8NzP2nsiqtgnF9Jnpx8,80913
 topologicpy/Wire.py,sha256=IVPzBKsckuxC-rHvwxmvtVF7PpApz2lhPHomtQMo_kg,228499
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=zZ7tNz8qiJpD43ZZY6gDLsQEo04V3AXFbZKZwwi4Pww,23
-topologicpy-0.8.21.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.21.dist-info/METADATA,sha256=uin9-ogEkyhyjro0BGZPrFB4abynjZPuv7G3lTk6XzA,10535
-topologicpy-0.8.21.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-topologicpy-0.8.21.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.21.dist-info/RECORD,,
+topologicpy/version.py,sha256=SuLneBfTbTDP--cc9ZcmXl_eRJruqxfxMHpHGiHHHZA,23
+topologicpy-0.8.22.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.22.dist-info/METADATA,sha256=9_VzttjULYoYaVn35tAzKn6Q7cf2l4mfnGKYkOE_tFo,10535
+topologicpy-0.8.22.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+topologicpy-0.8.22.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.22.dist-info/RECORD,,

{topologicpy-0.8.21.dist-info → topologicpy-0.8.22.dist-info}/WHEEL

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