topologicpy 0.7.5__py3-none-any.whl → 0.7.8__py3-none-any.whl

topologicpy/Grid.py

@@ -18,7 +18,7 @@ import topologic_core as topologic
 
 class Grid():
     @staticmethod
-    def EdgesByDistances(face=None, uOrigin=None, vOrigin=None, uRange=[-0.5,-0.25,0, 0.25,0.5], vRange=[-0.5,-0.25,0, 0.25,0.5], clip=False, tolerance=0.0001):
+    def EdgesByDistances(face=None, uOrigin=None, vOrigin=None, uRange=[-0.5,-0.25,0, 0.25,0.5], vRange=[-0.5,-0.25,0, 0.25,0.5], clip=False, mantissa: int = 6, tolerance=0.0001):
         """
         Creates a grid (cluster of edges).
 
@@ -36,6 +36,8 @@ class Grid():
             A list of distances for the *v* grid lines from the vOrigin. The default is [-0.5,-0.25,0, 0.25,0.5].
         clip : bool , optional
             If True the grid will be clipped by the shape of the input face. The default is False.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
@@ -52,6 +54,7 @@ class Grid():
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Vector import Vector
+
         if len(uRange) < 1 or len(vRange) < 1:
             return None
         if not uOrigin:
@@ -76,16 +79,16 @@ class Grid():
             v3 = Vertex.ByCoordinates(0, 0, 0)
             v4 = Vertex.ByCoordinates(0,max(vRange),0)
 
-        uVector = [v2.X()-v1.X(), v2.Y()-v1.Y(),v2.Z()-v1.Z()]
-        vVector = [v4.X()-v3.X(), v4.Y()-v3.Y(),v4.Z()-v3.Z()]
+        uVector = [Vertex.X(v2, mantissa=mantissa)-Vertex.X(v1, mantissa=mantissa), Vertex.Y(v2, mantissa=mantissa)-Vertex.Y(v1, mantissa=mantissa),Vertex.Z(v2, mantissa=mantissa)-Vertex.Z(v1, mantissa=mantissa)]
+        vVector = [Vertex.X(v4, mantissa=mantissa)-Vertex.X(v3, mantissa=mantissa), Vertex.Y(v4, mantissa=mantissa)-Vertex.Y(v3, mantissa=mantissa),Vertex.Z(v4, mantissa=mantissa)-Vertex.Z(v3, mantissa=mantissa)]
         gridEdges = []
         if len(uRange) > 0:
             uRange.sort()
             uuVector = Vector.Normalize(uVector)
             for u in uRange:
                 tempVec = Vector.Multiply(uuVector, u, tolerance)
-                v1 = Vertex.ByCoordinates(uOrigin.X()+tempVec[0], uOrigin.Y()+tempVec[1], uOrigin.Z()+tempVec[2])
-                v2 = Vertex.ByCoordinates(v1.X()+vVector[0], v1.Y()+vVector[1], v1.Z()+vVector[2])
+                v1 = Vertex.ByCoordinates(Vertex.X(uOrigin, mantissa=mantissa)+tempVec[0], Vertex.Y(uOrigin, mantissa=mantissa)+tempVec[1], Vertex.Z(uOrigin, mantissa=mantissa)+tempVec[2])
+                v2 = Vertex.ByCoordinates(Vertex.X(v1, mantissa=mantissa)+vVector[0], Vertex.Y(v1, mantissa=mantissa)+vVector[1], Vertex.Z(v1, mantissa=mantissa)+vVector[2])
                 e = Edge.ByVertices([v1, v2], tolerance=tolerance)
                 if clip and Topology.IsInstance(face, "Face"):
                     e = e.Intersect(face, False)
@@ -105,8 +108,8 @@ class Grid():
             uvVector = Vector.Normalize(vVector)
             for v in vRange:
                 tempVec = Vector.Multiply(uvVector, v, tolerance)
-                v1 = Vertex.ByCoordinates(vOrigin.X()+tempVec[0], vOrigin.Y()+tempVec[1], vOrigin.Z()+tempVec[2])
-                v2 = Vertex.ByCoordinates(v1.X()+uVector[0], v1.Y()+uVector[1], v1.Z()+uVector[2])
+                v1 = Vertex.ByCoordinates(Vertex.X(vOrigin, mantissa=mantissa)+tempVec[0], Vertex.Y(vOrigin, mantissa=mantissa)+tempVec[1], Vertex.Z(vOrigin, mantissa=mantissa)+tempVec[2])
+                v2 = Vertex.ByCoordinates(Vertex.X(v1, mantissa=mantissa)+uVector[0], Vertex.Y(v1, mantissa=mantissa)+uVector[1], Vertex.Z(v1, mantissa=mantissa)+uVector[2])
                 e = Edge.ByVertices([v1, v2], tolerance=tolerance)
                 if clip and Topology.IsInstance(face, "Face"):
                     e = e.Intersect(face, False)
@@ -212,7 +215,13 @@ class Grid():
 
 
     @staticmethod
-    def VerticesByDistances(face=None, origin=None, uRange=[-0.5,-0.25,0, 0.25,0.5], vRange=[-0.5,-0.25,0,0.25,0.5], clip=False, tolerance=0.0001):
+    def VerticesByDistances(face=None,
+                            origin=None,
+                            uRange: list = [-0.5,-0.25,0, 0.25,0.5],
+                            vRange: list = [-0.5,-0.25,0,0.25,0.5],
+                            clip: bool = False,
+                            mantissa: int = 6,
+                            tolerance: float = 0.0001):
         """
         Creates a grid (cluster of vertices).
 
