nettracer3d 1.2.7__py3-none-any.whl → 1.3.6__py3-none-any.whl

nettracer3d/network_analysis.py

@@ -442,6 +442,17 @@ def combine_lists_to_sublists(master_list):
     
     return combined_list
 
+def combine_lists_to_sublists_no_edges(master_list):
+
+
+    list1 = master_list[0]
+    list2 = master_list[1]
+
+    # Combine the lists into one list of sublists
+    combined_list = [list(sublist) for sublist in zip(list1, list2)]
+    
+    return combined_list
+
 
 def find_centroids(nodes, down_factor = None, network = None):
 
@@ -867,11 +878,7 @@ def buckets(dists, num_objects, rad_dist, directory = None):
 
     try:
 
-        if directory is None:
-            # Save the DataFrame to an Excel file
-            df.to_excel('radial_distribution.xlsx', index=False)
-            print("Radial distribution saved to radial_distribution.xlsx")
-        else:
+        if directory is not None:
             df.to_excel(f'{directory}/radial_distribution.xlsx', index=False)
             print(f"Radial distribution saved to {directory}/radial_distribution.xlsx")
     except:
@@ -923,8 +930,15 @@ def get_distance_list(centroids, network, xy_scale, z_scale):
     return distance_list
 
 
-def prune_samenode_connections(networkfile, nodeIDs):
-    """Even faster numpy-based version for very large datasets"""
+def prune_samenode_connections(networkfile, nodeIDs, target=None):
+    """Even faster numpy-based version for very large datasets
+    
+    Args:
+        networkfile: Network file path or list of node pairs
+        nodeIDs: Node identity mapping (file path or dict)
+        target: Optional string. If provided, only prunes pairs where BOTH nodes 
+                have this specific identity. If None, prunes all same-identity pairs.
+    """
     import numpy as np
     
     # Handle nodeIDs input
@@ -953,8 +967,13 @@ def prune_samenode_connections(networkfile, nodeIDs):
     idsA = np.array([data_dict.get(node) for node in nodesA])
     idsB = np.array([data_dict.get(node) for node in nodesB])
     
-    # Create boolean mask - keep where IDs are different
-    keep_mask = idsA != idsB
+    # Create boolean mask based on target parameter
+    if target is None:
+        # Original behavior: keep where IDs are different
+        keep_mask = idsA != idsB
+    else:
+        # New behavior: only remove pairs where BOTH nodes have the target identity
+        keep_mask = ~((idsA == target) & (idsB == target))
     
     # Apply filter
     filtered_nodesA = nodesA[keep_mask].tolist()