Changeset 18195 for branches

Timestamp:

01/14/22 09:49:45 (2 years ago)

Author:

mkommend

Message:

#3136: Refactored creation of subfunctions in StructureTemplate.

File:

• branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs (modified) (6 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs

@@ -64 +64 @@
         tree = value;
 
-        var newFunctions = GetSubFunctions();
+        var newFunctions = CreateSubFunctions(tree);
         var oldFunctions = subFunctions?.Intersect(newFunctions)
                            ?? Enumerable.Empty<SubFunction>();
         // adds new functions and keeps the old ones (if they match)
-        subFunctions = newFunctions.Except(oldFunctions).Concat(oldFunctions).ToList();
+        var functionsToAdd = newFunctions.Except(oldFunctions);
+        subFunctions = functionsToAdd.Concat(oldFunctions).ToList();
+        RegisterSubFunctionEventHandlers(functionsToAdd);
       }
     }
@@ -124 +126 @@
       this.applyLinearScaling = original.ApplyLinearScaling;
       this.subFunctions = original.subFunctions.Select(cloner.Clone).ToList();
-      RegisterEventHandlers();
+      RegisterSubFunctionEventHandlers(SubFunctions);
     }
 
@@ -136 +138 @@
       }
 
-      RegisterEventHandlers();
+      RegisterSubFunctionEventHandlers(SubFunctions);
     }
     #endregion
@@ -151 +153 @@
     }
 
-    private IList<SubFunction> GetSubFunctions() {
+    private static IList<SubFunction> CreateSubFunctions(ISymbolicExpressionTree tree) {
       var subFunctions = new List<SubFunction>();
-      foreach (var node in Tree.IterateNodesPrefix())
+      foreach (var node in tree.IterateNodesPrefix())
         if (node is SubFunctionTreeNode subFunctionTreeNode) {
           if (!subFunctionTreeNode.Arguments.Any())
@@ -171 +173 @@
               Arguments = subFunctionTreeNode.Arguments
             };
-            subFunction.Changed += OnSubFunctionChanged;
             subFunctions.Add(subFunction);
           }
@@ -178 +179 @@
     }
 
-    private void RegisterEventHandlers() {
-      foreach (var sf in SubFunctions) {
-        sf.Changed += OnSubFunctionChanged;
+    private void RegisterSubFunctionEventHandlers(IEnumerable<SubFunction> subFunctions) {
+      foreach (var sf in subFunctions) {
+        sf.Changed += (o, e) => OnChanged();
       }
-    }
-    private void OnSubFunctionChanged(object sender, EventArgs e) => OnChanged();
+    }    
   }
 }