@@ -228,6 +237,8 @@ class Grid():
             A list of distances for the *v* grid lines from the vOrigin. The default is [-0.5,-0.25,0, 0.25,0.5].
         clip : bool , optional
             If True the grid will be clipped by the shape of the input face. The default is False.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
@@ -244,6 +255,7 @@ class Grid():
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Vector import Vector
+
         if len(uRange) < 1 or len(vRange) < 1:
             return None
         if not origin:
@@ -263,8 +275,8 @@ class Grid():
             v3 = Vertex.ByCoordinates(0, 0, 0)
             v4 = Vertex.ByCoordinates(0,max(vRange),0)
 
-        uVector = [v2.X()-v1.X(), v2.Y()-v1.Y(),v2.Z()-v1.Z()]
-        vVector = [v4.X()-v3.X(), v4.Y()-v3.Y(),v4.Z()-v3.Z()]
+        uVector = [Vertex.X(v2, mantissa=mantissa)-Vertex.X(v1, mantissa=mantissa), Vertex.Y(v2, mantissa=mantissa)-Vertex.Y(v1, mantissa=mantissa),Vertex.Z(v2, mantissa=mantissa)-Vertex.Z(v1, mantissa=mantissa)]
+        vVector = [Vertex.X(v4, mantissa=mantissa)-Vertex.X(v3, mantissa=mantissa), Vertex.Y(v4, mantissa=mantissa)-Vertex.Y(v3, mantissa=mantissa),Vertex.Z(v4, mantissa=mantissa)-Vertex.Z(v3, mantissa=mantissa)]
         gridVertices = []
         if len(uRange) > 0:
             uRange.sort()
@@ -274,7 +286,7 @@ class Grid():
                 for v in vRange:
                     uTempVec = Vector.Multiply(uuVector, u, tolerance)
                     vTempVec = Vector.Multiply(uvVector, v, tolerance)
-                    gridVertex = Vertex.ByCoordinates(origin.X()+uTempVec[0], origin.Y()+vTempVec[1], origin.Z()+uTempVec[2])
+                    gridVertex = Vertex.ByCoordinates(Vertex.X(origin, mantissa=mantissa)+uTempVec[0], Vertex.Y(origin, mantissa=mantissa)+vTempVec[1], Vertex.Z(origin, mantissa=mantissa)+uTempVec[2])
                     if clip and Topology.IsInstance(face, "Face"):
                         gridVertex = gridVertex.Intersect(face, False)
                     if Topology.IsInstance(gridVertex, "Vertex"):

topologicpy/Honeybee.py

