Move to nodes per segment and fixed cylinder length

Author: abhinavj98

examples/Envy/Envy.lpy

@@ -195,9 +195,12 @@ grow_object(plant_segment) :
       # Add color visualization if labeling is enabled -- Can this be moved to the start of building the segment?
       r, g, b = plant_segment.info.color
       nproduce SetColor(r,g,b)
-    #Produce internode segment
-    nproduce I(plant_segment.growth.growth_length, plant_segment.growth.thickness, plant_segment)
-    #Produce bud
+    #Produce internode segments (n cylinders per growth step)
+    n_cylinders = int(plant_segment.growth.growth_length / plant_segment.growth.cylinder_length)
+    for i in range(n_cylinders):
+      nproduce I(plant_segment.growth.cylinder_length, plant_segment.growth.thickness, plant_segment)
+    
+    #Produce bud (after all cylinders in this growth step)
     if plant_segment.pre_bud_rule(plant_segment, simulation_config):
       for module in plant_segment.post_bud_rule(plant_segment, simulation_config):
               nproduce new(module[0], *module[1])

examples/Envy/Envy_prototypes.py

@@ -14,7 +14,9 @@ def __init__(self, config=None, copy_from=None, prototype_dict: dict = {}):
         super().__init__(config, copy_from, prototype_dict)
 
     def is_bud_break(self, num_buds_segment):
-        return (rd.random() < 0.1)
+        if num_buds_segment >= self.growth.max_buds_segment:
+            return False
+        return (rd.random() < 0.1 * (1 - num_buds_segment / self.growth.max_buds_segment))
 
     def create_branch(self):
         return None
@@ -29,15 +31,13 @@ def post_bud_rule(self, plant_segment, simulation_config):
 class Branch(TreeBranch):
     def __init__(self, config=None, copy_from=None, prototype_dict: dict = {}):
         super().__init__(config, copy_from, prototype_dict)
-        self.num_buds_segment = 0
 
     def is_bud_break(self, num_break_buds):
-        if num_break_buds >= 1:
+        if num_break_buds >= self.growth.max_buds_segment:
             return False
-        return (rd.random() < 0.5*(1 - self.num_buds_segment/self.growth.max_buds_segment))
+        return (rd.random() < 0.5 * (1 - num_break_buds / self.growth.max_buds_segment))
 
     def create_branch(self):
-        self.num_buds_segment += 1
         if rd.random() > 0.8:
             new_ob = NonTrunk(copy_from=self.prototype_dict['nontrunk'])
         else:
@@ -57,7 +57,9 @@ def __init__(self, config=None, copy_from=None, prototype_dict: dict = {}):
         super().__init__(config, copy_from, prototype_dict)
 
     def is_bud_break(self, num_buds_segment):
-        if (rd.random() > 0.1*(1 - num_buds_segment/self.growth.max_buds_segment)):
+        if num_buds_segment >= self.growth.max_buds_segment:
+            return False
+        if (rd.random() > 0.1 * (1 - num_buds_segment / self.growth.max_buds_segment)):
             return False
         return True
 
@@ -79,7 +81,9 @@ def __init__(self, config=None, copy_from=None, prototype_dict: dict = {}):
         super().__init__(config, copy_from, prototype_dict)
 
     def is_bud_break(self, num_buds_segment):
-        return (rd.random() < 0.5*(1 - num_buds_segment/self.growth.max_buds_segment))
+        if num_buds_segment >= self.growth.max_buds_segment:
+            return False
+        return (rd.random() < 0.5 * (1 - num_buds_segment / self.growth.max_buds_segment))
 
     def create_branch(self):
         if rd.random() > 0.3:
@@ -104,7 +108,8 @@ def post_bud_rule(self, plant_segment, simulation_config):
     tie_axis=None,
     max_length=0.2,
     thickness=0.003,
-    growth_length=0.05,  # growth_length/2 from original
+    growth_length=0.05,
+    cylinder_length=0.05,
     thickness_increment=0.,
     color=[0, 255, 0],
     bud_spacing_age=2,
