Working Envy and UFO after refactor:

Author: Gemini

examples/Camp_Envy_tie_prune_label.lpy

@@ -246,12 +246,12 @@ def get_energy_mat(branches, arch):
   energy_matrix = np.ones((num_branches,num_wires))*np.inf
   #print(energy_matrix.shape)
   for branch_id, branch in enumerate(branches):
-    if branch.has_tied:
+    if branch.tying.has_tied:
       continue
     for wire_id, wire in arch.branch_supports.items():
       if wire.num_branch>=1:
         continue
-      energy_matrix[branch_id][wire_id] = ed(wire.point,branch.end)/2+ed(wire.point,branch.start)/2#+v.num_branches*10+branch.bend_energy(deflection, curr_branch.age)
+      energy_matrix[branch_id][wire_id] = ed(wire.point,branch.location.end)/2+ed(wire.point,branch.location.start)/2#+v.num_branches*10+branch.bend_energy(deflection, curr_branch.info.age)
 
   return energy_matrix
 
@@ -261,9 +261,9 @@ def decide_guide(energy_matrix, branches, arch):
     #print(min_arg)
     if(energy_matrix[min_arg[0][0]][min_arg[0][1]] == np.inf) or energy_matrix[min_arg[0][0]][min_arg[0][1]] > 1:
       return
-    if not (branches[min_arg[0][0]].has_tied == True):# and not (arch.branch_supports[min_arg[0][1]].num_branch >=1):
+    if not (branches[min_arg[0][0]].tying.has_tied == True):# and not (arch.branch_supports[min_arg[0][1]].num_branch >=1):
       #print("Imp:",min_arg[0][0], min_arg[0][1], energy_matrix[min_arg[0][0]][min_arg[0][1]])
-      branches[min_arg[0][0]].guide_target = arch.branch_supports[min_arg[0][1]]#copy.deepcopy(arch.branch_supports[min_arg[0][1]].point)
+      branches[min_arg[0][0]].tying.guide_target = arch.branch_supports[min_arg[0][1]]#copy.deepcopy(arch.branch_supports[min_arg[0][1]].point)
       #trellis_wires.trellis_pts[min_arg[0][1]].num_branches+=1
       for j in range(energy_matrix.shape[1]):
         energy_matrix[min_arg[0][0]][j] = np.inf
@@ -273,13 +273,13 @@ def decide_guide(energy_matrix, branches, arch):
 def tie(lstring):
   for j,i in enumerate(lstring):
     if i == 'C' and i[0].type.__class__.__name__ == 'Branch':
-      if i[0].type.tie_updated == False:
+      if i[0].type.tying.tie_updated == False:
         continue
       curr = i[0]
-      if i[0].type.guide_points:
-        #print("tying ", i[0].type.name, i[0].type.guide_target.point)
-        i[0].type.tie_updated = False
-        i[0].type.guide_target.add_branch()
+      if i[0].type.tying.guide_points:
+        #print("tying ", i[0].type.name, i[0].type.tying.guide_target.point)
+        i[0].type.tying.tie_updated = False
+        i[0].type.tying.guide_target.add_branch()
         lstring, count = i[0].type.tie_lstring(lstring, j)
 
         return True
@@ -289,7 +289,7 @@ def tie(lstring):
 def pruning_strategy(lstring): #Remove remnants of cut
   cut = False
   for j,i in enumerate(lstring):
-    if i.name == 'C' and i[0].type.age > 6 and i[0].type.has_tied == False and i[0].type.cut == False:
+    if i.name == 'C' and i[0].type.info.age > 6 and i[0].type.tying.has_tied == False and i[0].type.info.cut == False:
 
       i[0].type.cut = True      
       #print("Cutting", i[0].type.name) 
@@ -300,7 +300,7 @@ def pruning_strategy(lstring): #Remove remnants of cut
 def StartEach(lstring):
   global parent_child_dict
   for i in parent_child_dict[trunk_base.name]:
-      if i.tie_updated == False:
+      if i.tying.tie_updated == False:
         i.tie_update()
 
 
@@ -313,8 +313,8 @@ def EndEach(lstring):
     #print(energy_matrix)
     decide_guide(energy_matrix, parent_child_dict[trunk_base.name], support)
     for branch in parent_child_dict[trunk_base.name]:
