topologicpy 0.7.43__py3-none-any.whl → 0.7.44__py3-none-any.whl

topologicpy/EnergyModel.py

@@ -20,7 +20,7 @@ import math
 from collections import OrderedDict
 import os
 from os.path import exists
-from datetime import datetime
+from datetime import datetime, timezone
 import warnings
 
 try:
@@ -249,18 +249,24 @@ class EnergyModel:
             weatherFilePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "assets", "EnergyModel", "GBR_London.Gatwick.037760_IWEC.epw")
             designDayFilePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "assets", "EnergyModel", "GBR_London.Gatwick.037760_IWEC.ddy")
         translator = openstudio.osversion.VersionTranslator()
-        osmFile = openstudio.openstudioutilitiescore.toPath(osModelPath)
-        osModel = translator.loadModel(osmFile)
+        # DEBUGGING
+        #osmFile = openstudio.openstudioutilitiescore.toPath(osModelPath)
+        #osModel = translator.loadModel(osmFile)
+        osModel = translator.loadModel(osModelPath)
         if osModel.isNull():
             print("EnergyModel.ByTopology - Error: The openstudio model is null. Returning None.")
             return None
         else:
             osModel = osModel.get()
-        osEPWFile = openstudio.openstudioutilitiesfiletypes.EpwFile.load(openstudio.toPath(weatherFilePath))
+        # DEBUGGING
+        #osEPWFile = openstudio.openstudioutilitiesfiletypes.EpwFile.load(openstudio.toPath(weatherFilePath))
+        osEPWFile = openstudio.openstudioutilitiesfiletypes.EpwFile.load(weatherFilePath)
         if osEPWFile.is_initialized():
             osEPWFile = osEPWFile.get()
             openstudio.model.WeatherFile.setWeatherFile(osModel, osEPWFile)
-        ddyModel = openstudio.openstudioenergyplus.loadAndTranslateIdf(openstudio.toPath(designDayFilePath))
+        # DEBUGGING
+        #ddyModel = openstudio.openstudioenergyplus.loadAndTranslateIdf(openstudio.toPath(designDayFilePath))
+        ddyModel = openstudio.openstudioenergyplus.loadAndTranslateIdf(designDayFilePath)
         if ddyModel.is_initialized():
             ddyModel = ddyModel.get()
             for ddy in ddyModel.getObjectsByType(openstudio.IddObjectType("OS:SizingPeriod:DesignDay")):
@@ -578,8 +584,9 @@ class EnergyModel:
         if not overwrite and exists(path):
             print("EnergyModel.ExportToGBXML - Error: a file already exists at the specified path and overwrite is set to False. Returning None.")
             return None
-
-        return openstudio.gbxml.GbXMLForwardTranslator().modelToGbXML(model, openstudio.openstudioutilitiescore.toPath(path))
+        # DEBUGGING
+        #return openstudio.gbxml.GbXMLForwardTranslator().modelToGbXML(model, openstudio.openstudioutilitiescore.toPath(path))
+        return openstudio.gbxml.GbXMLForwardTranslator().modelToGbXML(model, path)
 
     
     @staticmethod
@@ -629,8 +636,10 @@ class EnergyModel:
             print("EnergyModel.ExportToOSM - Error: a file already exists at the specified path and overwrite is set to False. Returning None.")
             return None
         osCondition = False
-        osPath = openstudio.openstudioutilitiescore.toPath(path)
-        osCondition = model.save(osPath, overwrite)
+        # DEBUGGING
+        #osPath = openstudio.openstudioutilitiescore.toPath(path)
+        #osCondition = model.save(osPath, overwrite)
+        osCondition = model.save(path, overwrite)
         return osCondition
     
     @staticmethod
@@ -821,7 +830,7 @@ class EnergyModel:
         if removeFiles:
             deleteOldFiles(outputFolder)
         pbar = tqdm(desc='Running Simulation', total=100, leave=False)
-        utcnow = datetime.utcnow()
+        utcnow = datetime.now(timezone.utc)
         timestamp = utcnow.strftime("UTC-%Y-%m-%d-%H-%M-%S")
         if not outputFolder:
             home = os.path.expanduser('~')
@@ -831,28 +840,32 @@ class EnergyModel:
         os.mkdir(outputFolder)
         pbar.update(10)
         osmPath = os.path.join(outputFolder, model.getBuilding().name().get() + ".osm")
