topologicpy 0.4.97__tar.gz → 0.4.99__tar.gz

{topologicpy-0.4.97/src/topologicpy.egg-info → topologicpy-0.4.99}/PKG-INFO

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

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

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Cell.py

@@ -19,6 +19,7 @@ from topologicpy.Wire import Wire
 from topologicpy.Topology import Topology
 import math
 import os
+import warnings
 
 try:
     import numpy as np
@@ -32,7 +33,7 @@ except:
         import numpy as np
         print("Cell - numpy library installed correctly.")
     except:
-        raise Exception("Cell - Error: Could not import numpy.")
+        warnings.warn("Cell - Error: Could not import numpy.")
     
 class Cell(Topology):
     @staticmethod
@@ -1045,13 +1046,16 @@ class Cell(Topology):
             pentagons.append(Topology.Rotate(pen, origin=o, x=e_dir[0], y=e_dir[1], z=e_dir[2], degree=116.565))
 
         cluster = Cluster.ByTopologies(pentagons)
-        vertices = Topology.Vertices(cluster)
+        
+        cluster2 = Topology.Rotate(cluster, origin=Vertex.Origin(), x=1,y=0,z=0,degree=180)
+        cluster2 = Topology.Rotate(cluster2, origin=Vertex.Origin(), x=0,y=0,z=1,degree=36)
+        vertices = Topology.Vertices(cluster2)
         zList = [Vertex.Z(v) for v in vertices]
         zList = list(set(zList))
         zList.sort()
-        zOffset = zList[1]+zList[2]
-        cluster2 = Topology.Rotate(cluster, origin=Vertex.Origin(), x=1,y=0,z=0,degree=180)
-        cluster2 = Topology.Translate(cluster2, 0, 0, zOffset)
+        zoffset1 = zList[-1] - zList[0]
+        zoffset2 = zList[1] - zList[0]
+        cluster2 = Topology.Translate(cluster2, 0, 0, -zoffset1-zoffset2)
         pentagons += Topology.Faces(cluster2)
         dodecahedron = Cell.ByFaces(pentagons, tolerance=tolerance)
         centroid = Topology.Centroid(dodecahedron)
@@ -1091,6 +1095,90 @@ class Cell(Topology):
         _ = cell.Edges(None, edges)
         return edges
 