@@ -195,17 +195,18 @@ class Honeybee:
     @staticmethod
     def ModelByTopology(tpBuilding,
                 tpShadingFacesCluster = None,
-                buildingName = "Generic_Building",
-                defaultProgramIdentifier = "Generic Office Program",
-                defaultConstructionSetIdentifier = "Default Generic Construction Set",
-                coolingSetpoint = 25.0,
-                heatingSetpoint = 20.0,
-                humidifyingSetpoint = 30.0,
-                dehumidifyingSetpoint = 55.0,
-                roomNameKey = "TOPOLOGIC_name",
-                roomTypeKey = "TOPOLOGIC_type",
-                apertureTypeKey = "TOPOLOGIC_type",
-                addSensorGrid = False):
+                buildingName: str = "Generic_Building",
+                defaultProgramIdentifier: str = "Generic Office Program",
+                defaultConstructionSetIdentifier: str = "Default Generic Construction Set",
+                coolingSetpoint: float = 25.0,
+                heatingSetpoint: float = 20.0,
+                humidifyingSetpoint: float = 30.0,
+                dehumidifyingSetpoint: float = 55.0,
+                roomNameKey: str = "TOPOLOGIC_name",
+                roomTypeKey: str = "TOPOLOGIC_type",
+                apertureTypeKey: str = "TOPOLOGIC_type",
+                addSensorGrid: bool = False,
+                mantissa: int = 6):
         """
         Creates an HB Model from the input Topology.
 
@@ -330,11 +331,11 @@ class Honeybee:
             if tpCellFaces:
                 hbRoomFaces = []
                 for tpFaceNumber, tpCellFace in enumerate(tpCellFaces):
-                    tpCellFaceNormal = Face.NormalAtParameters(tpCellFace, 0.5, 0.5)
+                    tpCellFaceNormal = Face.Normal(tpCellFace, mantissa=mantissa)
                     hbRoomFacePoints = []
                     tpFaceVertices = Wire.Vertices(Face.ExternalBoundary(tpCellFace))
                     for tpVertex in tpFaceVertices:
-                        hbRoomFacePoints.append(Point3D(tpVertex.X(), tpVertex.Y(), tpVertex.Z()))
+                        hbRoomFacePoints.append(Point3D(Vertex.X(tpVertex, mantissa=mantissa), Vertex.Y(tpVertex, mantissa=mantissa), Vertex.Z(tpVertex, mantissa=mantissa)))
                     hbRoomFace = HBFace(tpCellName+'_Face_'+str(tpFaceNumber+1), Face3D(hbRoomFacePoints))
                     tpFaceApertures = []
                     _ = tpCellFace.Apertures(tpFaceApertures)
@@ -349,7 +350,7 @@ class Honeybee:
                             tpFaceApertureVertices = []
                             tpFaceApertureVertices = Wire.Vertices(Face.ExternalBoundary(apertureTopology))
                             for tpFaceApertureVertex in tpFaceApertureVertices:
-                                hbFaceAperturePoints.append(Point3D(tpFaceApertureVertex.X(), tpFaceApertureVertex.Y(), tpFaceApertureVertex.Z()))
+                                hbFaceAperturePoints.append(Point3D(Vertex.X(tpFaceApertureVertex, mantissa=mantissa), Vertex.Y(tpFaceApertureVertex, mantissa=mantissa), Vertex.Z(tpFaceApertureVertex, mantissa=mantissa)))
                             if(tpFaceApertureType):
                                 if ("door" in tpFaceApertureType.lower()):
                                     hbFaceAperture = HBDoor(tpCellName+'_Face_'+str(tpFaceNumber+1)+'_Door_'+str(tpFaceApertureNumber), Face3D(hbFaceAperturePoints))
@@ -398,7 +399,7 @@ class Honeybee:
                 faceVertices = Wire.Vertices(Face.ExternalBoundary(tpShadingFace))
                 facePoints = []
                 for aVertex in faceVertices:
-                    facePoints.append(Point3D(aVertex.X(), aVertex.Y(), aVertex.Z()))
+                    facePoints.append(Point3D(Vertex.X(aVertex, mantissa=mantissa), Vertex.Y(aVertex, mantissa=mantissa), Vertex.Z(aVertex, mantissa=mantissa)))
                 hbShadingFace = Face3D(facePoints, None, [])
                 hbShade = HBShade("SHADINGSURFACE_" + str(faceIndex+1), hbShadingFace)
                 hbShades.append(hbShade)

topologicpy/Neo4j.py

@@ -276,7 +276,7 @@ class Neo4j:
         return Graph.ByVerticesEdges(vertices,edges)
     
     @staticmethod
-    def AddGraph(neo4jGraph, graph, labelKey=None, relationshipKey=None, bidirectional=True, deleteAll=True, tolerance=0.0001):
+    def AddGraph(neo4jGraph, graph, labelKey=None, relationshipKey=None, bidirectional=True, deleteAll=True, mantissa: int = 6, tolerance: float = 0.0001):
         """
         Adds the input topologic graph to the input neo4j graph
 