-        model.save(openstudio.openstudioutilitiescore.toPath(osmPath), True)
+        # DEBUGGING
+        #model.save(openstudio.openstudioutilitiescore.toPath(osmPath), True)
+        model.save(osmPath, True)
         oswPath = os.path.join(outputFolder, model.getBuilding().name().get() + ".osw")
         pbar.update(20)
-        #print("oswPath = "+oswPath)
         workflow = model.workflowJSON()
-        workflow.setSeedFile(openstudio.openstudioutilitiescore.toPath(osmPath))
+        # DEBUGGING
+        #workflow.setSeedFile(openstudio.openstudioutilitiescore.toPath(osmPath))
+        workflow.setSeedFile(osmPath)
         pbar.update(30)
-        #print("Seed File Set")
-        workflow.setWeatherFile(openstudio.openstudioutilitiescore.toPath(weatherFilePath))
+        # DEBUGGING
+        #workflow.setWeatherFile(openstudio.openstudioutilitiescore.toPath(weatherFilePath))
+        workflow.setWeatherFile(weatherFilePath)
         pbar.update(40)
-        #print("Weather File Set")
-        workflow.saveAs(openstudio.openstudioutilitiescore.toPath(oswPath))
+        # DEBUGGING
+        #workflow.saveAs(openstudio.openstudioutilitiescore.toPath(oswPath))
+        workflow.saveAs(oswPath)
         pbar.update(50)
-        #print("OSW File Saved")
         cmd = osBinaryPath+" run -w " + "\"" + oswPath + "\""
         pbar.update(60)
         os.system(cmd)
-        #print("Simulation DONE")
         sqlPath = os.path.join(os.path.join(outputFolder,"run"), "eplusout.sql")
         pbar.update(100)
-        #print("sqlPath = "+sqlPath)
-        osSqlFile = openstudio.SqlFile(openstudio.openstudioutilitiescore.toPath(sqlPath))
+        # DEBUGGING
+        #osSqlFile = openstudio.SqlFile(openstudio.openstudioutilitiescore.toPath(sqlPath))
+        osSqlFile = openstudio.SqlFile(sqlPath)
         model.setSqlFile(osSqlFile)
         pbar.close()
         return model

topologicpy/PyG.py

@@ -30,11 +30,27 @@ from sklearn.metrics import accuracy_score
 from tqdm.auto import tqdm
 import gc
 
+import torch
+from torch.utils.data import Dataset
+
+import torch
+from torch.utils.data import Dataset
 
 class CustomGraphDataset(Dataset):
-    def __init__(self, root, node_level=False, graph_level=True, node_attr_key='feat', 
-                 edge_attr_key='feat', transform=None, pre_transform=None):
-        super(CustomGraphDataset, self).__init__(root, transform, pre_transform)
+    def __init__(self, root=None, data_list=None, indices=None, node_level=False, graph_level=True, 
+                 node_attr_key='feat', edge_attr_key='feat'):
+        """
+        Initializes the CustomGraphDataset.
+
+        Parameters:
+        - root: Root directory of the dataset (used only if data_list is None)
+        - data_list: List of preprocessed data objects (used if provided)
+        - indices: List of indices to select a subset of the data
+        - node_level: Boolean flag indicating if the dataset is node-level
+        - graph_level: Boolean flag indicating if the dataset is graph-level
+        - node_attr_key: Key for node attributes
+        - edge_attr_key: Key for edge attributes
+        """
         assert not (node_level and graph_level), "Both node_level and graph_level cannot be True at the same time"
         assert node_level or graph_level, "Both node_level and graph_level cannot be False at the same time"
 
@@ -43,15 +59,20 @@ class CustomGraphDataset(Dataset):
         self.node_attr_key = node_attr_key
         self.edge_attr_key = edge_attr_key
 
-        self.graph_df = pd.read_csv(os.path.join(root, 'graphs.csv'))
-        self.nodes_df = pd.read_csv(os.path.join(root, 'nodes.csv'))
-        self.edges_df = pd.read_csv(os.path.join(root, 'edges.csv'))
-
-        self.data_list = self.process_all()
+        if data_list is not None:
+            self.data_list = data_list  # Use the provided data list
+        elif root is not None:
+            # Load and process data from root directory if data_list is not provided
+            self.graph_df = pd.read_csv(os.path.join(root, 'graphs.csv'))
+            self.nodes_df = pd.read_csv(os.path.join(root, 'nodes.csv'))
+            self.edges_df = pd.read_csv(os.path.join(root, 'edges.csv'))
+            self.data_list = self.process_all()
+        else:
+            raise ValueError("Either a root directory or a data_list must be provided.")
 
