Refactored helper.py

Author: Gemini

examples/UFO/UFO.lpy

@@ -8,7 +8,8 @@ import time
 from helper import *
 import numpy as np
 import random as rd
-from examples.UFO.UFOconfigs import basicwood_prototypes, Trunk, Branch, TertiaryBranch, Spur, UFOSimulationConfig, generate_points_ufo
+from examples.UFO.UFO_prototypes import basicwood_prototypes, Trunk
+from examples.UFO.UFO_simulation import UFOSimulationConfig, generate_points_ufo, get_energy_mat, decide_guide, tie, prune
 from dataclasses import dataclass
 
 
@@ -20,7 +21,7 @@ simulation_config = UFOSimulationConfig()
 
 
 
-trellis_support = Support(generate_points_ufo(), simulation_config.support_num_wires, simulation_config.support_spacing_wires, simulation_config.support_trunk_wire_point)
+trellis_support = Support(generate_points_ufo(simulation_config), simulation_config.support_num_wires, simulation_config.support_spacing_wires, simulation_config.support_trunk_wire_point)
 tying_interval_iterations = simulation_config.num_iteration_tie
 pruning_interval_iterations = simulation_config.num_iteration_prune
 main_trunk.tying.guide_target = trellis_support.trunk_wire
@@ -150,7 +151,7 @@ module WoodStart     # Starting point of wood segments (used for tying operation
 # GLOBAL L-SYSTEM PARAMETERS
 # -----------------------------------------------------------------------------
 # Create a growth guide curve for the initial trunk development
-trunk_guide_curve = create_bezier_curve(x_range = (-1, 1), y_range = (-1, 1), z_range = (0, 10), seed_val=time.time())
+trunk_guide_curve = create_bezier_curve(x_range = (-1, 1), y_range = (-1, 1), z_range = (0, 10), seed_value=time.time())
 
 # -----------------------------------------------------------------------------
 # AXIOM (STARTING STRING)
@@ -223,7 +224,7 @@ bud(bud_parameters) :
    if hasattr(new_branch, 'curve_x_range'):
      # Curved branches: set up custom growth guide curve
      import time
-     curve = create_bezier_curve(x_range=new_branch.curve_x_range, y_range=new_branch.curve_y_range, z_range=new_branch.curve_z_range, seed_val=time.time())
+     curve = create_bezier_curve(x_range=new_branch.curve_x_range, y_range=new_branch.curve_y_range, z_range=new_branch.curve_z_range, seed_value=time.time())
      nproduce[@GcSetGuide(curve, new_branch.growth.max_length)
    else:
      # Straight branches: use default orientation

examples/UFO/UFOconfigs.py renamed to examples/UFO/UFO_prototypes.py

@@ -146,75 +146,4 @@ def create_branch(self):
 
 
 
-@dataclass
-class UFOSimulationConfig:
-    """Configuration for UFO trellis tree simulation parameters."""
-    
-    # Tying and Pruning
-    num_iteration_tie: int = 8
-    num_iteration_prune: int = 16
-    
-    # Display
-    label: bool = True
-    
-    # Support Structure
-    support_trunk_wire_point: tuple = (0.6, 0, 0.4)
-    support_num_wires: int = 7
-    support_spacing_wires: int = 1
-    
-    # Point Generation
-    ufo_x_range: tuple = (0.65, 3)
-    ufo_x_spacing: float = 0.3
-    ufo_z_value: float = 1.4
-    ufo_y_value: float = 0
-    
-    # Energy and Tying Parameters
-    energy_distance_weight: float = 0.5  # Weight for distance in energy calculation (was hardcoded /2)
-    energy_threshold: float = 1.0  # Maximum energy threshold for tying
-    
-    # Pruning Parameters
-    pruning_age_threshold: int = 8  # Age threshold for pruning untied branches
-    
-    # L-System Parameters
-    derivation_length: int = 160  # Number of derivation steps
-    
-    # Growth Parameters
-    thickness_multiplier: float = 1.2  # Multiplier for internode thickness
-    bud_age_tolerance: float = 0.01  # Tolerance for age-based bud spacing
-    
-    # Visualization Parameters
-    attractor_point_width: int = 10  # Width of attractor points in visualization
-
-def generate_points_ufo():
-    """
-    Generate 3D points for the UFO trellis wire structure.
-    
-    Creates a linear array of wire attachment points along the x-axis at a fixed
-    height (z) and depth (y). The points are spaced evenly within the configured
-    x-range and used to construct the trellis support structure.
-    
-    Returns:
-        list: List of (x, y, z) tuples representing wire attachment points,
-              where all points share the same y and z coordinates.
-              
-    Configuration parameters used:
-        - ufo_x_range: Tuple (min_x, max_x) defining the range of x coordinates
-        - ufo_x_spacing: Spacing between consecutive x coordinates
-        - ufo_z_value: Fixed z-coordinate (height) for all points
-        - ufo_y_value: Fixed y-coordinate (depth) for all points
-    """
-    x = np.arange(
-        simulation_config.ufo_x_range[0],
-        simulation_config.ufo_x_range[1], 
-        simulation_config.ufo_x_spacing
-    ).astype(float)
-    z = np.full((x.shape[0],), simulation_config.ufo_z_value).astype(float)
-    y = np.full((x.shape[0],), simulation_config.ufo_y_value).astype(float)
-    
-    wire_attachment_points = []
-    for point_index in range(x.shape[0]):
-        wire_attachment_points.append((x[point_index], y[point_index], z[point_index]))
-    
-    return wire_attachment_points
-