@@ -288,6 +288,8 @@ class Neo4j:
             The input topologic graph.
         categoryKey : str
             The category key in the dictionary under which to look for the category value.
+        mantissa : int, optional
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
@@ -301,6 +303,7 @@ class Neo4j:
         from topologicpy.Topology import Topology
         from topologicpy.Graph import Graph
         from topologicpy.Dictionary import Dictionary
+
         gmt = time.gmtime()
         timestamp =  str(gmt.tm_zone)+"_"+str(gmt.tm_year)+"_"+str(gmt.tm_mon)+"_"+str(gmt.tm_wday)+"_"+str(gmt.tm_hour)+"_"+str(gmt.tm_min)+"_"+str(gmt.tm_sec)
         vertices = Graph.Vertices(graph)
@@ -316,11 +319,11 @@ class Neo4j:
             keys.append("z")
             keys.append("timestamp")
             keys.append("location")
-            values.append(vertices[i].X())
-            values.append(vertices[i].Y())
-            values.append(vertices[i].Z())
+            values.append(Vertex.X(vertices[i], mantissa=mantissa))
+            values.append(Vertex.Y(vertices[i], mantissa=mantissa))
+            values.append(Vertex.Z(vertices[i], mantissa=mantissa))
             values.append(timestamp)
-            values.append(sp.CartesianPoint([vertices[i].X(),vertices[i].Y(),vertices[i].Z()]))
+            values.append(sp.CartesianPoint([Vertex.X(vertices[i], mantissa=mantissa), Vertex.Y(vertices[i], mantissa=mantissa), Vertex.Z(vertices[i], mantissa=mantissa)]))
             zip_iterator = zip(keys, values)
             pydict = dict(zip_iterator)
             if labelKey == 'None':
@@ -427,7 +430,14 @@ class Neo4j:
         return list(neo4jGraph.schema.relationship_types)
     
     @staticmethod