-    @property
-    def raw_file_names(self):
-        return ['graphs.csv', 'nodes.csv', 'edges.csv']
+        # Filter data_list based on indices if provided
+        if indices is not None:
+            self.data_list = [self.data_list[i] for i in indices]
 
     def process_all(self):
         data_list = []
@@ -73,12 +94,9 @@ class CustomGraphDataset(Dataset):
             else:
                 edge_attr = None
 
-
-
             if self.graph_level:
                 label_value = self.graph_df[self.graph_df['graph_id'] == graph_id]['label'].values[0]
                 
-                # Check if the label is an integer or a float and cast accordingly
                 if isinstance(label_value, int):
                     y = torch.tensor([label_value], dtype=torch.long)
                 elif isinstance(label_value, float):
@@ -89,7 +107,6 @@ class CustomGraphDataset(Dataset):
             elif self.node_level:
                 label_values = graph_nodes['label'].values
                 
-                # Check if the labels are integers or floats and cast accordingly
                 if issubclass(label_values.dtype.type, int):
                     y = torch.tensor(label_values, dtype=torch.long)
                 elif issubclass(label_values.dtype.type, float):
@@ -97,12 +114,6 @@ class CustomGraphDataset(Dataset):
                 else:
                     raise ValueError(f"Unexpected label types: {label_values.dtype}. Expected int or float.")
 
-
-            # if self.graph_level:
-            #     y = torch.tensor([self.graph_df[self.graph_df['graph_id'] == graph_id]['label'].values[0]], dtype=torch.long)
-            # elif self.node_level:
-            #     y = torch.tensor(graph_nodes['label'].values, dtype=torch.long)
-
             data = Data(x=x, edge_index=edge_index, y=y)
             if edge_attr is not None:
                 data.edge_attr = edge_attr
@@ -111,14 +122,103 @@ class CustomGraphDataset(Dataset):
 
         return data_list
 
-    def len(self):
+    def __len__(self):
         return len(self.data_list)
 
-    def get(self, idx):
+    def __getitem__(self, idx):
         return self.data_list[idx]
 
