RDG-Networks 0.3.7__tar.gz → 0.3.8__tar.gz

{rdg_networks-0.3.7 → rdg_networks-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RDG-Networks
-Version: 0.3.7
+Version: 0.3.8
 Summary: Most of the code from the RDG Networks project
 Home-page: https://github.com/NiekMooij/RDG_networks
 Author: Niek Mooij

{rdg_networks-0.3.7 → rdg_networks-0.3.8}/RDG_Networks.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RDG-Networks
-Version: 0.3.7
+Version: 0.3.8
 Summary: Most of the code from the RDG Networks project
 Home-page: https://github.com/NiekMooij/RDG_networks
 Author: Niek Mooij

{rdg_networks-0.3.7 → rdg_networks-0.3.8}/RDG_Networks.egg-info/SOURCES.txt

@@ -20,6 +20,6 @@ RDG_networks/save_to_stl.py
 RDG_networks/thickness/Classes.py
 RDG_networks/thickness/__init__.py
 RDG_networks/thickness/generate_line_segments_thickness.py
-RDG_networks/thickness/generate_line_segments_thickness_orientation.py
 RDG_networks/thickness/generate_line_segments_thickness_static.py
+RDG_networks/thickness/orientate_network.py
 RDG_networks/thickness/sample_in_polygon.py

{rdg_networks-0.3.7 → rdg_networks-0.3.8}/RDG_Networks.egg-info/entry_points.txt

@@ -6,10 +6,10 @@ generate_line_segments = RDG_networks.generate_line_segments:main
 generate_line_segments_dynamic = RDG_networks.generate_line_segments_dynamic:main
 generate_line_segments_static = RDG_networks.generate_line_segments_static:main
 generate_line_segments_thickness = RDG_networks.thickness.generate_line_segments_thickness:main
-generate_line_segments_thickness_orientation = RDG_networks.thickness.generate_line_segments_dynamic_orientation:main
 generate_line_segments_thickness_static = RDG_networks.generate_line_segments_thickness_static:main
 get_alignment_mean = RDG_networks.thickness.get_alignment_mean:main
 get_intersection_segments = RDG_networks.get_intersection_segments:main
+orientate_network = RDG_networks.thickness.orientate_network:main
 rotate_network = RDG_networks.thickness.rotate_network:main
 save_to_stl = RDG_networks.save_to_stl:main
 translate_network = RDG_networks.thickness.translate_network:main

{rdg_networks-0.3.7 → rdg_networks-0.3.8}/RDG_networks/__init__.py

@@ -8,17 +8,17 @@ from .generate_line_segments_dynamic import generate_line_segments_dynamic
 from .generate_line_segments_static import generate_line_segments_static
 from .draw_segments import draw_segments
 from .thickness.generate_line_segments_thickness import generate_line_segments_thickness
-from .thickness.generate_line_segments_thickness_orientation import generate_line_segments_thickness_orientation
+from .thickness.orientate_network import orientate_network
 from .thickness.generate_line_segments_thickness_static import generate_line_segments_thickness_static
-from .thickness.generate_line_segments_thickness_orientation import translate_network
-from .thickness.generate_line_segments_thickness_orientation import clip_network
-from .thickness.generate_line_segments_thickness_orientation import rotate_network
-from .thickness.generate_line_segments_thickness_orientation import get_alignment_mean
+from .thickness.orientate_network import translate_network
+from .thickness.orientate_network import clip_network
+from .thickness.orientate_network import rotate_network
+from .thickness.orientate_network import get_alignment_mean
 from .save_to_stl import save_to_stl
 
 __all__ = ['generate_line_segments', 
            'generate_line_segments_thickness',
-           'generate_line_segments_thickness_orientation',
+           'orientate_network',
            'translate_network',
            'clip_network',
            'rotate_network',

rdg_networks-0.3.8/RDG_networks/thickness/__init__.py

@@ -0,0 +1,19 @@
+# __init__.py
+
+from .generate_line_segments_thickness import generate_line_segments_thickness
+from .orientate_network import orientate_network
+from .generate_line_segments_thickness_static import generate_line_segments_thickness_static
+from .orientate_network import translate_network
+from .orientate_network import clip_network
+from .orientate_network import rotate_network
+from .orientate_network import get_alignment_mean
+
+__all__ = [
+           'generate_line_segments_thickness',
+           'orientate_network',
+           'generate_line_segments_thickness_static',
+           'translate_network',
+           'clip_network',
+           'rotate_network',
+           'get_alignment_mean'
+           ]

{rdg_networks-0.3.7 → rdg_networks-0.3.8}/RDG_networks/thickness/generate_line_segments_thickness.py

@@ -142,10 +142,10 @@ def pick_item_with_probability(
 def get_location_and_direction(
     polygon_arr: Dict[str, Dict[str, object]], 
     thickness: float, 
+    angle: float,
     nucleation_point: Tuple[float, float] = None,
     min_distance: float = 0,
-    max_attempts: int = 1000, 
-    angles: Union[str, List[float]] = 'uniform'
+    max_attempts: int = 1000
 ) -> Union[Tuple[str, Dict[str, object], Tuple[float, float], np.ndarray, np.ndarray], bool]:
     """
     Attempts to find a valid location and direction within a polygon for placing a new segment. The direction can either be randomly 
@@ -159,8 +159,8 @@ def get_location_and_direction(
             The thickness of the segment that needs to fit inside the polygon.
         max_attempts (int, optional): 
             The maximum number of attempts to find a valid location and direction. Defaults to 1000.
-        angles (Union[str, List[float]], optional): 
-            A string ('uniform' for random directions) or a list of angles (in radians) to choose the direction from. Defaults to 'uniform'.
+        angle (float): 
+            A float indicating the angle of the new segment.
         nucleation_point (Tuple[float, float], optional): 
             predified nucleation point for the segment. Defaults to None.
         min_distance (float, optional): 
@@ -178,16 +178,8 @@ def get_location_and_direction(
                 - The angle of the segment.
             - Returns `False` if no valid location and direction are found after the maximum attempts.
     """
-    
-    # Generate a new direction based on the angles parameter
-    if angles == 'uniform':
-        angle_new = random.uniform(-np.pi, np.pi)
-        direction = (np.cos(angle_new), np.sin(angle_new))
-        direction = direction / np.linalg.norm(direction)  # Normalize the direction vector
-    else:
-        angle_new = random.choice(angles)
-        direction = (np.cos(angle_new), np.sin(angle_new))
-        direction = np.array(direction) / np.linalg.norm(direction)
+    direction = (np.cos(angle), np.sin(angle))
+    direction = np.array(direction) / np.linalg.norm(direction)
     
     # Try to find a valid location and direction up to max_attempts
     attempt = 0
@@ -215,7 +207,7 @@ def get_location_and_direction(
         
         # Check if both endpoints of the segment are inside the polygon
         if is_inside_polygon(polygon['vertices'], p1) and is_inside_polygon(polygon['vertices'], p2):
-            return polygon_id, polygon, location_new, direction, perpendicular, angle_new
+            return polygon_id, polygon, location_new, direction, perpendicular, angle
         
         attempt += 1
     
@@ -451,7 +443,7 @@ def add_line_segment(
     segments_dict: Dict[int, LineSegment], 
     polygon_arr: Dict[str, Dict[str, object]], 
     segment_thickness_dict: Dict[int, Polygon], 
-    angles: str = 'uniform',
+    angle: float,
     thickness: float = 0,
     nucleation_point: Tuple[float, float] = None,
     min_distance: float = 0,
@@ -480,7 +472,7 @@ def add_line_segment(
     """
     
     # Get a valid location and direction, or return False if none is found
-    loc = get_location_and_direction(polygon_arr, thickness, nucleation_point, min_distance, max_attempts=max_attempts, angles=angles)
+    loc = get_location_and_direction(polygon_arr, angle=angle, thickness=thickness, nucleation_point=nucleation_point, min_distance=min_distance, max_attempts=max_attempts)
     if loc:
         polygon_id, polygon, location_new, direction_new, perpendicular, angle_new = loc
     else:
@@ -560,8 +552,7 @@ def generate_line_segments_thickness(
     Args:
         size (int): The number of line segments to generate.
         thickness_arr (List[float]): A list containing the thickness values for each segment to be generated.
-        angles (str): The angle distribution method for generating segments. Defaults to 'uniform'.
-                List[float]: list of angles in radians.
+        angles (str): Angle used in the generation of the segments.
         config (List[List[float]]): A list of configurations for the nucleation points and angles.
         epsilon (float): the minimum distance between two line.
         box_size (float): the size of the box.
@@ -615,7 +606,7 @@ def generate_line_segments_thickness(
                                     thickness=thickness_arr[i], 
                                     min_distance = epsilon,
                                     nucleation_point = nucleation_point, 
-                                    angles=angles,
+                                    angle=angles[i],
                                     box_size=box_size)
         if output:
             segments_dict, polygon_arr, segment_thickness_dict, location, angle = output

{rdg_networks-0.3.7 → rdg_networks-0.3.8}/RDG_networks/thickness/generate_line_segments_thickness_static.py

@@ -105,7 +105,7 @@ def seeds(number_of_lines, radius = 0.015, number_of_trials = 10000):
         if trial <= number_of_trials:
             nucleation_points += [new_points]
             angles = [0, np.pi/4, np.pi/2, 3*np.pi/4]
-            angle_new = random.uniform(0, 2*np.pi) #random.choice(angles)#np.pi #random.uniform(0, 2*np.pi)
+            angle_new = random.uniform(0, 2*np.pi)
             angle += [angle_new]
             Line[line_id] = [ new_points ,angle_new]
             line_id += 1

rdg_networks-0.3.7/RDG_networks/thickness/generate_line_segments_thickness_orientation.py → rdg_networks-0.3.8/RDG_networks/thickness/orientate_network.py

@@ -1,8 +1,8 @@
 import numpy as np
+import math
 from typing import List, Dict, Tuple
 from shapely.geometry import Polygon as Polygon_Shapely
 from shapely.geometry import LineString, box
-from concurrent.futures import ProcessPoolExecutor
 from .Classes import LineSegment, Polygon
 
 def rotate(point, center, rotation_matrix):
@@ -13,7 +13,9 @@ def rotate(point, center, rotation_matrix):
     rotation_matrix: 2x2 numpy array representing the rotation matrix
     """
     translated_point = point - center
-    rotated_point = np.dot(rotation_matrix, translated_point)
+
+    # rotated_point = np.dot(rotation_matrix, translated_point)
+    rotated_point = rotation_matrix@translated_point
     final_point = rotated_point + center
 
     return final_point
@@ -30,16 +32,22 @@ def angle_between(v1, v2):
 
 def get_alignment_mean(line_vector_arr, director):
     """Get the mean alignment."""
-    S_all = []
+    S_all = 0
+    total_mass = 0
     for item in line_vector_arr:
         line_vector = item['line_vector']
+        vector_diff = np.array(line_vector[1]) - np.array(line_vector[0])
+
         area = item['area']
-        P2 = 0.5*(3*(np.cos(angle_between(line_vector, director)))**2-1)
-        S_all.append(P2*area)
+        align = math.cos(angle_between(vector_diff, director))**2
+        S_all += align*area
+        total_mass += area
 
-    return float(np.mean(S_all))
+    output = S_all / total_mass
 
-def compute_alignment_for_angle(
+    return output
+
+def compute_alignment(
     angle: float, 
     segment_thickness_dict: dict[str, Polygon],
     director: np.ndarray, 
@@ -69,7 +77,7 @@ def compute_alignment_for_angle(
     tuple[float, float]
         A tuple where the first element is the input angle and the second element is the computed alignment value.
     """
-    box_center = (np.array(box_measurements[0]) + np.array(box_measurements[2])) / 2
+    box_center = np.array((box_measurements[0]) + np.array(box_measurements[2])) / 2
 
     # Rotate network
     segment_thickness_dict_new = rotate_network(segment_thickness_dict, rotate_angle=angle, box_center=box_center)
@@ -79,13 +87,38 @@ def compute_alignment_for_angle(
 
     line_vectors = [
         {'line_vector': [seg.middle_segment.start, seg.middle_segment.end], 'area': seg.area()}
-        for seg in segment_thickness_dict_new.values()
+        for seg in segment_thickness_dict_new.values() if seg.middle_segment is not None
     ]
 
     alignment = get_alignment_mean(line_vectors, director)
-
+    
     return angle, alignment
 
+def get_max_alignment(
+    segment_thickness_dict: dict, 
+    director: np.ndarray, 
+    box_measurements: list[float], 
+    grid_points: int = 360
+) -> float:
+    """Find the angle with the maximum alignment using parallel processing."""
+    # Create a list of angles to evaluate
+    angles = np.linspace(0, np.pi, grid_points)
+
+    results = []
+    for a in angles:
+        result = compute_alignment(a, segment_thickness_dict, director, box_measurements)
+        results.append(result)
+
+    # Find the angle with the maximum alignment
+    max_alignment = 0
+    max_angle = None
+    for angle, alignment in results:
+        if alignment > max_alignment:
+            max_alignment = alignment
+            max_angle = angle
+
+    return max_angle
+
 def rotate_network(
     segment_thickness_dict: dict[str, Polygon],
     rotate_angle: float, 
@@ -256,74 +289,12 @@ def translate_network(
 
     return segment_thickness_dict_new
 
-def get_alignment_mean(line_vector_arr, director):
-    """Get the mean alignment."""
-    S_all = []
-    for item in line_vector_arr:
-        line_vector = item['line_vector']
-        area = item['area']
-        P2 = 0.5*(3*(np.cos(angle_between(line_vector, director)))**2-1)
-        S_all.append(P2*area)
-
-    return float(np.mean(S_all))
-
-def compute_alignment_for_angle(
-    segment_thickness_dict: dict,
-    angle: float, 
-    box_center,
-    director: np.ndarray, 
-) -> tuple[float, float]:
-    """Compute the alignment for a given angle."""
-    
-    # Rotate the segment network for the given angle
-    segment_thickness_dict_rotated = rotate_network(segment_thickness_dict, rotate_angle=angle, box_center=box_center)
-    
-    # Create line vectors from the rotated segments
-    line_vectors = [] 
-    for s in segment_thickness_dict_rotated.values():
-        line_vectors.append({'line_vector': np.array([s.middle_segment.start, s.middle_segment.end]), 'area': s.area()})
-
-    # Compute the alignment for the current angle
-    alignment = get_alignment_mean(line_vectors, director)
-    return angle, alignment
-
-def get_max_alignment_angle(
-    segment_thickness_dict: dict, 
-    director: np.ndarray, 
-    box_measurements: list[float], 
-    grid_points: int = 360
-) -> float:
-    """Find the angle with the maximum alignment using parallel processing."""
-    
-    # Create a list of angles to evaluate
-    angles = np.linspace(0, 2 * np.pi, grid_points)
-
-    # Use ProcessPoolExecutor for parallel computation of alignment
-    with ProcessPoolExecutor() as executor:
-        # Submit tasks to the pool for each angle
-        results = list(executor.map(
-            compute_alignment_for_angle, 
-            [segment_thickness_dict] * len(angles),  # Same segment dictionary for all angles
-            angles,                                 # Different angles
-            [box_measurements] * len(angles),       # Same box measurements for all angles
-            [director] * len(angles)                # Same director for all angles
-        ))
-
-    # Find the angle with the maximum alignment
-    max_alignment = 0
-    max_angle = 0
-    for angle, alignment in results:
-        if alignment > max_alignment:
-            max_alignment = alignment
-            max_angle = angle
-
-    return max_angle
-
-def generate_line_segments_thickness_orientation(
+def orientate_network(
     data_dict: Dict[str, dict], 
     orientation: List[int], 
     grid_points: int = 360, 
-    box_measurements: List[Tuple[float, float]] = [(0, 0), (0, 1), (1, 1), (1, 0)]
+    box_measurements: List[Tuple[float, float]] = [(0, 0), (0, 1), (1, 1), (1, 0)],
+    director: np.ndarray = np.array([0, 1])
 ) -> List[Dict[str, dict]]:
     """
     Generates a set of networks of line segments with different thicknesses and orientations, and clips them to fit 
@@ -354,36 +325,33 @@ def generate_line_segments_thickness_orientation(
     
     # Extract the segment thickness dictionary from the input data
     segment_thickness_dict = data_dict['segment_thickness_dict']
-
-    # Define the director vector along the y-axis
-    director = np.array([0, 1])
     
     # Find the angle that aligns the network most with the y-axis
-    max_angle = get_max_alignment_angle(segment_thickness_dict, director, box_measurements, grid_points)
-
+    max_angle = get_max_alignment(segment_thickness_dict, director, box_measurements, grid_points)
+    
     # Store the initial unmodified configuration
     output = [{'orientation': 'original', 'data_dict': data_dict}]
     
     # Loop through each given orientation, rotate, clip, and translate the network
     for o in orientation:
         # Compute the rotation angle for the current orientation relative to max alignment
-        rotate_angle = o - max_angle
+        rotate_angle = -max_angle + o
         
         # Rotate the network by the computed angle
-        segment_thickness_dict_new = rotate_network(segment_thickness_dict, rotate_angle=rotate_angle, box_center=box_center)
+        segment_thickness_dict_rotated = rotate_network(segment_thickness_dict, rotate_angle=rotate_angle, box_center=box_center)
 
         # Clip the rotated network to fit within the bounding box
-        segment_thickness_dict_new = clip_network(segment_thickness_dict_new, box_measurements=box_measurements)
+        segment_thickness_dict_clipped = clip_network(segment_thickness_dict_rotated, box_measurements=box_measurements)
 
         # Translate the clipped network to start at the origin (0,0)
         translation_vector = -np.array(box_measurements[0])
-        segment_thickness_dict_new = translate_network(segment_thickness_dict_new, translation_vector)
+        segment_thickness_dict_translated = translate_network(segment_thickness_dict_clipped, translation_vector)
     
         # Prepare a new data dictionary with the transformed segment information
         data_dict_new = {
             'segments_dict': None,
             'polygon_arr': None,
-            'segment_thickness_dict': segment_thickness_dict_new,
+            'segment_thickness_dict': segment_thickness_dict_translated,
             'jammed': None,
             'generated_config': None
         }

{rdg_networks-0.3.7 → rdg_networks-0.3.8}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='RDG-Networks',
-    version='0.3.7',
+    version='0.3.8',
     author='Niek Mooij',
     author_email='mooij.niek@gmail.com',
     description='Most of the code from the RDG Networks project',
@@ -26,7 +26,7 @@ setup(
             'generate_line_segments=RDG_networks.generate_line_segments:main',
             'generate_line_segments_thickness=RDG_networks.thickness.generate_line_segments_thickness:main',
             
-            'generate_line_segments_thickness_orientation=RDG_networks.thickness.generate_line_segments_dynamic_orientation:main',
+            'orientate_network=RDG_networks.thickness.orientate_network:main',
 
             'translate_network=RDG_networks.thickness.translate_network:main',
             'clip_network=RDG_networks.thickness.clip_network:main',

rdg_networks-0.3.7/RDG_networks/thickness/__init__.py

@@ -1,19 +0,0 @@
-# __init__.py
-
-from .generate_line_segments_thickness import generate_line_segments_thickness
-from .generate_line_segments_thickness_orientation import generate_line_segments_thickness_orientation
-from .generate_line_segments_thickness_static import generate_line_segments_thickness_static
-from .generate_line_segments_thickness_orientation import translate_network
-from .generate_line_segments_thickness_orientation import clip_network
-from .generate_line_segments_thickness_orientation import rotate_network
-from .generate_line_segments_thickness_orientation import get_alignment_mean
-
-__all__ = [
-           'generate_line_segments_thickness',
-           'generate_line_segments_thickness_orientation',
-           'generate_line_segments_thickness_static',
-           'translate_network',
-           'clip_network',
-           'rotate_network',
-           'get_alignment_mean'
-           ]