-    def SetGraph(neo4jGraph, graph, labelKey=None, relationshipKey=None, bidirectional=True, deleteAll=True, tolerance=0.0001):
+    def SetGraph(neo4jGraph,
+                 graph,
+                 labelKey: str = None,
+                 relationshipKey: str = None,
+                 bidirectional: bool = True,
+                 deleteAll: bool = True,
+                 mantissa: int = 6,
+                 tolerance: float = 0.0001):
         """
         Sets the input topologic graph to the input neo4jGraph.
 
@@ -445,6 +455,8 @@ class Neo4j:
             If set to True, the edges in the neo4j graph are set to be bi-drectional.
         deleteAll : bool , optional
             If set to True, all previous entities are deleted before adding the new entities.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
@@ -484,11 +496,11 @@ class Neo4j:
             keys.append("z")
             keys.append("timestamp")
             keys.append("location")
-            values.append(vertices[i].X())
-            values.append(vertices[i].Y())
-            values.append(vertices[i].Z())
+            values.append(Vertex.X(vertices[i], mantissa=mantissa))
+            values.append(Vertex.Y(vertices[i], mantissa=mantissa))
+            values.append(Vertex.Z(vertices[i], mantissa=mantissa))
             values.append(timestamp)
-            values.append(sp.CartesianPoint([vertices[i].X(),vertices[i].Y(),vertices[i].Z()]))
+            values.append(sp.CartesianPoint([Vertex.X(vertices[i], mantissa=mantissa), Vertex.Y(vertices[i], mantissa=mantissa), Vertex.Z(vertices[i], mantissa=mantissa)]))
             zip_iterator = zip(keys, values)
             pydict = dict(zip_iterator)
             if (labelKey == 'None') or (not (labelKey)):

topologicpy/Plotly.py

@@ -272,7 +272,23 @@ class Plotly:
         return df
 
     @staticmethod
-    def DataByGraph(graph, vertexColor="black", vertexSize=6, vertexLabelKey=None, vertexGroupKey=None, vertexGroups=[], showVertices=True, showVertexLegend=False, edgeColor="black", edgeWidth=1, edgeLabelKey=None, edgeGroupKey=None, edgeGroups=[], showEdges=True, showEdgeLegend=False, colorScale="viridis"):
+    def DataByGraph(graph,
+                    vertexColor: str = "black",
+                    vertexSize: float = 6,
+                    vertexLabelKey: str = None,
+                    vertexGroupKey: str = None,
+                    vertexGroups: list = [],
+                    showVertices: bool = True,
+                    showVertexLegend: bool = False,
+                    edgeColor: str = "black",
+                    edgeWidth: float = 1,
+                    edgeLabelKey: str = None,
+                    edgeGroupKey: str = None,
+                    edgeGroups: list = [],
+                    showEdges: bool = True,
+                    showEdgeLegend: bool = False,
+                    colorScale: str = "viridis",
+                    mantissa: int = 6):
         """
         Creates plotly vertex and edge data from the input graph.
 
@@ -344,9 +360,9 @@ class Plotly:
             vertices = Graph.Vertices(graph)
             if vertexLabelKey or vertexGroupKey:
                 for v in vertices:
-                    Xn=[round(Vertex.X(v), 4) for v in vertices] # x-coordinates of nodes
-                    Yn=[round(Vertex.Y(v), 4) for v in vertices] # y-coordinates of nodes
-                    Zn=[round(Vertex.Z(v), 4) for v in vertices] # x-coordinates of nodes
+                    Xn=[Vertex.X(v, mantissa=mantissa) for v in vertices] # x-coordinates of nodes
+                    Yn=[Vertex.Y(v, mantissa=mantissa) for v in vertices] # y-coordinates of nodes
+                    Zn=[Vertex.Z(v, mantissa=mantissa) for v in vertices] # x-coordinates of nodes
                     v_label = ""
                     v_group = ""
                     d = Topology.Dictionary(v)
@@ -371,9 +387,9 @@ class Plotly:
                     v_labels.append(v_label)
             else:
                 for v in vertices:
-                    Xn=[round(Vertex.X(v), 4) for v in vertices] # x-coordinates of nodes
-                    Yn=[round(Vertex.Y(v), 4) for v in vertices] # y-coordinates of nodes
-                    Zn=[round(Vertex.Z(v), 4) for v in vertices] # x-coordinates of nodes
+                    Xn=[Vertex.X(v, mantissa=mantissa) for v in vertices] # x-coordinates of nodes
+                    Yn=[Vertex.Y(v, mantissa=mantissa) for v in vertices] # y-coordinates of nodes
+                    Zn=[Vertex.Z(v, mantissa=mantissa) for v in vertices] # x-coordinates of nodes
             if len(list(set(v_groupList))) < 2:
                 v_groupList = vertexColor
             if len(v_labels) < 1:
@@ -409,9 +425,9 @@ class Plotly:
                 for e in edges:
                     sv = Edge.StartVertex(e)
                     ev = Edge.EndVertex(e)