-      branch.update_guide(branch.guide_target)
-      #print(branch.name, branch.guide_target)
+      branch.update_guide(branch.tying.guide_target)
+      #print(branch.name, branch.tying.guide_target)
     while tie(lstring):
       pass
     while pruning_strategy(lstring):
@@ -483,21 +483,21 @@ grow_object(o) :
   if o == None:
     produce *
   else:
-    if o.length >= o.max_length:
-      o.age += 1
+    if o.length >= o.growth.max_length:
+      o.info.age += 1
       nproduce *
     else:
       # Apply color
-      r, g, b = o.color
+      r, g, b = o.info.color
       nproduce SetColor(r, g, b)
       # set unique color ID
       smallest_color = [r, g, b].index(min([r, g, b]))
-      o.color[smallest_color] += 1
+      o.info.color[smallest_color] += 1
 
       # Check if it's a trunk or branch, then apply the contour
       if 'Trunk' in o.name or 'Branch' in o.name:
         #print("TRUNK BRANCH NAME:    " + o.name)
-        radius = o.thickness
+        radius = o.growth.thickness
         noise_factor = 0.8
         num_points = 60
         nproduce SetContour(o.contour)
@@ -507,7 +507,7 @@ grow_object(o) :
 
       o.grow_one()
       if 'Spur' in o.name:
-        produce I(o.growth_length, o.thickness, o) bud(ParameterSet(type=o, num_buds=0)) spiked_bud(o.thickness)grow_object(o)
+        produce I(o.growth.growth_length, o.growth.thickness, o) bud(ParameterSet(type=o, num_buds=0)) spiked_bud(o.growth.thickness)grow_object(o)
       elif 'Leaf' in o.name:
         produce L(.1)
       elif 'Apple' in o.name:
@@ -516,7 +516,7 @@ grow_object(o) :
         #produce [S(.1, .007)Ap]
         produce [S(.1/2, .09/15)f(.1)&(180)A(.1, .09)]
       else:
-        produce I(o.growth_length, o.thickness, o) bud(ParameterSet(type=o, num_buds=0)) grow_object(o)
+        produce I(o.growth.growth_length, o.growth.thickness, o) bud(ParameterSet(type=o, num_buds=0)) grow_object(o)
 #L(.1)
 
 bud(t) :
@@ -538,13 +538,13 @@ bud(t) :
    # set a curve for tertiary branches to follow as they grow  
    if 'NonTrunk' in new_object.name:
         import time
-        r, g, b = new_object.color
+        r, g, b = new_object.info.color
         seed = rgb_seed(r, g, b)
         curve = create_bezier_curve(seed=time.time())
