Changeset 18164 for branches

Timestamp:

12/21/21 15:29:18 (3 years ago)

Author:

dpiringe

Message:

#3136

• fixed a bug in StructureTemplateView -> only nodes of type SubFunctionTreeNode are selectable
• added a way to keep old sub functions after parsing a new expression
  • overwrote some basic object methods for SubFunction to keep it simple
  • only old sub functions, which match the name and signature of the new ones, are saved; examples:
    • old: f(x), new: f(x) -> keep old
    • old: f(x1), new: f(x1, x2) -> use new
    • old: f1(x), new f2(x) -> use new

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/StructureTemplate/StructureTemplateView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/SubFunction.cs (modified) (1 diff)

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

@@ -42 +42 @@
     private void SymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
       var visualTreeNode = sender as VisualTreeNode<ISymbolicExpressionTreeNode>;
-      if(visualTreeNode != null) {
-        var subFunctionTreeNode = visualTreeNode.Content as SubFunctionTreeNode;
+      if(visualTreeNode != null && visualTreeNode.Content is SubFunctionTreeNode subFunctionTreeNode) {
         var selectedSubFunction = Content.SubFunctions.Where(x => x.Name == subFunctionTreeNode.Name).FirstOrDefault();
         if(subFunctionTreeNode != null && selectedSubFunction != null)

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

@@ -33 +33 @@
         treeWithLinearScaling = AddLinearScalingTerms(value);
         treeWithoutLinearScaling = value;
-        subFunctions = GetSubFunctions();
+
+        var newFunctions = GetSubFunctions();
+        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();
       }
     }

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

@@ -75 +75 @@
       new SubFunction(this, cloner);
     #endregion
+
+    public override string ToString() => $"{Name}({string.Join(",", Arguments)})";
+
+    public override int GetHashCode() => ToString().GetHashCode();
+
+    public override bool Equals(object obj) => (obj is SubFunction other) && other.ToString() == ToString();
   }
 }