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

topologicpy/Graph.py

@@ -20,6 +20,9 @@ import time
 import os
 import warnings
 
+from collections import namedtuple
+from multiprocessing import Process, Queue
+
 try:
     import numpy as np
 except:
@@ -62,6 +65,133 @@ except:
     except:
         warnings.warn("Graph - Error: Could not import tqdm.")
 
+
+GraphQueueItem = namedtuple('GraphQueueItem', ['edges'])
+
+class WorkerProcessPool(object):
+    """
+    Create and manage a list of Worker processes. Each worker process
+    creates a 2D navigation graph.
+    """
+    def __init__(self,
+                 num_workers,
+                 message_queue,
+                 used,
+                 face,
+                 sources,
+                 destinations,
+                 tolerance=0.0001):
+        self.num_workers = num_workers
+        self.message_queue = message_queue
+        self.used = used
+        self.face = face
+        self.sources = sources
+        self.destinations = destinations
+        self.tolerance = tolerance
+        self.process_list = []
+
+    def startProcesses(self):
+        num_item_per_worker = len(self.sources) // self.num_workers
+        for i in range(self.num_workers):
+            if i == self.num_workers - 1:
+                begin = i * num_item_per_worker
+                sub_sources = self.sources[begin:]
+            else:
+                begin = i * num_item_per_worker
+                end = begin + num_item_per_worker
+                sub_sources = self.sources[begin : end]
+            wp = WorkerProcess(begin,
+                               self.message_queue,
+                               self.used,
+                               self.face,
+                               sub_sources,
+                               self.destinations,
+                               self.tolerance)
+            wp.start()
+            self.process_list.append(wp)
+
+    def stopProcesses(self):
+        for p in self.process_list:
+            p.join()
+        self.process_list = []
+
+    def join(self):
+        for p in self.process_list:
+            p.join()
+
+
+class WorkerProcess(Process):
+    """
+    Creates a 2D navigation graph from a subset of sources and the list of destinations.
+    """
+    def __init__(self,
+                 start_index,
+                 message_queue,
+                 used,
+                 face,
+                 sources,
+                 destinations,
+                 tolerance=0.0001):
+        Process.__init__(self, target=self.run)
+        self.start_index = start_index
+        self.message_queue = message_queue
+        self.used = used
+        self.face = face
+        self.sources =  sources
+        self.destinations = destinations
+        self.tolerance = tolerance
+
+    def run(self):
+        from topologicpy.Topology import Topology
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
+
+        edges = []
+        face = Topology.ByBREPString(self.face)
+        sources = [Topology.ByBREPString(s) for s in self.sources]
+        destinations = [Topology.ByBREPString(s) for s in self.destinations]
+        for i in range(len(sources)):
+            source = sources[i]
+            index_b = Vertex.Index(source, destinations)
+            for j in range(len(destinations)):
+                destination = destinations[j]
+                index_a = Vertex.Index(destination, sources)
+                if self.used[i + self.start_index][j] == 1 or self.used[j][i + self.start_index]:
+                    continue
+                if Vertex.Distance(source, destination) > self.tolerance:
+                    edge = Edge.ByVertices([source, destination])
+                    e = Topology.Boolean(edge, face, operation="intersect")
+                    if Topology.IsInstance(e, "Edge"):
+                        edges.append(edge)
+                self.used[i + self.start_index][j] = 1
+                if not index_a == None and not index_b == None:
+                    self.used[j][i + self.start_index] = 1
+        if len(edges) > 0:
+            edges_str = [Topology.BREPString(s) for s in edges]
+            self.message_queue.put(GraphQueueItem(edges_str))
+
+
+class MergingProcess(Process):
+    """
+    Receive message from other processes and merging the result
+    """
+    def __init__(self, message_queue):
+        Process.__init__(self, target=self.wait_message)
+        self.message_queue = message_queue
+        self.final_edges = []
+
+    def wait_message(self):
+        while True:
+            try:
+                item = self.message_queue.get()
+                if item is None:
+                    self.message_queue.put(GraphQueueItem(self.final_edges))
+                    break
+                self.final_edges.extend(item.edges)
+            except Exception as e:
+                print(str(e))
+
+
 class _Tree:
     def __init__(self, node="", *children):
         self.node = node
@@ -6724,7 +6854,7 @@ class Graph:
         return mst
 
     @staticmethod