-                    Xe+=[round(Vertex.X(sv), 4), round(Vertex.X(ev), 4), None] # x-coordinates of edge ends
-                    Ye+=[round(Vertex.Y(sv), 4), round(Vertex.Y(ev), 4), None] # y-coordinates of edge ends
-                    Ze+=[round(Vertex.Z(sv), 4), round(Vertex.Z(ev), 4), None] # z-coordinates of edge ends
+                    Xe+=[Vertex.X(sv, mantissa=mantissa), Vertex.X(ev, mantissa=mantissa), None] # x-coordinates of edge ends
+                    Ye+=[Vertex.Y(sv, mantissa=mantissa), Vertex.Y(ev, mantissa=mantissa), None] # y-coordinates of edge ends
+                    Ze+=[Vertex.Z(sv, mantissa=mantissa), Vertex.Z(ev, mantissa=mantissa), None] # z-coordinates of edge ends
                     e_label = ""
                     e_group = ""
                     d = Topology.Dictionary(e)
@@ -435,9 +451,9 @@ class Plotly:
                 for e in edges:
                     sv = Edge.StartVertex(e)
                     ev = Edge.EndVertex(e)
-                    Xe+=[round(Vertex.X(sv), 4), round(Vertex.X(ev), 4), None] # x-coordinates of edge ends
-                    Ye+=[round(Vertex.Y(sv), 4), round(Vertex.Y(ev), 4), None] # y-coordinates of edge ends
-                    Ze+=[round(Vertex.Z(sv), 4), round(Vertex.Z(ev), 4), None] # z-coordinates of edge ends
+                    Xe+=[Vertex.X(sv, mantissa=mantissa), Vertex.X(ev, mantissa=mantissa), None] # x-coordinates of edge ends
+                    Ye+=[Vertex.Y(sv, mantissa=mantissa), Vertex.Y(ev, mantissa=mantissa), None] # y-coordinates of edge ends
+                    Ze+=[Vertex.Z(sv, mantissa=mantissa), Vertex.Z(ev, mantissa=mantissa), None] # z-coordinates of edge ends
 
             if len(list(set(e_groupList))) < 2:
                 e_groupList = edgeColor
@@ -460,14 +476,6 @@ class Plotly:
 
         return data
 
