topologicpy 0.4.86__py3-none-any.whl → 0.4.88__py3-none-any.whl

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/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/__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.dist-info → topologicpy-0.4.88.dist-info}/METADATA

@@ -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.dist-info → topologicpy-0.4.88.dist-info}/RECORD

@@ -4,12 +4,12 @@ topologicpy/CellComplex.py,sha256=TS3TbitIM8O5wcFx0scYPz5HaXTeBHLOAbSUHRmw3jg,48
 topologicpy/Cluster.py,sha256=hx0eRQP30I4Ssb3oKTxiNiCjyRiQmyd9Y1C2Ec48-IM,53111
 topologicpy/Color.py,sha256=I_Sm0F-5Hr3y6tFCBaLOplslLnu-wpA8T0VQkH8x54g,17057
 topologicpy/Context.py,sha256=bgwslZSu8Ijuz3fusdhP6XcDnCdwGhtbI0-uhVjB36U,2977
-topologicpy/DGL.py,sha256=swKX3oafQlymvX50Yrpr7bbKkEq0yIzhT58fSWL5fhg,138318
+topologicpy/DGL.py,sha256=qg0k5Ls-eLD6tbK06v_KPgg-GO3M3jY0IusHkco8kCY,138312
 topologicpy/Dictionary.py,sha256=vGhiXPu7e7GsgQyTsX6rZBncnnrDlcYfM9xRb9h-l3U,24799
 topologicpy/Edge.py,sha256=425HQJyERHdaCnr7mi5Nbdk8jSuupKyGXE9td01MN7k,45693
 topologicpy/EnergyModel.py,sha256=kl8N-6NsKwKeSUt6vWm0B-MBacw9vMymE6lbvymJdVM,51758
 topologicpy/Face.py,sha256=uQyrXVtFQYlYZxiywl1S4cCHIAfQMbgeJ40Af34-CmI,93617
-topologicpy/Graph.py,sha256=4hA7i-EVELod4PQw0FDVDMG2TY4QAEouFEOEIlRgHXk,313988
+topologicpy/Graph.py,sha256=YSEftTd3TrXJ5dd94Po0MU_IlM39KQ8h8SksfXE-2iM,314844
 topologicpy/Grid.py,sha256=q6uAs8MGbdteYNbjqRjqlhFMquYAvSngwzxsFl9-338,17371
 topologicpy/Helper.py,sha256=vqBZE-CcHBeTCnzC9OzbRaCTx4XT4SZpPF__Vi19nDQ,16049
 topologicpy/Honeybee.py,sha256=ygiGMS7u-YQJWpK2CmkBuJu1DBABVUmpMdg9HewOhN4,20349
@@ -23,7 +23,7 @@ topologicpy/Topology.py,sha256=6Pga5O3_awhRUMxF8_JiNOPgSWmCmqTVDfnJygnTtZk,28782
 topologicpy/Vector.py,sha256=57ZoYLd3chEQhjN8Sf1Wv_UR3klltLoaT8TQN0kP-f8,22166
 topologicpy/Vertex.py,sha256=A7hCI-WpHaemow4eDiaqVhZ0ekgifXcWFpa-82txwYM,55187
 topologicpy/Wire.py,sha256=l7EfmBuwl6qMsklkIMj24Mvgb2342YRHPSEdooHYFsw,134108
-topologicpy/__init__.py,sha256=NQOyjaVEXZULG7Vkk-pf8xotMdQjxoIRldmWjmKMAkM,1445
+topologicpy/__init__.py,sha256=bcuuRYHtXml9W3cu6-4pDBc4RjFj7tWY3HkM5Ur2ejI,1445
 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.4.86.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.4.86.dist-info/METADATA,sha256=roXXVB-WDsjuEIGENWQZNv6VIEnOyeT2-p_xH7TPpIM,7278
-topologicpy-0.4.86.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-topologicpy-0.4.86.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.4.86.dist-info/RECORD,,
+topologicpy-0.4.88.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.4.88.dist-info/METADATA,sha256=sG41klx83222pQaDnTv93Z_MX89sgVRs4FzoGErED2k,7278
+topologicpy-0.4.88.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+topologicpy-0.4.88.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.4.88.dist-info/RECORD,,