-    def NavigationGraph(face, sources=None, destinations=None, tolerance=0.0001, progressBar=True):
+    def NavigationGraph(face, sources=None, destinations=None, tolerance=0.0001, numWorkers=None):
         """
         Creates a 2D navigation graph.
 
@@ -6738,8 +6868,8 @@ class Graph:
             The input list of destinations (vertices). Navigation edges will connect these vertices to sources.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
-        tqdm : bool , optional
-            If set to True, a tqdm progress bar is shown. Otherwise, it is not. The default is True.
+        numWorkers : int, optional
+            Number of workers run in parallel to process. The default is None which sets the number to twice the number of CPU cores.
 
         Returns
         -------
@@ -6747,15 +6877,15 @@ class Graph:
             The navigation graph.
 
         """
-        from topologicpy.Vertex import Vertex
-        from topologicpy.Edge import Edge
+
+        from topologicpy.Topology import Topology
         from topologicpy.Wire import Wire
         from topologicpy.Face import Face
-        from topologicpy.Graph import Graph
         from topologicpy.Cluster import Cluster
-        from topologicpy.Topology import Topology
-        import topologic_core as topologic
-        from tqdm.auto import tqdm
+
+        if not numWorkers:
+            import multiprocessing
+            numWorkers = multiprocessing.cpu_count()*2
 
         if not Topology.IsInstance(face, "Face"):
             print("Graph.NavigationGraph - Error: The input face parameter is not a valid face. Returning None")
@@ -6776,8 +6906,6 @@ class Graph:
             print("Graph.NavigationGraph - Error: The input sources parameter does not contain any vertices. Returning None")
             return None
         destinations = [v for v in destinations if Topology.IsInstance(v, "Vertex")]
-        #if len(destinations) < 1: #Nothing to navigate to, so return a graph made of sources
-            #return Graph.ByVerticesEdges(sources, [])
 
         # Add obstuse angles of external boundary to viewpoints
         e_boundary = Face.ExternalBoundary(face)
@@ -6804,27 +6932,28 @@ class Graph:
                 temp_row.append(0)
             used.append(temp_row)
 
-        final_edges = []
-        if progressBar:
-            the_range = tqdm(range(len(sources)))
-        else:
-            the_range = range(len(sources))
-        for i in the_range:
-            source = sources[i]
-            index_b = Vertex.Index(source, destinations)
-            for j in range(len(destinations)):
-                destination = destinations[j]
-                index_a = Vertex.Index(destination, sources)
-                if used[i][j] == 1 or used[j][i]:
-                    continue
-                if Vertex.Distance(source, destination) > tolerance:
-                    edge = Edge.ByVertices([source,destination])
-                    e = Topology.Boolean(edge, face, operation="intersect")
-                    if Topology.IsInstance(e, "Edge"):
-                        final_edges.append(edge)
-                used[i][j] = 1
-                if not index_a == None and not index_b == None:
-                    used[j][i] = 1
+        queue = Queue()
+        mergingProcess = MergingProcess(queue)
+        mergingProcess.start()
+
+        sources_str = [Topology.BREPString(s) for s in sources]
+        destinations_str = [Topology.BREPString(s) for s in destinations]
+        face_str = Topology.BREPString(face)
+        workerProcessPool = WorkerProcessPool(numWorkers,
+                                              queue,
+                                              used,
+                                              face_str,
+                                              sources_str,
+                                              destinations_str,
+                                              tolerance)
+        workerProcessPool.startProcesses()
+        workerProcessPool.join()
+
+        queue.put_nowait(None)
+        it = queue.get()
+        final_edges = [Topology.ByBREPString(edge_str) for edge_str in it.edges]
+        mergingProcess.join()
+
         if len(i_boundaries) > 0:
             holes_edges = Topology.Edges(Cluster.ByTopologies(i_boundaries))
             final_edges += holes_edges

topologicpy/Topology.py

@@ -6718,7 +6718,7 @@ class Topology():
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         numWorkers : int, optional
-            Number of workers run in parallel to process.
+            Number of workers run in parallel to process. The default is None which sets the number to twice the number of CPU cores.
 
         Returns
         -------

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.8'
+__version__ = '0.7.9'

topologicpy-0.7.9.dist-info/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Wassim Jabi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

topologicpy-0.7.9.dist-info/METADATA