-        nproduce [SetGuide(curve, new_object.max_length)
+        nproduce [SetGuide(curve, new_object.growth.max_length)
    else:
      nproduce [
-   nproduce @RGetPos(new_object.start)C(ParameterSet(type = new_object))/(rd.random()*360)&(rd.random()*90)grow_object(new_object)GetPos(new_object.end)]bud(t)
+   nproduce @RGetPos(new_object.location.start)C(ParameterSet(type = new_object))/(rd.random()*360)&(rd.random()*90)grow_object(new_object)GetPos(new_object.location.end)]bud(t)
 
 spiked_bud(r):
   base_height = r * 2
@@ -585,8 +585,8 @@ L(l):
   produce _(.0025) F(l/10){[SetGuide(curve1, l) _(.001).nF(l, .01)][SetGuide(curve2, l)_(.001).nF(l, .01)]}
 
 
-I(s,r,o) --> I(s,r+o.thickness_increment, o)
-#_(r) --> _(r+o.thickness_increment)
+I(s,r,o) --> I(s,r+o.growth.thickness_increment, o)
+#_(r) --> _(r+o.growth.thickness_increment)
 _(r) --> _(r)
 homomorphism:
 I(a,r,o) --> F(a,r)

examples/Envy_tie_prune_label.lpy

@@ -112,7 +112,7 @@ class Trunk(BasicWood):
     self.contour = create_noisy_circle_curve(3, 0.05, 30)
 
   def is_bud_break(self, num_buds_segment):
-    if (rd.random() > 0.1*(1 - num_buds_segment/self.max_buds_segment)):
+    if (rd.random() > 0.1*(1 - num_buds_segment/self.growth.max_buds_segment)):
       return False
     return True
 
@@ -148,7 +148,7 @@ class NonTrunk(BasicWood):
     self.contour = create_noisy_circle_curve(1, .2, 30)
 
   def is_bud_break(self, num_buds_segment):
-      return (rd.random() < 0.02*(1 - num_buds_segment/self.max_buds_segment))
+      return (rd.random() < 0.5*(1 - num_buds_segment/self.growth.max_buds_segment))
 
   def create_branch(self):
       if rd.random()>0.3:
@@ -166,10 +166,10 @@ growth_length = 0.1
 bud_spacing_age = 2
 #everything is relative to growth length
 basicwood_prototypes = {}
-basicwood_prototypes['trunk'] = Trunk(tie_axis = (0,1,1), max_length = 4, thickness = 0.01, growth_length = growth_length,thickness_increment = 0.00001, prototype_dict = basicwood_prototypes, color = [255,0,0] )
-basicwood_prototypes['branch'] = Branch(tie_axis = (0,1,1), max_length = 2.2, thickness = 0.01, growth_length = growth_length,thickness_increment = 0.00001, prototype_dict = basicwood_prototypes, color = [255,150,0] )
-basicwood_prototypes['nontrunk'] = NonTrunk(tie_axis = (0,1,1), max_length = 0.3, growth_length = growth_length/2, thickness = 0.003,thickness_increment = 0.00001, prototype_dict = basicwood_prototypes, color = [0, 255, 0] )
-basicwood_prototypes['spur'] = Spur(tie_axis = (0,1,1), max_length = 0.2, thickness = 0.003, growth_length = growth_length/2, thickness_increment = 0., prototype_dict = basicwood_prototypes, color = [0,255,0] )
+basicwood_prototypes['trunk'] = Trunk(tie_axis = (0,1,0), max_length = 4, thickness = 0.01, growth_length = growth_length,thickness_increment = 0.00001, prototype_dict = basicwood_prototypes, color = [255,0,0] )
+basicwood_prototypes['branch'] = Branch(tie_axis = (1, 0, 0), max_length = 2.2, thickness = 0.01, growth_length = growth_length,thickness_increment = 0.00001, prototype_dict = basicwood_prototypes, color = [255,150,0] )
+basicwood_prototypes['nontrunk'] = NonTrunk(tie_axis = (1, 0, 0), max_length = 0.3, growth_length = growth_length/2, thickness = 0.003,thickness_increment = 0.00001, prototype_dict = basicwood_prototypes, color = [0, 255, 0] )
+basicwood_prototypes['spur'] = Spur(tie_axis = (1, 0, 0), max_length = 0.2, thickness = 0.003, growth_length = growth_length/2, thickness_increment = 0., prototype_dict = basicwood_prototypes, color = [0,255,0] )
 
 
 #init  
@@ -191,7 +191,7 @@ def generate_points_v_trellis():
     return pts  # Return the list of points
 
 #                  points,                   num_wires  spacing wires trunk_wire_pt    branch_axis    trunk_axis
-support = Support(generate_points_v_trellis(), 14 ,      1 ,            None,          (0,0,1),       None)
+support = Support(generate_points_v_trellis(), 14 ,      1 ,            None)
 num_iteration_tie = 5
 num_iteration_prune = 16
 ###Tying stuff begins
@@ -208,14 +208,14 @@ def get_energy_mat(branches, arch):
     energy_matrix = np.ones((num_branches, num_wires)) * np.inf  # Initialize the energy matrix with infinity
 
     for branch_id, branch in enumerate(branches):  # Loop through each branch
-        if branch.has_tied or branch.cut:  # If the branch is already tied, skip it
+        if branch.tying.has_tied or branch.info.cut:  # If the branch is already tied, skip it
             continue
         for wire_id, wire in arch.branch_supports.items():  # Loop through each wire
             # print(f"ID {wire_id} num branch {wire.num_branch}")
             if wire.num_branch >= 1:  # If the wire already has a branch, skip it
                 continue
             # Calculate the energy required to tie the branch to the wire
-            energy_matrix[branch_id][wire_id] = ed(wire.point, branch.start) / 2 #ed(wire.point, branch.end) / 2 + 
+            energy_matrix[branch_id][wire_id] = ed(wire.point, branch.location.start) / 2 #ed(wire.point, branch.location.end) / 2 + 
 
     return energy_matrix  # Return the energy matrix
 
@@ -225,8 +225,8 @@ def decide_guide(energy_matrix, branches, arch):
         min_arg = np.argwhere(energy_matrix == np.min(energy_matrix))  # Find the minimum energy branch to tie
         if (energy_matrix[min_arg[0][0]][min_arg[0][1]] == np.inf) or energy_matrix[min_arg[0][0]][min_arg[0][1]] > 0.25*math.exp(getIterationNb()/105):
             return  # If the minimum energy is too high, stop the process
-        if not branches[min_arg[0][0]].has_tied and not branches[min_arg[0][0]].cut:  # If the branch has not been tied before
-            branches[min_arg[0][0]].guide_target = arch.branch_supports[min_arg[0][1]]  # Set the guide target to the wire
+        if not branches[min_arg[0][0]].tying.has_tied and not branches[min_arg[0][0]].info.cut:  # If the branch has not been tied before
+            branches[min_arg[0][0]].tying.guide_target = arch.branch_supports[min_arg[0][1]]  # Set the guide target to the wire
             arch.branch_supports[min_arg[0][1]].add_branch()  # Increment the number of branches tied to the wire
             # print(f"Tying {min_arg[0][0]} to wire {min_arg[0][1]}")
             # Set the energy to tie as infinite (only tie 1 branch per wire)
@@ -239,11 +239,11 @@ def decide_guide(energy_matrix, branches, arch):
 def tie(lstring):
     for j, i in enumerate(lstring):  # Loop through each element in the lstring
         if i == 'C' and i[0].type.__class__.__name__ == 'Branch':  # Check if the element is a branch
-            if i[0].type.tie_updated == False:  # If the branch is not updated, skip it
+            if i[0].type.tying.tie_updated == False:  # If the branch is not updated, skip it
                 continue
             curr = i[0]  # Get the current branch
-            if i[0].type.guide_points:  # If the branch has guide points
-                i[0].type.tie_updated = False  # Set the tie_updated flag to False
+            if i[0].type.tying.guide_points:  # If the branch has guide points
+                i[0].type.tying.tie_updated = False  # Set the tie_updated flag to False
                 #i[0].type.guide_target.add_branch()  # Add the branch to the guide target
                 lstring, count = i[0].type.tie_lstring(lstring, j)  # Tie the branch
 
@@ -254,7 +254,7 @@ def tie(lstring):
 def pruning_strategy(lstring):  # Remove remnants of cut
     cut = False  # Initialize the cut flag
     for j, i in enumerate(lstring):  # Loop through each element in the lstring
-        if i.name == 'C' and i[0].type.age > 6 and i[0].type.has_tied == False and i[0].type.cut == False and i[0].type.prunable and i[0].type.guide_target==-1:
+        if i.name == 'C' and i[0].type.info.age > 6 and i[0].type.tying.has_tied == False and i[0].type.info.cut == False and i[0].type.info.prunable and i[0].type.tying.guide_target==-1:
             i[0].type.cut = True  # Set the cut flag to True
             lstring = cut_from(j, lstring)  # Cut the branch using string manipulation
             #TODO: Remove branch from parent_child dict and wire
@@ -267,7 +267,7 @@ def pruning_strategy(lstring):  # Remove remnants of cut
 def StartEach(lstring):
     global parent_child_dict
     for i in parent_child_dict[trunk_base.name]:  # Loop through each child of the trunk base
-        if i.tie_updated == False:  # If the branch is not updated
+        if i.tying.tie_updated == False:  # If the branch is not updated
             i.tie_update()  # Update the branch
 
 # Function to end each iteration
@@ -278,7 +278,7 @@ def EndEach(lstring):
         energy_matrix = get_energy_mat(parent_child_dict[trunk_base.name], support)  # Get the energy matrix
         decide_guide(energy_matrix, parent_child_dict[trunk_base.name], support)  # Decide which branches to guide
         for branch in parent_child_dict[trunk_base.name]:  # Loop through each branch
-            branch.update_guide(branch.guide_target)  # Update the guide target for the branch
+            branch.update_guide(branch.tying.guide_target)  # Update the guide target for the branch
         while tie(lstring):  # Tie branches until no more can be tied
             pass
     if (getIterationNb() + 1) % num_iteration_prune == 0:
@@ -309,20 +309,20 @@ def reset_contour():
 
 
 curve = create_bezier_curve(x_range = (-1, 1), y_range = (-0.15, 0.15), z_range = (0, 10), seed_val=time.time())
-Axiom: Attractors(support)SetGuide(curve, trunk_base.max_length)[grow_object(trunk_base)]
+Axiom: Attractors(support)SetGuide(curve, trunk_base.growth.max_length)[grow_object(trunk_base)]
 derivation length: 128
 production:
 #Decide whether branch internode vs trunk internode need to be the same size.
 grow_object(o) :
   if o == None:
     produce *
   else:
-    if o.length >= o.max_length:
-      o.age += 1
+    if o.length >= o.growth.max_length:
+      o.info.age += 1
       nproduce *
     else:
       # Get object's usual color and apply it
-      r, g, b = o.color
+      r, g, b = o.info.color
       nproduce SetColor(r, g, b)
 
       # This sets unique color IDs
@@ -342,11 +342,11 @@ grow_object(o) :
 
       if 'Spur' in o.name:
         # note that the production of the buds is here with 'spiked_bud(o.thickness)' 
-        produce I(o.growth_length, o.thickness, o) bud(ParameterSet(type=o, num_buds=0))grow_object(o) #spiked_bud(o.thickness)grow_object(o)
+        produce I(o.growth.growth_length, o.growth.thickness, o) bud(ParameterSet(type=o, num_buds=0))grow_object(o) #spiked_bud(o.growth.thickness)grow_object(o)
       else:
         # If o is a Trunk, Branch, or NonTrunk, simply produce the internodes 
-        nproduce I(o.growth_length, o.thickness, o) 
-        if np.isclose(o.age%bud_spacing_age,0, atol = 0.01):
+        nproduce I(o.growth.growth_length, o.growth.thickness, o) 
+        if np.isclose(o.info.age%bud_spacing_age,0, atol = 0.01):
           nproduce bud(ParameterSet(type=o, num_buds=0))
         produce grow_object(o)
 
@@ -367,14 +367,14 @@ bud(t) :
      if 'NonTrunk' in new_object.name:
          import time
          curve = create_bezier_curve(x_range = (-.5,.5), y_range = (-.5,.5), z_range = (-1,1), seed_val=time.time())
-         nproduce [SetGuide(curve, new_object.max_length)
+         nproduce [SetGuide(curve, new_object.growth.max_length)
      elif 'Spur' in new_object.name:
          import time
          curve = create_bezier_curve(x_range = (-.2,.2), y_range = (-.2,.2), z_range = (-1,1), seed_val=time.time())
-         nproduce [SetGuide(curve, new_object.max_length)
+         nproduce [SetGuide(curve, new_object.growth.max_length)
      else:
          nproduce [
-     nproduce @RGetPos(new_object.start)C(ParameterSet(type = new_object))/(rd.random()*360)&(rd.random()*360)grow_object(new_object)GetPos(new_object.end)]bud(ParameterSet(type=t.type, num_buds=t.num_buds))
+     nproduce @RGetPos(new_object.location.start)C(ParameterSet(type = new_object))/(rd.random()*360)&(rd.random()*360)grow_object(new_object)GetPos(new_object.location.end)]bud(ParameterSet(type=t.type, num_buds=t.num_buds))
 
 
 # Simple set of productions to build apple bud. This bud is
@@ -397,8 +397,8 @@ A(bh, r):
   produce nF(bh, .01, r, base_curve) ^(180) nF(bh/5, .1, r, top_curve)^(180)#S(bh/2,r/15)
 
 
-I(s,r,o) --> I(s,r+o.thickness_increment, o)
-#_(r) --> _(r+o.thickness_increment)
+I(s,r,o) --> I(s,r+o.growth.thickness_increment, o)
+#_(r) --> _(r+o.growth.thickness_increment)
 _(r) --> _(r)
 homomorphism:
 I(a,r,o) --> F(a,r)