topologicpy 0.4.86__tar.gz → 0.4.88__tar.gz

{topologicpy-0.4.86/src/topologicpy.egg-info → topologicpy-0.4.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.86
+Version: 0.4.88
 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.86 → topologicpy-0.4.88}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.4.86"
+version = "0.4.88"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]

{topologicpy-0.4.86 → topologicpy-0.4.88}/src/topologicpy/DGL.py

@@ -1733,9 +1733,9 @@ class DGL:
             print("DGL.ConfusionMatrix - ERROR: The two input lists do not have the same length. Returning None")
             return None
         if normalize:
-            cm = numpy.transpose(metrics.confusion_matrix(y_true=actual, y_pred=predicted, normalize="true"))
+            cm = np.transpose(metrics.confusion_matrix(y_true=actual, y_pred=predicted, normalize="true"))
         else:
-            cm = numpy.transpose(metrics.confusion_matrix(y_true=actual, y_pred=predicted))
+            cm = np.transpose(metrics.confusion_matrix(y_true=actual, y_pred=predicted))
         return cm
     
     @staticmethod

{topologicpy-0.4.86 → topologicpy-0.4.88}/src/topologicpy/Graph.py

@@ -4105,10 +4105,18 @@ class Graph:
             node_dict['z'] = z
             node_dict['id'] = i
             for m, key in enumerate(keys):
+                if key == "psets": #We cannot handle IFC psets at this point.
+                    continue
                 if key == "id":
                     key = "TOPOLOGIC_ID"
                 if not key in node_attributes.keys():
                     node_attributes[key] = valueType(values[m])
+                if isinstance(values[m], str):
+                    values[m] = values[m].replace('&','&')
+                    values[m] = values[m].replace('<','&lt;')
+                    values[m] = values[m].replace('>','&gt;')
+                    values[m] = values[m].replace('"','&quot;')
+                    values[m] = values[m].replace('\'','&apos;')
                 node_dict[key] = values[m]
             dict_color = None
             if not defaultVertexColor in Color.CSSNamedColors():
@@ -4144,6 +4152,12 @@ class Graph:
                 vertex_label = Dictionary.ValueAtKey(d, vertexLabelKey)
             if not isinstance(vertex_label, str):
                 vertex_label = "Node "+str(i)
+            if isinstance(vertex_label, str):
+                vertex_label = vertex_label.replace('&','&amp;')
+                vertex_label = vertex_label.replace('<','&lt;')
+                vertex_label = vertex_label.replace('>','&gt;')
+                vertex_label = vertex_label.replace('"','&quot;')
+                vertex_label = vertex_label.replace('\'','&apos;')
             node_dict['label'] = vertex_label
 
             nodes[i] = node_dict

{topologicpy-0.4.86 → topologicpy-0.4.88}/src/topologicpy/__init__.py

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

{topologicpy-0.4.86 → topologicpy-0.4.88/src/topologicpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.86
+Version: 0.4.88
 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