@@ -0,0 +1,112 @@
+Metadata-Version: 2.1
+Name: topologicpy
+Version: 0.7.9
+Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
+Author-email: Wassim Jabi <wassim.jabi@gmail.com>
+License: MIT License
+        
+        Copyright (c) 2024 Wassim Jabi
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+Project-URL: Homepage, https://github.com/wassimj/TopologicPy
+Project-URL: Bug Tracker, https://github.com/wassimj/TopologicPy/issues
+Project-URL: Documentation, https://topologic.app/topologicpy_doc/
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Operating System :: OS Independent
+Requires-Python: <3.14,>=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: numpy >=1.18.0
+Requires-Dist: scipy >=1.4.1
+Requires-Dist: pandas
+Requires-Dist: tqdm
+Requires-Dist: plotly
+Requires-Dist: lark
+Requires-Dist: topologic-core >=7.0.1
+Provides-Extra: test
+Requires-Dist: pytest-xdist >=2.4.0 ; extra == 'test'
+
+# topologicpy
+
+<img src="https://topologic.app/wp-content/uploads/2023/02/topologicpy-logo-no-loop.gif" alt="topologicpy logo" width="250" loop="1">
+
+# An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction
+
+## Introduction
+Welcome to topologicpy (rhymes with apple pie). topologicpy is an open-source python 3 implementation of [Topologic](https://topologic.app) which is a powerful spatial modelling and analysis software library that revolutionizes the way you design architectural spaces, buildings, and artefacts. Topologic's advanced features enable you to create hierarchical and topological information-rich 3D representations that offer unprecedented flexibility and control in your design process. With the integration of geometry, topology, information, and artificial intelligence, Topologic enriches Building Information Models with Building *Intelligence* Models.
+
+Two of Topologic's main strengths are its support for *defeaturing* and *encoded meshing*. By simplifying the geometry of a model and removing small or unnecessary details not needed for analysis, defeaturing allows for faster and more accurate analysis while maintaining topological consistency. This feature enables you to transform low-quality, heavy BIM models into high-quality, lightweight representations ready for rigorous analysis effortlessly. Encoded meshing allows you to use the same base elements available in your commercial BIM platform to cleanly build 3D information-encoded models that match your exacting specifications.
+
+Topologic's versatility extends to entities with mixed dimensionalities, enabling structural models, for example, to be represented coherently. Lines can represent columns and beams, surfaces can represent walls and slabs, and volumes can represent solids. Even non-building entities like structural loads can be efficiently attached to the structure. This approach creates mixed-dimensional models that are highly compatible with structural analysis simulation software.
+
+Topologic's graph-based representation makes it a natural fit for integrating with Graph Machine Learning (GML), an exciting new branch of artificial intelligence. With GML, you can process vast amounts of connected data and extract valuable insights quickly and accurately. Topologic's intelligent algorithms for graph and node classification take GML to the next level by using the extracted data to classify building typologies, predict associations, and complete missing information in building information models. This integration empowers you to leverage the historical knowledge embedded in your databases and make informed decisions about your current design projects. With Topologic and GML, you can streamline your workflow, enhance your productivity, and achieve your project goals with greater efficiency and precision.
+
+Experience Topologic's comprehensive and well-documented Application Protocol Interface (API) and enjoy the freedom and flexibility that Topologic offers in your architectural design process. Topologic uses cutting-edge C++-based non-manifold topology (NMT) core technology ([Open CASCADE](https://www.opencascade.com/)), and python bindings. Interacting with Topologic is easily accomplished through a command-Line interface and scripts, visual data flow programming (VDFP) plugins for popular BIM software, and cloud-based interfaces through [Streamlit](https://streamlit.io/). You can easily interact with Topologic in various ways to perform design and analysis tasks or even seamlessly customize and embed it in your own in-house software and workflows. Plus, Topologic includes several industry-standard methods for data transport including IFC, OBJ, BREP, HBJSON, CSV, as well serializing through cloud-based services such as [Speckle](https://speckle.systems/).
+
+Topologic’s open-source philosophy and licensing ([AGPLv3](https://www.gnu.org/licenses/agpl-3.0.en.html)) enables you to achieve your design vision with minimal incremental costs, ensuring a high return on investment. You control and own your information outright, and nothing is ever trapped in an expensive subscription model. Topologic empowers you to build and share data apps with ease, giving you the flexibility to choose between local or cloud-based options and the peace of mind to focus on what matters most. 
+
+Join the revolution in architectural design with Topologic. Try it today and see the difference for yourself.
+
+## Installation
+topologicpy can be installed using the **pip** command as such:
+
+`pip install topologicpy --upgrade`
+
+## Prerequisites
+
+topologicpy depends on the following python libraries which will be installed automatically from pip:
+
+<details>
+<summary>
+<b>Expand to view dependencies</b>
+</summary>
+* [numpy](http://numpy.org) >= 1.24.0
+* [scipy](http://scipy.org) >= 1.10.0
+* [plotly](http://plotly.com/) >= 5.11.0
+* [ifcopenshell](http://ifcopenshell.org/) >=0.7.9
+* [ipfshttpclient](https://pypi.org/project/ipfshttpclient/) >= 0.7.0
+* [web3](https://web3py.readthedocs.io/en/stable/) >=5.30.0
+* [openstudio](https://openstudio.net/) >= 3.4.0
+* [topologic_core](https://pypi.org/project/topologic_core/) >= 6.0.6
+* [lbt-ladybug](https://pypi.org/project/lbt-ladybug/) >= 0.25.161
+* [lbt-honeybee](https://pypi.org/project/lbt-honeybee/) >= 0.6.12
+* [honeybee-energy](https://pypi.org/project/honeybee-energy/) >= 1.91.49
+* [json](https://docs.python.org/3/library/json.html) >= 2.0.9
+* [py2neo](https://py2neo.org/) >= 2021.2.3
+* [pyvisgraph](https://github.com/TaipanRex/pyvisgraph) >= 0.2.1
+* [specklepy](https://github.com/specklesystems/specklepy) >= 2.7.6
+* [pandas](https://pandas.pydata.org/) >= 1.4.2
+* [scipy](https://scipy.org/) >= 1.8.1
+* [dgl](https://github.com/dmlc/dgl) >= 0.8.2
+
+</details>
+
+## How to start using Topologic
+1. Open your favourite python editor ([jupyter notebook](https://jupyter.org/) is highly recommended)
+1. Type 'import topologicpy'
+1. Start using the API
+
+## API Documentation
+API documentation can be found at [https://topologic.app/topologicpy_doc/](https://topologic.app/topologicpy_doc/)
+
+topologicpy: &copy; 2023 Wassim Jabi
+
+Topologic: &copy; 2023 Cardiff University and UCL

{topologicpy-0.7.8.dist-info → topologicpy-0.7.9.dist-info}/RECORD

@@ -9,7 +9,7 @@ topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,258
 topologicpy/Edge.py,sha256=KCQm9QfwjsYO4yKE4p4elpha9c4MY6EWAEaK_6mTAjo,52239
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
 topologicpy/Face.py,sha256=uPVVFF6CLzEW2JaTllQJp7nBsS2w3wAz7qwfujWTQAk,97474
-topologicpy/Graph.py,sha256=51VViKQaYIuaMOoU3SQtzi7LJ6yisloY7wU-Ypj1gJo,380319
+topologicpy/Graph.py,sha256=IFEGU0MCE4_fPe2j8sx1vuXPKMjGaov5wTlgRAwB7ns,384631
 topologicpy/Grid.py,sha256=2uDFDxg4NqROC-7bNi1BjK5Uz__BPH13afJ-VDBRW0M,18466
 topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
 topologicpy/Honeybee.py,sha256=dlr5OEH93q51ZmEgvi8PXGfCHBDAjIZ1cm38Rft1Bz4,20235
@@ -20,14 +20,14 @@ topologicpy/Polyskel.py,sha256=MYHKFOQBlUNqoUhAdOcKRIHpSk0dWWVrZgXK34NkvFM,15936
 topologicpy/Shell.py,sha256=uPf5Ch8wQ-pbKvXMY_DV9tPXyz4BPmofFVYdIzbWFh4,76960
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=3tYb8kssU882lE1gEWg2mxDvCCY_LAVElkyUT6wa-ZU,36935
-topologicpy/Topology.py,sha256=SymcisEpNIuqpKiBoz7zJrLtS_28R5GDbG-SiwJOirY,308743
+topologicpy/Topology.py,sha256=sXvhiMShOjOp0aILjEU6uNDqKm3zEAEdrN_IJgDK47c,308819
 topologicpy/Vector.py,sha256=2OXmty9CKZZzfsg5T4ckml-lPUUvgDvqokcKDsZVN9Y,29806
 topologicpy/Vertex.py,sha256=WjQZf-r8h_Cjwkt_qNN483FCUql20fbv72Ymiq7ZYtw,67462
 topologicpy/Wire.py,sha256=efqePp91BvAdj4JitSW_f-xeGoTFg_AxP5g5pmbBVFw,139047
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=a7wkX95rB7MKSi7_39xJlxtx2D_-UcZRwY8dnpzjx6w,22
-topologicpy-0.7.8.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
-topologicpy-0.7.8.dist-info/METADATA,sha256=5ElQumbM_dp9q0pHrGBTf585bMtBm5yQ8Is1dCFKnuE,46950
-topologicpy-0.7.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.7.8.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.8.dist-info/RECORD,,
+topologicpy/version.py,sha256=zKmTTl0oKv8UEnjDkiAKOUL5t2pURpcJX_sqiJZHBIc,22
+topologicpy-0.7.9.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.9.dist-info/METADATA,sha256=tHxNNM7xU92yefkBRv_hIHib5vZyWKzyazZCTIJeE0s,8404
+topologicpy-0.7.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.7.9.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.9.dist-info/RECORD,,