+    @staticmethod
+    def Egg(origin: topologic.Vertex = None, height: float = 1.0, uSides: int = 16, vSides: int = 8, direction: list = [0,0,1],
+                   placement: str = "center", tolerance: float = 0.0001) -> topologic.Cell:
+        """
+        Creates a sphere.
+
+        Parameters
+        ----------
+        origin : topologic.Vertex , optional
+            The origin location of the sphere. The default is None which results in the sphere being placed at (0,0,0).
+        radius : float , optional
+            The radius of the sphere. The default is 0.5.
+        uSides : int , optional
+            The number of sides along the longitude of the sphere. The default is 16.
+        vSides : int , optional
+            The number of sides along the latitude of the sphere. The default is 8.
+        direction : list , optional
+            The vector representing the up direction of the sphere. The default is [0,0,1].
+        placement : str , optional
+            The description of the placement of the origin of the sphere. This can be "bottom", "center", or "lowerleft". It is case insensitive. The default is "center".
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+
+        Returns
+        -------
+        topologic.Cell
+            The created sphere.
+
+        """
+
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Topology import Topology
+        from topologicpy.Dictionary import Dictionary
+
+        if not origin:
+            origin = Vertex.ByCoordinates(0,0,0)
+        if not isinstance(origin, topologic.Vertex):
+            print("Cell.Sphere - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
+            return None
+        
+        coords = [[0.0, 0.0, -0.5],
+                 [0.074748, 0.0, -0.494015],
+                 [0.140819, 0.0, -0.473222],
+                 [0.204118, 0.0, -0.438358],
+                 [0.259512, 0.0, -0.391913],
+                 [0.304837, 0.0, -0.335519],
+                 [0.338649, 0.0, -0.271416],
+                 [0.361307, 0.0, -0.202039],
+                 [0.375678, 0.0, -0.129109],
+                 [0.381294, 0.0, -0.053696],
+                 [0.377694, 0.0, 0.019874],
+                 [0.365135, 0.0, 0.091978],
+                 [0.341482, 0.0, 0.173973],
+                 [0.300154, 0.0, 0.276001],
+                 [0.252928, 0.0, 0.355989],
+                 [0.206605, 0.0, 0.405813],
+                 [0.157529, 0.0, 0.442299],
+                 [0.10604, 0.0, 0.472092],
+                 [0.05547, 0.0, 0.491784],
+                 [0.0, 0.0, 0.5]]
+        verts = [Vertex.ByCoordinates(coord) for coord in coords]
+        c = Wire.ByVertices(verts, close=False)
+        new_verts = []
+        for i in range(vSides+1):
+            new_verts.append(Wire.VertexByParameter(c, i/vSides))
+        c = Wire.ByVertices(new_verts, close=False)
+        egg = Topology.Spin(c, origin=Vertex.Origin(), triangulate=False, direction=[0,0,1], degree=360, sides=uSides, tolerance=tolerance)
+        if egg.Type() == topologic.CellComplex.Type():
+            egg = egg.ExternalBoundary()
+        if egg.Type() == topologic.Shell.Type():
+            egg = topologic.Cell.ByShell(egg)
+        egg = Topology.Scale(egg, origin=Vertex.Origin(), x=height, y=height, z=height)
+        if placement.lower() == "bottom":
+            egg = Topology.Translate(egg, 0, 0, height/2)
+        elif placement.lower() == "lowerleft":
+            bb = Cell.BoundingBox(egg)
+            d = Topology.Dictionary(bb)
+            width = Dictionary.ValueAtKey(d, 'width')
+            length = Dictionary.ValueAtKey(d, 'length')
+            egg = Topology.Translate(egg, width*0.5, length*0.5, height*0.5)
+        egg = Topology.Orient(egg, origin=Vertex.Origin(), dirA=[0,0,1], dirB=direction)
+        egg = Topology.Place(egg, originA=Vertex.Origin(), originB=origin)
+        return egg
+    
     @staticmethod
     def ExternalBoundary(cell: topologic.Cell) -> topologic.Shell:
         """

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/CellComplex.py

@@ -18,6 +18,7 @@ import topologic
 import math
 import os
 from topologicpy.Topology import Topology
+import warnings
 
 try:
     import numpy as np
@@ -31,7 +32,7 @@ except:
         import numpy as np
         print("CellComplex - numpy library installed correctly.")
     except:
-        raise Exception("CellComplex - Error: Could not import numpy.")
+        warnings.warn("CellComplex - Error: Could not import numpy.")
 try:
     from scipy.spatial import Delaunay
     from scipy.spatial import Voronoi
@@ -45,7 +46,7 @@ except:
         from scipy.spatial import Delaunay
         from scipy.spatial import Voronoi
     except:
-        raise Exception("CellComplex - Error: Could not import scipy.")
+        warnings.warn("CellComplex - Error: Could not import scipy.")
 
 class CellComplex(Topology):
     @staticmethod

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Cluster.py

@@ -17,6 +17,7 @@
 from topologicpy.Topology import Topology
 import topologic
 import os
+import warnings
 
 try:
     import numpy as np
@@ -30,7 +31,7 @@ except:
         import numpy as np
         print("Cluster - numpy library installed correctly.")
     except:
-        raise Exception("Cluster - Error: Could not import numpy.")
+        warnings.warn("Cluster - Error: Could not import numpy.")
 
 try:
     from scipy.spatial.distance import pdist, squareform
@@ -44,7 +45,7 @@ except:
         from scipy.spatial.distance import pdist, squareform
         print("Cluster - scipy library installed correctly.")
     except:
-        raise Exception("Cluster - Error: Could not import scipy.")
+        warnings.warn("Cluster - Error: Could not import scipy.")
 
 class Cluster(Topology):
     @staticmethod
@@ -188,8 +189,11 @@ class Cluster(Topology):
                 if len(keys) > 0:
                     dictionaries.append(d)
         if len(dictionaries) > 0:
-            d = Dictionary.ByMergedDictionaries(dictionaries)
-            cluster = Topology.SetDictionary(cluster, d)
+            if len(dictionaries) > 1:
+                d = Dictionary.ByMergedDictionaries(dictionaries)
+            else:
+                d = dictionaries[0]
+                cluster = Topology.SetDictionary(cluster, d)
         return cluster
 
     @staticmethod

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/DGL.py

@@ -17,6 +17,7 @@
 import os
 import random
 import copy
+import warnings
 os.environ["DGLBACKEND"] = "pytorch"
 
 try:
@@ -31,7 +32,7 @@ except:
         import numpy as np
         print("DGL - numpy library installed correctly.")
     except:
-        raise Exception("DGL - Error: Could not import numpy.")
+        warnings.warn("DGL - Error: Could not import numpy.")
 
 try:
     import pandas as pd
@@ -45,7 +46,7 @@ except:
         import pandas as pd
         print("DGL - pandas library installed correctly.")
     except:
-        raise Exception("DGL - Error: Could not import pandas.")
+        warnings.warn("DGL - Error: Could not import pandas.")
 
 try:
     import torch
@@ -67,7 +68,7 @@ except:
         from torch.utils.data import DataLoader, ConcatDataset
         print("DGL - torch library installed correctly.")
     except:
-        raise Exception("DGL - Error: Could not import torch.")
+        warnings.warn("DGL - Error: Could not import torch.")
 
 try:
     import dgl
@@ -91,7 +92,7 @@ except:
         from dgl import save_graphs, load_graphs
         print("DGL - dgl library installed correctly.")
     except:
-        raise Exception("DGL - Error: Could not import dgl. The installation of the correct version of the dgl library is not trivial and is highly dependent on your hardward and software configuration. Please consult the dgl installation instructions.")
+        warnings.warn("DGL - Error: Could not import dgl. The installation of the correct version of the dgl library is not trivial and is highly dependent on your hardward and software configuration. Please consult the dgl installation instructions.")
 
 try:
     from sklearn import metrics

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/EnergyModel.py

@@ -21,6 +21,7 @@ from collections import OrderedDict
 import os
 from os.path import exists
 from datetime import datetime
+import warnings
 
 try:
     from tqdm.auto import tqdm
@@ -34,7 +35,7 @@ except:
         from tqdm.auto import tqdm
         print("EnergyModel - tqdm library installed correctly.")
     except:
-        raise Exception("EnergyModel - Error: Could not import tqdm.")
+        warnings.warn("EnergyModel - Error: Could not import tqdm.")
 
 try:
     import openstudio
@@ -50,7 +51,7 @@ except:
         openstudio.Logger.instance().standardOutLogger().setLogLevel(openstudio.Fatal)
         print("EnergyModel - openstudio library installed correctly.")
     except:
-        raise Exception("EnergyModel - Error: Could not import openstudio.")
+        warnings.warn("EnergyModel - Error: Could not import openstudio.")
 
 class EnergyModel:
     '''

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Face.py

@@ -20,6 +20,7 @@ from topologicpy.Wire import Wire
 from topologicpy.Topology import Topology
 import math
 import os
+import warnings
 
 try:
     import numpy as np
@@ -33,7 +34,7 @@ except:
         import numpy as np
         print("Face - numpy library installed correctly.")
     except:
-        raise Exception("Face - Error: Could not import numpy.")
+        warnings.warn("Face - Error: Could not import numpy.")
 
 class Face(Topology):
     @staticmethod

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Graph.py

@@ -22,6 +22,7 @@ from topologicpy.Vertex import Vertex
 import random
 import time
 import os
+import warnings
 
 try:
     import numpy as np
@@ -35,7 +36,7 @@ except:
         import numpy as np
         print("Graph - numpy library installed correctly.")
     except:
-        raise Exception("Graph - Error: Could not import numpy.")
+        warnings.warn("Graph - Error: Could not import numpy.")
 
 try:
     import pandas as pd
@@ -49,7 +50,7 @@ except:
         import pandas as pd
         print("Graph - pandas library installed correctly.")
     except:
-        raise Exception("Graph - Error: Could not import pandas.")
+        warnings.warn("Graph - Error: Could not import pandas.")
 
 try:
     from tqdm.auto import tqdm
@@ -63,7 +64,7 @@ except:
         from tqdm.auto import tqdm
         print("Graph - tqdm library installed correctly.")
     except:
-        raise Exception("Graph - Error: Could not import tqdm.")
+        warnings.warn("Graph - Error: Could not import tqdm.")
 
 try:
     from pyvis.network import Network
@@ -77,7 +78,7 @@ except:
         from pyvis.network import Network
         print("Graph - pyvis library installed correctly.")
     except:
-        raise Exception("Graph - Error: Could not import pyvis")
+        rwarnings.warn("Graph - Error: Could not import pyvis")
 
 try:
     import networkx as nx
@@ -91,7 +92,7 @@ except:
         import networkx as nx
         print("Graph - networkx library installed correctly.")
     except:
-        raise Exception("Graph - Error: Could not import networkx.")
+        warnings.warn("Graph - Error: Could not import networkx.")
 
 class _Tree:
     def __init__(self, node="", *children):
@@ -675,7 +676,7 @@ class Graph:
         import  random
 
         if not isinstance(adjacencyMatrix, list):
-            print("Graph.BYAdjacencyMatrix - Error: The input adjacencyMatrix parameter is not a valid list. Returning None.")
+            print("Graph.ByAdjacencyMatrix - Error: The input adjacencyMatrix parameter is not a valid list. Returning None.")
             return None
         # Add vertices with random coordinates
         vertices = []
@@ -692,7 +693,7 @@ class Graph:
 
         # Create the graph using vertices and edges
         if len(vertices) == 0:
-            print("Graph.BYAdjacencyMatrix - Error: The graph does not contain any vertices. Returning None.")
+            print("Graph.ByAdjacencyMatrix - Error: The graph does not contain any vertices. Returning None.")
             return None
         
         return Graph.ByVerticesEdges(vertices, edges)
@@ -960,13 +961,9 @@ class Graph:
         graphs = []
         for i, vertices, in enumerate(vertices_ds):
             edges = edges_ds[i]
-            print("2. Length of Vertices:", len(vertices))
-            print("2. Length of Edges:", len(edges))
             g = Graph.ByVerticesEdges(vertices, edges)
             temp_v = Graph.Vertices(g)
             temp_e = Graph.Edges(g)
-            print("3. Length of Vertices:", len(temp_v))
-            print("3. Length of Edges:", len(temp_e))
             if isinstance(g, topologic.Graph):
                 if len(graphFeaturesKeys) == 0:
                     values = [graph_ids[i], graph_labels[i], graph_features[i]]
@@ -3154,10 +3151,8 @@ class Graph:
         # If the maximum number of colors are not provided, compute it using the graph's chromatic number.
         if maxColors == None:
             maxColors = Graph.ChromaticNumber(temp_graph)
-        print("MaxColors:", maxColors)
         colors = [0] * len(vertices)
         colors = graph_coloring(adj_mat, maxColors, colors)
-        print("Colors:", colors)
         for i, v in enumerate(vertices):
                 d = Topology.Dictionary(v)
                 d = Dictionary.SetValueAtKey(d, newKey, colors[i])
@@ -3314,7 +3309,7 @@ class Graph:
                 else:
                     returnList.append((n-1)/top_dist)
         except:
-            print("Could not use tqdm")
+            print("Graph.ClosenessCentrality - Warning: Could not use tqdm.")
             for va in vertices:
                 top_dist = 0
                 for vb in graphVertices:
@@ -3889,7 +3884,6 @@ class Graph:
             if not nodeMaskKey == None:
                 if not nd == None:
                     keys = Dictionary.Keys(nd)
-                    print("keys", keys)
                 else:
                     keys = []
                     flag = True
@@ -4791,8 +4785,6 @@ class Graph:
                     
 
             # Calculate the global clustering coefficient
-            print("Total Triangles:", total_triangles )
-            print("Total Possible Triangles:", total_possible_triangles )
             global_clustering_coeff = 3.0 * total_triangles / total_possible_triangles if total_possible_triangles > 0 else 0.0
 
             return global_clustering_coeff

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Helper.py

@@ -16,6 +16,7 @@
 
 import topologicpy
 import os
+import warnings
 
 try:
     import numpy as np
@@ -31,7 +32,7 @@ except:
         import numpy.linalg as la
         print("Helper - numpy library installed correctly.")
     except:
-        raise Exception("Helper - Error: Could not import numpy.")
+        warnings.warn("Helper - Error: Could not import numpy.")
 
 class Helper:
     @staticmethod

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Honeybee.py

@@ -15,6 +15,7 @@
 # this program. If not, see <https://www.gnu.org/licenses/>.
 
 import os
+import warnings
 
 try:
     import honeybee.facetype
@@ -39,7 +40,7 @@ except:
         from honeybee.aperture import Aperture as HBAperture
         from honeybee.door import Door as HBDoor
     except:
-        raise Exception("Honeybee - ERROR: Could not import honeybee")
+        warnings.warn("Honeybee - ERROR: Could not import honeybee")
 
 try:
     import honeybee_energy.lib.constructionsets as constr_set_lib
@@ -64,7 +65,7 @@ except:
         from honeybee_energy.load.setpoint import Setpoint
         from honeybee_energy.load.hotwater import  ServiceHotWater
     except:
-        raise Exception("Honeybee - Error: Could not import honeybee-energy")
+        warnings.warn("Honeybee - Error: Could not import honeybee-energy")
 
 try:
     from honeybee_radiance.sensorgrid import SensorGrid
@@ -77,7 +78,7 @@ except:
     try:
         from honeybee_radiance.sensorgrid import SensorGrid
     except:
-        raise Exception("Honeybee - Error: Could not import honeybee-radiance")
+        warnings.warn("Honeybee - Error: Could not import honeybee-radiance")
 
 try:
     from ladybug.dt import Time
@@ -90,7 +91,7 @@ except:
     try:
         from ladybug.dt import Time
     except:
-        raise Exception("Honeybee - Error: Could not import ladybug")
+        warnings.warn("Honeybee - Error: Could not import ladybug")
 
 try:
     from ladybug_geometry.geometry3d.face import Face3D
@@ -105,7 +106,7 @@ except:
         from ladybug_geometry.geometry3d.face import Face3D
         from ladybug_geometry.geometry3d.pointvector import Point3D, Vector3D
     except:
-        raise Exception("Honeybee - Error: Could not import ladybug-geometry")
+        warnings.warn("Honeybee - Error: Could not import ladybug-geometry")
 
 import json
 import topologic

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Neo4j.py

@@ -17,6 +17,7 @@
 import time
 import random
 import os
+import warnings
 
 try:
     import py2neo
@@ -33,7 +34,7 @@ except:
         from py2neo import NodeMatcher,RelationshipMatcher
         from py2neo.data import spatial as sp
     except:
-        raise Exception("Neo4j - Error: Could not import py2neo")
+        warnings.warn("Neo4j - Error: Could not import py2neo")
 
 class Neo4j:
 

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Plotly.py

@@ -20,6 +20,7 @@ import topologic
 from topologicpy.Wire import Wire
 from topologicpy.Face import Face
 import os
+import warnings
 
 try:
     import numpy as np
@@ -32,7 +33,7 @@ except:
     try:
         import numpy as np
     except:
-        raise Exception("Plotly - Error: Could not import numpy.")
+        warnings.warn("Plotly - Error: Could not import numpy.")
 
 try:
     import pandas as pd
@@ -45,7 +46,7 @@ except:
     try:
         import pandas as pd
     except:
-        raise Exception("Plotly - Error: Could not import pandas.")
+        warnings.warn("Plotly - Error: Could not import pandas.")
 
 try:
     import plotly
@@ -62,7 +63,7 @@ except:
         import plotly.graph_objects as go
         import plotly.offline as ofl
     except:
-        raise Exception("Plotly - Error: Could not import plotly.")
+        warnings.warn("Plotly - Error: Could not import plotly.")
 
 class Plotly:
     @staticmethod

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Polyskel.py

@@ -20,6 +20,7 @@ import heapq
 from itertools import *
 from collections import namedtuple
 import os
+import warnings
 
 try:
 	from euclid3 import *
@@ -32,7 +33,7 @@ except:
 	try:
 		from euclid3 import *
 	except:
-		raise Exception("Polyskel - ERROR: Could not import euclid3.")
+		warnings.warn("Polyskel - ERROR: Could not import euclid3.")
 
 log = logging.getLogger("__name__")
 

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Shell.py

@@ -18,6 +18,7 @@ import topologic
 from topologicpy.Topology import Topology
 import math
 import os
+import warnings
 
 try:
     from tqdm.auto import tqdm
@@ -31,7 +32,7 @@ except:
         from tqdm.auto import tqdm
         print("Shell - tqdm library installed correctly.")
     except:
-        raise Exception("Shell - Error: Could not import tqdm.")
+        warnings.warn("Shell - Error: Could not import tqdm.")
 
 try:
     from scipy.spatial import Delaunay
@@ -46,7 +47,7 @@ except:
         from scipy.spatial import Delaunay
         from scipy.spatial import Voronoi
     except:
-        raise Exception("Shell - Error: Could not import scipy.")
+        warnings.warn("Shell - Error: Could not import scipy.")
 
 class Shell(Topology):
     @staticmethod
@@ -1295,7 +1296,6 @@ class Shell(Topology):
         if not roof:
             return None
         shell = Shell.Skeleton(flat_face, tolerance=tolerance)
-        print(shell)
         faces = Shell.Faces(shell)
         Topology.Show(shell)
         if not faces:

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Topology.py

@@ -17,7 +17,7 @@
 import topologic
 from topologicpy.Aperture import Aperture
 from topologicpy.Dictionary import Dictionary
-
+import warnings
 import uuid
 import json
 import os
@@ -42,7 +42,7 @@ except:
         from numpy.linalg import norm
         print("Topology - numpy library installed successfully.")
     except:
-        raise Exception("Topology - Error: Could not import numpy.")
+        warnings.warn("Topology - Error: Could not import numpy.")
 
 try:
     import ifcopenshell
@@ -58,7 +58,7 @@ except:
         import ifcopenshell.geom
         print("Topology - ifcopenshell library installed successfully.")
     except:
-        raise Exception("Topology - Error: Could not import ifcopenshell.")
+        warnings.warn("Topology - Error: Could not import ifcopenshell.")
 
 try:
     from scipy.spatial import ConvexHull
@@ -72,7 +72,7 @@ except:
         from scipy.spatial import ConvexHull
         print("Topology - scipy library installed successfully.")
     except:
-        raise Exception ("Topology - Error: Could not import scipy.")
+        warnings.warn("Topology - Error: Could not import scipy.")
 
 QueueItem = namedtuple('QueueItem', ['ID', 'sinkKeys', 'sinkValues'])
 SinkItem = namedtuple('SinkItem', ['ID', 'sink_str'])
@@ -278,8 +278,8 @@ class Topology():
         ----------
         topology : topologic.Topology
             The input topology.
-        conntents : list
-            The input list of contents.
+        conntents : list or topologic.Topology
+            The input list of contents (of type topologic.Topology). A single topology is also accepted as input.
         subTopologyType : string , optional
             The subtopology type to which to add the contents. This can be "cellcomplex", "cell", "shell", "face", "wire", "edge", or "vertex". It is case insensitive. If set to None, the contents will be added to the input topology. The default is None.
         tolerance : float , optional
@@ -296,6 +296,8 @@ class Topology():
             return None
         if not contents:
             return topology
+        if not isinstance(contents, list):
+            contents = [contents]
         if not isinstance(contents, list):
             print("Topology.AddContent - Error: the input contents parameter is not a list. Returning None.")
             return None
@@ -3607,7 +3609,6 @@ class Topology():
             return_topology = Cell.ByFaces(faces, tolerance=tolerance)
             if return_topology == None:
                 return_topology = CellComplex.ByFaces(faces, tolerance=tolerance)
-                #print("Return Topology:", return_topology)
                 if return_topology == None:
                     print("Topology.Fix - Error: Desired topologyType cannot be achieved. Returning original topology.")
                     return topology
@@ -4397,7 +4398,6 @@ class Topology():
             return [a,b,c,d]
 
         if not isinstance(topology, topologic.Topology):
-            print("Topology.IsPlanar", topology)
             print("Topology.IsPlanar - Error: the input topology parameter is not a valid topology. Returning None.")
             return None
         vertices = Topology.Vertices(topology)
@@ -5146,7 +5146,7 @@ class Topology():
 
         """
         if not len(verticesA) == len(verticesB):
-            print("Error - Topology.ReplaceVertices: VerticesA and VerticesB must be the same length")
+            print("Topology.ReplaceVertices - Error: The input parameters verticesA and verticesB must be the same length")
             return None
         from topologicpy.Vertex import Vertex
         geom = Topology.Geometry(topology, mantissa=mantissa)
@@ -5194,6 +5194,7 @@ class Topology():
 
         """
         from topologicpy.Vertex import Vertex
+        from topologicpy.Dictionary import Dictionary
 
         def rotate_vertex_3d(vertex, axis, angle_degrees, origin):
             vertex = np.array(vertex)  # Vertex to be rotated
@@ -5216,12 +5217,11 @@ class Topology():
             translated_vertex = vertex - origin
             rotated_vertex = np.dot(rotation_matrix, translated_vertex) + origin
             
-            rotated_vertex = [v for v in rotated_vertex]
+            rotated_vertex = [v for v in rotated_vertex] 
             return rotated_vertex
 
         if not isinstance(topology, topologic.Topology):
             print("Topology.Rotate - Error: The input topology parameter is not a valid topologic topology. Returning None.")
-            print("The topology is", topology)
             return None
         if not origin:
             origin = Vertex.ByCoordinates(0,0,0)
@@ -5456,6 +5456,56 @@ class Topology():
         _ = topology.SetDictionary(dictionary)
         return topology
     
+    @staticmethod
+    def SetSnapshot(topology, snapshot=None, timestamp=None, key="timestamp", silent=False):
+        from datetime import datetime
+        def is_valid_timestamp(timestamp):
+            if isinstance(timestamp, datetime):
+                return True
+            elif isinstance(timestamp, str):
+                try:
+                    # Split the timestamp string into date and time parts
+                    date_part, time_part = timestamp.split(' ')
+                    # Parse the date part
+                    date_obj = datetime.strptime(date_part, '%Y-%m-%d')
+                    # Split the time part into hours, minutes, and seconds
+                    hours, minutes, seconds = map(float, time_part.split(':'))
+                    # Check if seconds are within valid range
+                    if seconds < 0 or seconds >= 60:
+                        return False
+                    # Create a datetime object with the parsed date and time parts
+                    datetime_obj = datetime(date_obj.year, date_obj.month, date_obj.day, int(hours), int(minutes), int(seconds))
+                    return True
+                except ValueError:
+                    return False
+            else:
+                return False
+
+        if not isinstance(topology, topologic.Topology):
+            if not silent:
+                print("Topology.SetSnapshot - Error: The input topology parameter is not a valid topology. Returning None.")
+                return None
+        if not isinstance(snapshot, topologic.Topology):
+            snapshot = Topology.Copy(topology)
+            d = Topology.Dictionary(topology)
+            snapshot = Topology.SetDictionary(snapshot, d)
+        if not isinstance(snapshot, topologic.Topology):
+            if not silent:
+                print("Topology.SetSnapshot - Error: The input snapshot parameter is not a valid topology. Returning None.")
+                return None
+        if timestamp == None:
+            timestamp = datetime.now()
+        if not is_valid_timestamp(timestamp):
+            if not silent:
+                print("Topology.SetSnapshot - Error: The input timestamp parameter is not a valid timestamp. Returning None.")
+                return None
+        
+        d = Topology.Dictionary(snapshot)
+        d = Dictionary.SetValueAtKey(d, key, str(timestamp))
+        snapshot = Topology.SetDictionary(snapshot, d)
+        topology = Topology.AddContent(topology, snapshot)
+        return topology
+    
     @staticmethod
     def SharedTopologies(topologyA, topologyB):
         """
@@ -5897,6 +5947,57 @@ class Topology():
                 unsortedTopologies.append(topologies[i])
         return {"sorted":sortedTopologies, "unsorted":unsortedTopologies}
     
+    @staticmethod
+    def Snapshots(topology, key="timestamp", start=None, end=None, silent=False):
+        from datetime import datetime
+        def is_valid_timestamp(timestamp):
+            if isinstance(timestamp, datetime):
+                return True
+            elif isinstance(timestamp, str):
+                try:
+                    # Split the timestamp string into date and time parts
+                    date_part, time_part = timestamp.split(' ')
+                    # Parse the date part
+                    date_obj = datetime.strptime(date_part, '%Y-%m-%d')
+                    # Split the time part into hours, minutes, and seconds
+                    hours, minutes, seconds = map(float, time_part.split(':'))
+                    # Check if seconds are within valid range
+                    if seconds < 0 or seconds >= 60:
+                        return False
+                    # Create a datetime object with the parsed date and time parts
+                    return datetime(date_obj.year, date_obj.month, date_obj.day, int(hours), int(minutes), int(seconds))
+                except ValueError:
+                    return False
+            else:
+                return False
+        
+        if not isinstance(topology, topologic.Topology):
+            if not silent:
+                print("Topology.Snapshots - Error: The input topology parameter is not a valid topology. Returning None.")
+                return None
+        if start == None:
+            start = datetime.datetime(year=1900, month=1, day=1) # Set the start date to a date in the distant past
+        if end == None:
+            end = datetime.now() # Set the end date to the present.
+        if not is_valid_timestamp(start):
+            if not silent:
+                print("Topology.Snapshots - Error: The input start parameter is not a valid timestamp. Returning None.")
+                return None
+        if not is_valid_timestamp(end):
+            if not silent:
+                print("Topology.Snapshots - Error: The input end parameter is not a valid timestamp. Returning None.")
+                return None
+        contents = Topology.Contents(topology)    
+        snapshots = []
+        for content in contents:
+            d = Topology.Dictionary(content)
+            timestamp = Dictionary.ValueAtKey(d, key)
+            timestamp = is_valid_timestamp(timestamp)
+            if not timestamp == False:
+                if start <= timestamp <= end:
+                    snapshots.append(content)
+        return snapshots
+
     @staticmethod
     def Spin(topology, origin=None, triangulate=True, direction=[0,0,1], degree=360, sides=16,
                      tolerance=0.0001, silent=False):
@@ -6476,7 +6577,6 @@ class Topology():
         for i, sink in enumerate(sink_items):
             mapItem = sinkMap[sink.ID]
             newDict = Dictionary.ByKeysValues(mapItem.sinkKeys, mapItem.sinkValues)
-            # print("newDict", Dictionary.Keys(newDict), Dictionary.Values(newDict))
             _ = sinks[i].SetDictionary(newDict)
         return {"sources": sources, "sinks": sinks}
 

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Vector.py

@@ -16,6 +16,7 @@
 
 import math
 import os
+import warnings
 
 try:
     import numpy as np
@@ -33,7 +34,7 @@ except:
         from numpy import pi, arctan2, rad2deg
         print("Vector - numpy library installed successfully.")
     except:
-        raise Exception("Vector - Error: Could not import numpy.")
+        warnings.warn("Vector - Error: Could not import numpy.")
 
 class Vector(list):
     @staticmethod

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Vertex.py

@@ -20,6 +20,7 @@ from topologicpy.Face import Face
 from topologicpy.Topology import Topology
 import collections
 import os
+import warnings
 
 try:
     import numpy as np
@@ -33,7 +34,7 @@ except:
         import numpy as np
         print("Vertex - numpy library installed successfully.")
     except:
-        raise Exception("Vertex - Error: Could not import numpy.")
+        warnings.warn("Vertex - Error: Could not import numpy.")
 
 class Vertex(Topology):
     @staticmethod
@@ -698,10 +699,16 @@ class Vertex(Topology):
                 fused_vertices.append(fused_vertex)
 
             return fused_vertices
-
         def count_decimal_points(vertex):
             # Count the number of decimal points in the coordinates
-            return max(len(str(coord).split('.')[1]) for coord in vertex)
+            decimals_list = []
+            for coord in vertex:
+                coord_str = str(coord)
+                if '.' in coord_str:
+                    decimals_list.append(len(coord_str.split('.')[1]))
+                elif 'e' in coord_str:
+                    decimals_list.append(int(coord_str.split('e')[1].replace('-','')))
+            return max(decimals_list)
 
 
         if not isinstance(vertices, list):

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/Wire.py

@@ -2933,9 +2933,6 @@ class Wire(Topology):
             return Wire.StartVertex(wire)
         if abs(distance - wire_length) < tolerance:
             return Wire.EndVertex(wire)
-        # if abs(distance) > wire_length:
-        #     print("Wire.VertexByDistance - Error: The input distance parameter is larger than the wire's length. Returning None.")
-        #     return None
         if not Wire.IsManifold(wire):
             print("Wire.VertexAtParameter - Error: The input wire parameter is non-manifold. Returning None.")
             return None
@@ -2947,16 +2944,6 @@ class Wire(Topology):
         if not Vertex.IsInternal(origin, wire, tolerance=tolerance):
             print("Wire.VertexByDistance - Error: The input origin parameter is not internal to the input wire parameter. Returning None.")
             return None
-        # if distance < 0:
-        #     if Wire.VertexDistance(wire, Wire.StartVertex(wire), origin) < abs(distance):
-        #         print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
-        #         return None
-        # else:
-        #     if Wire.VertexDistance(wire, Wire.EndVertex(wire), origin) < distance:
-        #         print("Wire.VertexDistance:", Wire.VertexDistance(wire, Wire.EndVertex(wire), origin))
-        #         print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
-        #         return None
-        
         if Vertex.Distance(Wire.StartVertex(wire), origin) < tolerance:
             u = distance/wire_length
         elif Vertex.Distance(Wire.EndVertex(wire), origin) < tolerance:

{topologicpy-0.4.97 → topologicpy-0.4.99}/src/topologicpy/__init__.py

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

{topologicpy-0.4.97 → topologicpy-0.4.99/src/topologicpy.egg-info}/PKG-INFO

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