@@ -115,11 +120,12 @@ def post_bud_rule(self, plant_segment, simulation_config):
 )
 
 branch_config = BasicWoodConfig(
-    max_buds_segment=30,
+    max_buds_segment=2,
     tie_axis=(1, 0, 0),
     max_length=2.2,
     thickness=0.01,
     growth_length=0.1,
+    cylinder_length=0.05,
     thickness_increment=0.00001,
     color=[255, 150, 0],
     bud_spacing_age=2,
@@ -135,6 +141,7 @@ def post_bud_rule(self, plant_segment, simulation_config):
     max_length=4,
     thickness=0.01,
     growth_length=0.1,
+    cylinder_length=0.05,
     thickness_increment=0.00001,
     color=[255, 0, 0],
     bud_spacing_age=2,
@@ -149,7 +156,8 @@ def post_bud_rule(self, plant_segment, simulation_config):
     tie_axis=None,
     max_length=0.3,
     thickness=0.003,
-    growth_length=0.05,  # growth_length/2 from original
+    growth_length=0.05,
+    cylinder_length=0.05,
     thickness_increment=0.00001,
     color=[0, 255, 0],
     bud_spacing_age=2,

examples/UFO/UFO.lpy

@@ -115,11 +115,11 @@ def EndEach(lstring):
         while tie(lstring, simulation_config):
             pass  # Continue until no more tying operations are possible
 
-        # Check if this is also a pruning iteration
-        if current_iteration % pruning_interval_iterations == 0:
-            # Prune branches until no more can be pruned
-            while prune(lstring, simulation_config):
-                pass
+    # Check if this is also a pruning iteration
+    if current_iteration % pruning_interval_iterations == 0:
+        # Prune branches until no more can be pruned
+        while prune(lstring, simulation_config):
+            pass
 
     return lstring
 
@@ -195,9 +195,12 @@ grow_object(plant_segment) :
       # Add color visualization if labeling is enabled -- Can this be moved to the start of building the segment?
       r, g, b = plant_segment.info.color
       nproduce SetColor(r,g,b)
-    #Produce internode segment
-    nproduce I(plant_segment.growth.growth_length, plant_segment.growth.thickness, plant_segment)
-    #Produce bud
+    #Produce internode segments (n cylinders per growth step)
+    n_cylinders = int(plant_segment.growth.growth_length / plant_segment.growth.cylinder_length)
+    for i in range(n_cylinders):
+      nproduce I(plant_segment.growth.cylinder_length, plant_segment.growth.thickness, plant_segment)
+    
+    #Produce bud (after all cylinders in this growth step)
     if plant_segment.pre_bud_rule(plant_segment, simulation_config):
       for module in plant_segment.post_bud_rule(plant_segment, simulation_config):
               nproduce new(module[0], *module[1])

examples/UFO/UFO_prototypes.py

@@ -15,7 +15,7 @@ def __init__(self, config=None, copy_from=None, prototype_dict: dict = {}):
   def is_bud_break(self, num_buds_segment):
     if num_buds_segment >= self.growth.max_buds_segment:
       return False
-    return (rd.random() < 0.1)
+    return (rd.random() < 0.1 * (1 - num_buds_segment / self.growth.max_buds_segment))
 
   def create_branch(self):
     return None
@@ -36,10 +36,9 @@ def __init__(self, config=None, copy_from=None, prototype_dict: dict = {}):
     super().__init__(config, copy_from, prototype_dict)
 
   def is_bud_break(self, num_buds_segment):
-    if num_buds_segment >= 2:
+    if num_buds_segment >= self.growth.max_buds_segment:
       return False
-    if (rd.random() < 0.005*self.growth.growth_length*(1 - self.num_buds/self.growth.max_buds_segment)):
-      self.num_buds +=1
+    if (rd.random() < 0.005*self.growth.growth_length * (1 - num_buds_segment / self.growth.max_buds_segment)):
       return True  
 
   def create_branch(self):
@@ -60,9 +59,9 @@ def __init__(self, config=None, copy_from=None, prototype_dict: dict = {}):
     super().__init__(config, copy_from, prototype_dict)
 
   def is_bud_break(self, num_buds_segment):
-      if num_buds_segment >= 2:
+      if num_buds_segment >= self.growth.max_buds_segment:
         return False
-      if (rd.random() < 0.2*(1 - self.num_buds/self.growth.max_buds_segment)):
+      if (rd.random() < 0.2 * (1 - num_buds_segment / self.growth.max_buds_segment)):
 
         return True  
 
@@ -91,9 +90,8 @@ def __init__(self, config=None, copy_from=None, prototype_dict: dict = {}):
   def is_bud_break(self, num_buds_segment):
     if num_buds_segment >= self.growth.max_buds_segment:
       return False
-    if (rd.random() > 0.05*self.length/self.growth.max_length*(1 - self.num_buds/self.growth.max_buds_segment)):
+    if (rd.random() > 0.05*self.length/self.growth.max_length * (1 - num_buds_segment / self.growth.max_buds_segment)):
       return False
-    self.num_buds+=1
     return True
 
   def create_branch(self):
@@ -113,12 +111,13 @@ def post_bud_rule(self, plant_segment, simulation_config ):
 
 # Create configs for cleaner prototype setup
 spur_config = BasicWoodConfig(
-    max_buds_segment=5,
+    max_buds_segment=2,
     tie_axis=None, 
     max_length=0.1, 
     thickness=0.003, 
-    growth_length=0.05, 
-    thickness_increment=0., 
+    growth_length=0.05,
+    cylinder_length=0.01,
+    thickness_increment=0.,
     color=[0, 255, 0],
     bud_spacing_age=1,  # Spurs bud every 1 age unit
     curve_x_range=(-0.2, 0.2),  # Tighter bounds for spur curves
@@ -127,12 +126,13 @@ def post_bud_rule(self, plant_segment, simulation_config ):
 )
 
 side_branch_config = BasicWoodConfig(
-    max_buds_segment=40,
+    max_buds_segment=2,
     tie_axis=None, 
     max_length=0.25, 
     thickness=0.003, 
-    growth_length=0.05, 
-    thickness_increment=0.00001, 
+    growth_length=0.05,
+    cylinder_length=0.01,
+    thickness_increment=0.00001,
     color=[0, 255, 0],
     bud_spacing_age=2,  # Tertiary branches bud every 3 age units
     curve_x_range=(-0.5, 0.5),  # Moderate bounds for tertiary branches
@@ -141,12 +141,13 @@ def post_bud_rule(self, plant_segment, simulation_config ):
 )
 
 trunk_config = BasicWoodConfig(
-    max_buds_segment=60,
+    max_buds_segment=5,
     tie_axis=(1, 0, 0), 
     max_length=3, 
     thickness=0.02, 
     thickness_increment=0.00001, 
-    growth_length=0.1, 
+    growth_length=0.1,
+    cylinder_length=0.02,
     color=[255, 0, 0],
     bud_spacing_age=2,  # Trunk buds every 4 age units
     curve_x_range=(-0.3, 0.3),  # Conservative bounds for trunk
@@ -156,12 +157,13 @@ def post_bud_rule(self, plant_segment, simulation_config ):
 )
 
 branch_config = BasicWoodConfig(
-    max_buds_segment=140,
+    max_buds_segment=2,
     tie_axis=(0, 0, 1), 
     max_length=2.5, 
     thickness=0.01, 
     thickness_increment=0.00001, 
-    growth_length=0.1, 
+    growth_length=0.1,
+    cylinder_length=0.02,
     color=[255, 150, 0],
     bud_spacing_age=2,  # Branches bud every 2 age units
     curve_x_range=(-0.4, 0.4),  # Moderate bounds for primary branches

simulation_base.py

@@ -305,7 +305,6 @@ def tie(self, lstring):
                 if branch.tying.guide_points:
                     # Perform the tying operation
                     branch.tying.tie_updated = False
-                    branch.tying.guide_target.add_branch()
 
                     # Update the L-System string with tying modifications
                     lstring, modifications_count = branch.tie_lstring(lstring, position)

stochastic_tree.py

@@ -48,10 +48,11 @@ def __post_init__(self):
 @dataclass
 class GrowthState:
     """Growth parameters for a wood object."""
-    max_buds_segment: int = 5
+    max_buds_segment: int = 5  # Total cumulative buds allowed across the entire branch segment (not per node)
     thickness: float = 0.1
     thickness_increment: float = 0.01
     growth_length: float = 1.0
+    cylinder_length: float = 0.1
     max_length: float = 7.0
 
 @dataclass
@@ -75,10 +76,11 @@ def __post_init__(self):
 class BasicWoodConfig:
     """Configuration parameters for BasicWood initialization."""
     copy_from: any = None
-    max_buds_segment: int = 5
+    max_buds_segment: int = 5  # Total cumulative buds allowed across the entire branch segment (not per node)
     thickness: float = 0.1
     thickness_increment: float = 0.01
     growth_length: float = 1.0
+    cylinder_length: float = 0.1  # Length of each individual cylinder
     max_length: float = 7.0
     tie_axis: tuple = None
     order: int = 0
@@ -130,6 +132,7 @@ def __init__(self, config=None, copy_from=None, **kwargs):
       curve_x_range = config.curve_x_range
       curve_y_range = config.curve_y_range
       curve_z_range = config.curve_z_range
+      cylinder_length = config.cylinder_length
     elif copy_from is None:
       raise ValueError("config must be provided when copy_from is None")
 
@@ -150,6 +153,7 @@ def __init__(self, config=None, copy_from=None, **kwargs):
         thickness=thickness,
         thickness_increment=thickness_increment,
         growth_length=growth_length,
+        cylinder_length=cylinder_length,
         max_length=max_length
     )
     # Bud spacing for L-System rules