-    def __getitem__(self, idx):
-        return self.get(idx)
+
+
+
+# class CustomGraphDataset(Dataset):
+#     def __init__(self, root, node_level=False, graph_level=True, node_attr_key='feat', 
+#                  edge_attr_key='feat', transform=None, pre_transform=None):
+#         super(CustomGraphDataset, self).__init__(root, transform, pre_transform)
+#         assert not (node_level and graph_level), "Both node_level and graph_level cannot be True at the same time"
+#         assert node_level or graph_level, "Both node_level and graph_level cannot be False at the same time"
+
+#         self.node_level = node_level
+#         self.graph_level = graph_level
+#         self.node_attr_key = node_attr_key
+#         self.edge_attr_key = edge_attr_key
+
+#         self.graph_df = pd.read_csv(os.path.join(root, 'graphs.csv'))
+#         self.nodes_df = pd.read_csv(os.path.join(root, 'nodes.csv'))
+#         self.edges_df = pd.read_csv(os.path.join(root, 'edges.csv'))
+
+#         self.data_list = self.process_all()
+
+#     @property
+#     def raw_file_names(self):
+#         return ['graphs.csv', 'nodes.csv', 'edges.csv']
+
+#     def process_all(self):
+#         data_list = []
+#         for graph_id in self.graph_df['graph_id'].unique():
+#             graph_nodes = self.nodes_df[self.nodes_df['graph_id'] == graph_id]
+#             graph_edges = self.edges_df[self.edges_df['graph_id'] == graph_id]
+
+#             if self.node_attr_key in graph_nodes.columns and not graph_nodes[self.node_attr_key].isnull().all():
+#                 x = torch.tensor(graph_nodes[self.node_attr_key].values.tolist(), dtype=torch.float)
+#                 if x.ndim == 1:
+#                     x = x.unsqueeze(1)  # Ensure x has shape [num_nodes, *]
+#             else:
+#                 x = None
+
+#             edge_index = torch.tensor(graph_edges[['src_id', 'dst_id']].values.T, dtype=torch.long)
+
+#             if self.edge_attr_key in graph_edges.columns and not graph_edges[self.edge_attr_key].isnull().all():
+#                 edge_attr = torch.tensor(graph_edges[self.edge_attr_key].values.tolist(), dtype=torch.float)
+#             else:
+#                 edge_attr = None
+
+
+
+#             if self.graph_level:
+#                 label_value = self.graph_df[self.graph_df['graph_id'] == graph_id]['label'].values[0]
+                
+#                 # Check if the label is an integer or a float and cast accordingly
+#                 if isinstance(label_value, int):
+#                     y = torch.tensor([label_value], dtype=torch.long)
+#                 elif isinstance(label_value, float):
+#                     y = torch.tensor([label_value], dtype=torch.float)
+#                 else:
+#                     raise ValueError(f"Unexpected label type: {type(label_value)}. Expected int or float.")
+                    
+#             elif self.node_level:
+#                 label_values = graph_nodes['label'].values
+                
+#                 # Check if the labels are integers or floats and cast accordingly
+#                 if issubclass(label_values.dtype.type, int):
+#                     y = torch.tensor(label_values, dtype=torch.long)
+#                 elif issubclass(label_values.dtype.type, float):
+#                     y = torch.tensor(label_values, dtype=torch.float)
+#                 else:
+#                     raise ValueError(f"Unexpected label types: {label_values.dtype}. Expected int or float.")
+
+
+#             # if self.graph_level:
+#             #     y = torch.tensor([self.graph_df[self.graph_df['graph_id'] == graph_id]['label'].values[0]], dtype=torch.long)
+#             # elif self.node_level:
+#             #     y = torch.tensor(graph_nodes['label'].values, dtype=torch.long)
+
+#             data = Data(x=x, edge_index=edge_index, y=y)
+#             if edge_attr is not None:
+#                 data.edge_attr = edge_attr
+
+#             data_list.append(data)
+
+#         return data_list
+
+#     def len(self):
+#         return len(self.data_list)
+
+#     def get(self, idx):
+#         return self.data_list[idx]
+
+#     def __getitem__(self, idx):
+#         return self.get(idx)
 
 class _Hparams:
     def __init__(self, model_type="ClassifierHoldout", optimizer_str="Adam", amsgrad=False, betas=(0.9, 0.999), eps=1e-6, lr=0.001, lr_decay= 0, maximize=False, rho=0.9, weight_decay=0, cv_type="Holdout", split=[0.8,0.1, 0.1], k_folds=5, hl_widths=[32], conv_layer_type='SAGEConv', pooling="AvgPooling", batch_size=32, epochs=1, 
@@ -375,7 +475,8 @@ class _GraphRegressorKFold:
     
     def _initialize_model(self, hparams, dataset):
         if hparams.conv_layer_type.lower() == 'sageconv':
-            return _SAGEConv(dataset.num_node_features, hparams.hl_widths, 1, hparams.pooling).to(self.device)
+            return _SAGEConv(dataset[0].num_node_features, hparams.hl_widths, 1, hparams.pooling).to(self.device)
+            #return _SAGEConv(dataset.num_node_features, hparams.hl_widths, 1, hparams.pooling).to(self.device)
         else:
             raise NotImplementedError
     
@@ -1485,7 +1586,7 @@ class PyG:
         """
 
         import torch
-        from torch.utils.data import random_split, Subset
+        from torch.utils.data import random_split
         train_ratio, val_ratio, test_ratio = split
         assert abs(train_ratio + val_ratio + test_ratio - 1.0) < 1e-6, "Ratios must add up to 1."
         
@@ -1506,9 +1607,10 @@ class PyG:
         val_indices = indices[train_len:train_len + val_len]
         test_indices = indices[train_len + val_len:train_len + val_len + test_len]
 
-        train_dataset = Subset(dataset, train_indices)
-        val_dataset = Subset(dataset, val_indices)
-        test_dataset = Subset(dataset, test_indices)
+        # Create new instances of CustomGraphDataset using the indices
+        train_dataset = CustomGraphDataset(data_list=dataset.data_list, indices=train_indices)
+        val_dataset = CustomGraphDataset(data_list=dataset.data_list, indices=val_indices)
+        test_dataset = CustomGraphDataset(data_list=dataset.data_list, indices=test_indices)
 
         return train_dataset, val_dataset, test_dataset
 

topologicpy/Topology.py

@@ -2627,6 +2627,7 @@ class Topology():
                 if ap != None:
                     apertures.append(ap)
             context = Context.ByTopologyParameters(topology, u=0.5, v=0.5, w=0.5)
+            
             for ap in apertures:
                 _ = Aperture.ByTopologyContext(ap, context)
             return topology
@@ -6308,7 +6309,7 @@ class Topology():
                 rot_vertices = [Vertex.ByCoordinates(rot_v) for rot_v in rot_vertices]
                 new_topology = Topology.ReplaceVertices(topology, verticesA=Topology.Vertices(topology), verticesB=rot_vertices)
                 new_topology = Topology.SelfMerge(new_topology, tolerance=tolerance)
-                if len(Dictionary.Keys(d) > 0):
+                if len(Dictionary.Keys(d)) > 0:
                     new_topology = Topology.SetDictionary(new_topology, d)
                 return new_topology
         if len(Dictionary.Keys(d)) > 0:
@@ -7875,7 +7876,6 @@ class Topology():
             if Topology.IsInstance(topology, "Cell"):
                 sinkCells = [topology]
             elif hidimSink >= Topology.TypeID("Cell"):
-                print("Transfering Dictionaries to Cells")
                 sinkCells = Topology.Cells(topology)
             _ = Topology.TransferDictionaries(selectors, sinkCells, tolerance=tolerance, numWorkers=numWorkers)
         return topology

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.43'
+__version__ = '0.7.44'

{topologicpy-0.7.43.dist-info → topologicpy-0.7.44.dist-info}/METADATA

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

{topologicpy-0.7.43.dist-info → topologicpy-0.7.44.dist-info}/RECORD

@@ -8,7 +8,7 @@ topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=KqJ29YyE23Y3Xc6XmKLSCZXRfBvm-OEOxlMZ4dt-rfM,27094
 topologicpy/Edge.py,sha256=vhYHkobSLGSWV-oe2oJFFDobqFToDyb7s71yQ840AAA,65166
-topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
+topologicpy/EnergyModel.py,sha256=XcCP55VW5WHDIIKcURijmBOZEgNUDEn_V9h5EejkntA,53876
 topologicpy/Face.py,sha256=d1Im4ogxuaVmZyb6hgv5muwQwahLtGzOar_a3og1a_I,115376
 topologicpy/Graph.py,sha256=p3VoVH6yygNV2wwzpsi4tm6yOfwRbtmsbnsAu2opLjQ,393517
 topologicpy/Grid.py,sha256=3-sn7CHWGcXk18XCnHjsUttNJTWwmN63g_Insj__p04,18218
@@ -18,18 +18,18 @@ topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
 topologicpy/Neo4j.py,sha256=YvtF7RYUMATEZ8iHwFwK_MOxEDyARby2DTI2CCK6-cI,19694
 topologicpy/Plotly.py,sha256=U6Lo7hyDoStRKQXqlhb2LM-rR_bfBulxetRT2wMBmhI,105391
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
-topologicpy/PyG.py,sha256=Dd0fiEbM_KR-sEHKCodmURBFFvckB6j7x4oBcCC5Q2o,102171
+topologicpy/PyG.py,sha256=0yeECsMz-dqhhZSv52s_xPCO_3BcEXUK7z1YFDN9qoo,106987
 topologicpy/Shell.py,sha256=NZyHYTvV0pXx18AoMbVs8y-7if8teETItv5ZOJq6gzE,84672
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=InnKtX8eKwtAgcScuABH6yp0ljmWh5m_fDR4-n3jJMY,36869
-topologicpy/Topology.py,sha256=5KGQ8jSiURMk9syoMLc3mrIONCfj_pfvCfHTKgPcLOM,366047
+topologicpy/Topology.py,sha256=RFZPKx15qM53skLavdMwL_YnJkDIinOnz3CLAY5OsWE,366001
 topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
 topologicpy/Vertex.py,sha256=EQdVYHmW85_pZdHZB3N8pEi0GiadCCkF3z_oqohA7B0,71161
 topologicpy/Wire.py,sha256=9EJE0Iq3nGz5X7Suy6xxjmuOpfV49By6WH98UAL_7m4,153532
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=7JOl9BjjPK0ib5M5rAuj9I5xjEoYF6YsFAS_dvAYEzg,23
-topologicpy-0.7.43.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.43.dist-info/METADATA,sha256=NCprd1lCZf1afHBHxA5uol5btFYvJFZeiIdoIJtQ5aI,10916
-topologicpy-0.7.43.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-topologicpy-0.7.43.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.43.dist-info/RECORD,,
+topologicpy/version.py,sha256=2Sw5dX1m7XzP13Ernw7oNdPR5WsUzOMJ7VZ-QyJpf9o,23
+topologicpy-0.7.44.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.44.dist-info/METADATA,sha256=N7KPudecCpJl9CdmpNEfoLiXYGpxcXZwegs6AvC1HTo,10916
+topologicpy-0.7.44.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+topologicpy-0.7.44.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.44.dist-info/RECORD,,