-
-
-
-
-
-
-
-
     @staticmethod
     def DataByTopology(topology,
                        showVertices=True, vertexSize=1.1, vertexColor="black", 
@@ -603,6 +611,9 @@ class Plotly:
             The vertex, edge, and face data list.
 
         """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Face import Face
+        from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Color import Color
@@ -634,9 +645,9 @@ class Plotly:
                     minGroup = 0
                     maxGroup = 1
                 for m, v in enumerate(vertices):
-                    x.append(round(v[0], mantissa))
-                    y.append(round(v[1], mantissa))
-                    z.append(round(v[2], mantissa))
+                    x.append(v[0])
+                    y.append(v[1])
+                    z.append(v[2])
                     label = ""
                     group = ""
                     if len(dictionaries) > 0:
@@ -666,9 +677,9 @@ class Plotly:
                         labels.append(label)
             else:
                 for v in vertices:
-                    x.append(round(v[0], mantissa))
-                    y.append(round(v[1], mantissa))
-                    z.append(round(v[2], mantissa))
+                    x.append(v[0])
+                    y.append(v[1])
+                    z.append(v[2])
             
             if len(list(set(groupList))) < 2:
                 groupList = color
@@ -714,9 +725,9 @@ class Plotly:
                 for m, e in enumerate(edges):
                     sv = vertices[e[0]]
                     ev = vertices[e[1]]
-                    x+=[round(sv[0], mantissa),round(ev[0], mantissa), None] # x-coordinates of edge ends
-                    y+=[round(sv[1], mantissa),round(ev[1], mantissa), None] # y-coordinates of edge ends
-                    z+=[round(sv[2], mantissa),round(ev[2], mantissa), None] # z-coordinates of edge ends
+                    x+=[sv[0], ev[0], None] # x-coordinates of edge ends
+                    y+=[sv[1], ev[1], None] # y-coordinates of edge ends
+                    z+=[sv[2], ev[2], None] # z-coordinates of edge ends
                     label = ""
                     group = ""
                     if len(dictionaries) > 0:
@@ -748,9 +759,9 @@ class Plotly:
                 for e in edges:
                     sv = vertices[e[0]]
                     ev = vertices[e[1]]
-                    x+=[round(sv[0],mantissa),round(ev[0],mantissa), None] # x-coordinates of edge ends
-                    y+=[round(sv[1],mantissa),round(ev[1],mantissa), None] # y-coordinates of edge ends
-                    z+=[round(sv[2],mantissa),round(ev[2],mantissa), None] # z-coordinates of edge ends
+                    x+=[sv[0], ev[0], None] # x-coordinates of edge ends
+                    y+=[sv[1], ev[1], None] # y-coordinates of edge ends
+                    z+=[sv[2], ev[2], None] # z-coordinates of edge ends
                 
             if len(list(set(groupList))) < 2:
                     groupList = color
@@ -779,9 +790,9 @@ class Plotly:
             y = []
             z = []
             for v in vertices:
-                x.append(round(v[0], mantissa))
-                y.append(round(v[1], mantissa))
-                z.append(round(v[2], mantissa))
+                x.append(v[0])
+                y.append(v[1])
+                z.append(v[2])
             i = []
             j = []
             k = []
@@ -870,12 +881,6 @@ class Plotly:
                     lighting = {"facenormalsepsilon": 0},
                 )
             return fData
-        
-        from topologicpy.Face import Face
-        from topologicpy.Cluster import Cluster
-        from topologicpy.Topology import Topology
-        from topologicpy.Dictionary import Dictionary
-        from time import time
 
         if not Topology.IsInstance(topology, "Topology"):
             return None
@@ -901,7 +906,7 @@ class Plotly:
             
             if intensityKey:
                 for i, tp_v in enumerate(tp_vertices):
-                    vertices.append([tp_v.X(), tp_v.Y(), tp_v.Z()])
+                    vertices.append([Vertex.X(tp_v, mantissa=mantissa), Vertex.Y(tp_v, mantissa=mantissa), Vertex.Z(tp_v, mantissa=mantissa)])
                     d = Topology.Dictionary(tp_v)
                     if d:
                         v = Dictionary.ValueAtKey(d, key=intensityKey)
@@ -938,7 +943,7 @@ class Plotly:
                         if vertexLabelKey or vertexGroupKey:
                             d = Topology.Dictionary(tp_v)
                             v_dictionaries.append(d)
-                        vertices.append([tp_v.X(), tp_v.Y(), tp_v.Z()])
+                        vertices.append([Vertex.X(tp_v, mantissa=mantissa), Vertex.Y(tp_v, mantissa=mantissa), Vertex.Z(tp_v, mantissa=mantissa)])
                 data.append(vertexData(vertices, dictionaries=v_dictionaries, color=vertexColor, size=vertexSize, labelKey=vertexLabelKey, groupKey=vertexGroupKey, minGroup=vertexMinGroup, maxGroup=vertexMaxGroup, groups=vertexGroups, legendLabel=vertexLegendLabel, legendGroup=vertexLegendGroup, legendRank=vertexLegendRank, showLegend=showVertexLegend, colorScale=colorScale))
             
         if showEdges and Topology.Type(topology) > Topology.TypeID("Vertex"):
@@ -963,24 +968,6 @@ class Plotly:
             else:
                 tp_faces = Topology.Faces(topology)
             if not(tp_faces == None or tp_faces == []):
-                # rebuild faces to remove any degenerate faces
-                #new_faces = []
-                #for i, f in enumerate(tp_faces):
-                    #eb = Face.ExternalBoundary(f)
-                    #eb = Topology.RemoveCollinearEdges(eb)
-                    #if not eb == None:
-                        #ibList = Face.InternalBoundaries(f)
-                        #ibList = [Wire.RemoveCollinearEdges(ib) for ib in ibList]
-                        #ibList = [ib for ib in ibList if not ib == None]
-                        #new_f = Face.ByWires(eb, ibList, silent=False)
-                        #if Topology.IsInstance(new_f, "Face"):
-                            #if faceLabelKey or faceGroupKey:
-                                #d = Topology.Dictionary(tp_faces[i])
-                                #keys = Dictionary.Keys(d)
-                                #if len(keys) > 0:
-                                    #new_f = Topology.SetDictionary(new_f, d)
-                            #new_faces.append(new_f)
-                
                 f_dictionaries = []
                 all_triangles = []
                 for tp_face in tp_faces: