topologicpy 0.4.12__tar.gz → 0.4.13__tar.gz

{topologicpy-0.4.12/src/topologicpy.egg-info → topologicpy-0.4.13}/PKG-INFO

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

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.4.12"
+version = "0.4.13"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]
@@ -17,7 +17,6 @@ classifiers = [
 ]
 dependencies = [
     "numpy",
-    "scipy",
     "tqdm",
     "plotly",
 ]

{topologicpy-0.4.12 → topologicpy-0.4.13}/src/topologicpy/EnergyModel.py

@@ -3,6 +3,7 @@ import topologic
 from topologicpy.Topology import Topology
 from topologicpy.Dictionary import Dictionary
 
+import shutil
 import math
 from collections import OrderedDict
 import os
@@ -664,7 +665,7 @@ class EnergyModel:
         return list(OrderedDict( (x,1) for x in columnNames ).keys()) #Making a unique list and keeping its order
 
     @staticmethod
-    def Run(model, weatherFilePath: str = None, osBinaryPath : str = None, outputFolder : str = None):
+    def Run(model, weatherFilePath: str = None, osBinaryPath : str = None, outputFolder : str = None, removeFiles : bool = False):
         """
             Runs an energy simulation.
         
@@ -678,6 +679,8 @@ class EnergyModel:
             The path to the openstudio binary.
         outputFolder : str
             The path to the output folder.
+        removeFiles : bool , optional
+            If set to True, the working files are removed at the end of the process. The default is False.
 
         Returns
         -------
@@ -686,8 +689,22 @@ class EnergyModel:
 
         """
         import os
+        import time
+        def deleteOldFiles(path):
+            onemonth = (time.time()) - 30 * 86400
+            try:
+                for filename in os.listdir(path):
+                    if os.path.getmtime(os.path.join(path, filename)) < onemonth:
+                        if os.path.isfile(os.path.join(path, filename)):
+                            os.remove(os.path.join(path, filename))
+                        elif os.path.isdir(os.path.join(path, filename)):
+                            shutil.rmtree((os.path.join(path, filename)))
+            except:
+                pass
         if not weatherFilePath:
             weatherFilePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "assets", "EnergyModel", "GBR_London.Gatwick.037760_IWEC.epw")
+        if removeFiles:
+            deleteOldFiles(outputFolder)
         pbar = tqdm(desc='Running Simulation', total=100, leave=False)
         utcnow = datetime.utcnow()
         timestamp = utcnow.strftime("UTC-%Y-%m-%d-%H-%M-%S")

{topologicpy-0.4.12 → topologicpy-0.4.13}/src/topologicpy/Plotly.py

@@ -374,7 +374,7 @@ class Plotly:
                        faceMinGroup=None, faceMaxGroup=None, 
                        showFaceLegend=False, faceLegendLabel="Topology Faces", faceLegendRank=3,
                        faceLegendGroup=3, 
-                       intensityKey=None, colorScale="Viridis"):
+                       intensityKey=None, colorScale="Viridis", tolerance=0.0001):
         """
         Creates plotly face, edge, and vertex data.
 
@@ -479,6 +479,8 @@ class Plotly:
             If not None, the dictionary of each vertex is searched for the value associated with the intensity key. This value is then used to color-code the vertex based on the colorScale. The default is None.
         colorScale : str , optional
             The desired type of plotly color scales to use (e.g. "Viridis", "Plasma"). The default is "Viridis". For a full list of names, see https://plotly.com/python/builtin-colorscales/.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
         
         Returns
         -------
@@ -807,14 +809,21 @@ class Plotly:
                     if faceLabelKey or faceGroupKey:
                         f_dictionaries.append(Topology.Dictionary(tp_face))
             faces = []
+            orig_tolerance = tolerance
             for tri in triangles:
                 w = Face.ExternalBoundary(tri)
                 w_vertices = Topology.SubTopologies(w, subTopologyType="vertex")
                 temp_f = []
                 for w_v in w_vertices:
-                    i = Vertex.Index(vertex=w_v, vertices=tp_verts, tolerance=0.01)
-                    temp_f.append(i)
-                faces.append(temp_f)
+                    i = None
+                    tolerance = orig_tolerance
+                    while i == None and tolerance < 3:
+                        i = Vertex.Index(vertex=w_v, vertices=tp_verts, tolerance=tolerance)
+                        tolerance = tolerance*10
+                    if not i == None:
+                        temp_f.append(i)
+                if len(temp_f) > 2:
+                    faces.append(temp_f)
             data.append(faceData(vertices, faces, dictionaries=f_dictionaries, color=faceColor, opacity=faceOpacity, labelKey=faceLabelKey, groupKey=faceGroupKey, minGroup=faceMinGroup, maxGroup=faceMaxGroup, groups=faceGroups, legendLabel=faceLegendLabel, legendGroup=faceLegendGroup, legendRank=faceLegendRank, showLegend=showFaceLegend, intensities=intensities, colorScale=colorScale))
         return data
 

{topologicpy-0.4.12 → topologicpy-0.4.13}/src/topologicpy/Topology.py

@@ -1784,6 +1784,7 @@ class Topology():
             The imported topology.
 
         """
+        from topologicpy.Vertex import Vertex
         def parse(lines):
             vertices = []
             faces = []
@@ -1793,10 +1794,7 @@ class Topology():
                 if isinstance(s, list):
                     if len(s) > 3:
                         if s[0].lower() == "v":
-                            if transposeAxes:
-                                vertices.append([float(s[1]), float(s[3]), float(s[2])])
-                            else:
-                                vertices.append([float(s[1]), float(s[2]), float(s[3])])
+                            vertices.append([float(s[1]), float(s[2]), float(s[3])])
                         elif s[0].lower() == "f":
                             temp_faces = []
                             for j in range(1,len(s)):
@@ -1813,9 +1811,6 @@ class Topology():
                 if isinstance(s, list):
                     if len(s) > 3:
                         if s[0].lower() == "v":
-                            if transposeAxes:
-                                vertices.append([float(s[1]), float(s[3]), float(s[2])])
-                            else:
                                 vertices.append([float(s[1]), float(s[2]), float(s[3])])
                         elif s[0].lower() == "f":
                             temp_faces = []
@@ -1841,7 +1836,10 @@ class Topology():
                 vertices, faces = parse(lines)
         file.close()
         if vertices or faces:
-            return Topology.ByGeometry(vertices = vertices, faces = faces, outputMode="default", tolerance=tolerance)
+            topology = Topology.ByGeometry(vertices = vertices, faces = faces, outputMode="default", tolerance=tolerance)
+            if transposeAxes == True:
+                topology = Topology.Rotate(topology, Vertex.Origin(), 1,0,0,90)
+            return topology
         return None
     
     @staticmethod
@@ -4822,7 +4820,7 @@ class Topology():
              target=[0, 0, 0], up=[0, 0, 1], renderer="notebook", showScale=False,
              
              cbValues=[], cbTicks=5, cbX=-0.15, cbWidth=15, cbOutlineWidth=0, cbTitle="",
-             cbSubTitle="", cbUnits="", colorScale="Viridis", mantissa=4):
+             cbSubTitle="", cbUnits="", colorScale="Viridis", mantissa=4, tolerance=0.0001):
         """
             Shows the input topology on screen.
 
@@ -4981,6 +4979,8 @@ class Topology():
             The desired type of plotly color scales to use (e.g. "viridis", "plasma"). The default is "viridis". For a full list of names, see https://plotly.com/python/builtin-colorscales/.
         mantissa : int , optional
             The desired length of the mantissa for the values listed on the colorbar. The default is 4.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
 
         Returns
         -------
@@ -4990,7 +4990,6 @@ class Topology():
         from topologicpy.Plotly import Plotly
         if not isinstance(topology, topologic.Topology):
             return None
-        #data = Plotly.DataByTopology(topology=topology, vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, faceLabelKey=faceLabelKey, faceGroupKey=faceGroupKey, vertexGroups=vertexGroups, edgeGroups=edgeGroups, faceGroups=faceGroups, faceColor=faceColor, faceOpacity=faceOpacity, edgeColor=edgeColor, edgeWidth=edgeWidth, vertexColor=vertexColor, vertexSize=vertexSize, showFaces=showFaces, showEdges=showEdges, showVertices=showVertices, intensityKey=intensityKey, colorScale=colorScale, showScale=showScale)
         data = Plotly.DataByTopology(topology=topology,
                        showVertices=showVertices, vertexSize=vertexSize, vertexColor=vertexColor, 
                        vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, vertexGroups=vertexGroups, 
@@ -5007,7 +5006,7 @@ class Topology():
                        faceMinGroup=faceMinGroup, faceMaxGroup=faceMaxGroup, 
                        showFaceLegend=showFaceLegend, faceLegendLabel=faceLegendLabel, faceLegendRank=faceLegendRank,
                        faceLegendGroup=faceLegendGroup, 
-                       intensityKey=intensityKey, colorScale=colorScale)
+                       intensityKey=intensityKey, colorScale=colorScale, tolerance=tolerance)
         figure = Plotly.FigureByData(data=data, width=width, height=height, xAxis=xAxis, yAxis=yAxis, zAxis=zAxis, axisSize=axisSize, backgroundColor=backgroundColor, marginLeft=marginLeft, marginRight=marginRight, marginTop=marginTop, marginBottom=marginBottom)
         if showScale:
             figure = Plotly.AddColorBar(figure, values=cbValues, nTicks=cbTicks, xPosition=cbX, width=cbWidth, outlineWidth=cbOutlineWidth, title=cbTitle, subTitle=cbSubTitle, units=cbUnits, colorScale=colorScale, mantissa=mantissa)

{topologicpy-0.4.12 → topologicpy-0.4.13}/src/topologicpy/__init__.py

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

{topologicpy-0.4.12 → topologicpy-0.4.13/src/topologicpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.12
+Version: 0.4.13
 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.12 → topologicpy-0.4.13}/src/topologicpy.egg-info/SOURCES.txt

@@ -22,7 +22,6 @@ src/topologicpy/Matrix.py
 src/topologicpy/Neo4j.py
 src/topologicpy/Plotly.py
 src/topologicpy/Polyskel.py
-src/topologicpy/Process.py
 src/topologicpy/Shell.py
 src/topologicpy/Speckle.py
 src/topologicpy/Topology.py

{topologicpy-0.4.12 → topologicpy-0.4.13}/src/topologicpy.egg-info/requires.txt

@@ -1,4 +1,3 @@
 numpy
-scipy
 tqdm
 plotly