Changeset 18151

Timestamp:

12/16/21 16:47:07 (3 years ago)

Author:

dpiringe

Message:

#3136

• fixed eventhandler reregister after deserialisazion/cloning
• added a test case for StructuredSymbolicRegressionSingleObjectiveProblem
• changed the usage of a Dictionary to List

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/StructureTemplate/StructureTemplateView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs (modified) (6 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/StructureTemplateRegressionSampleTest.cs (added)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs

@@ -80 +80 @@
       var shapeConstraintProblemData = new ShapeConstrainedRegressionProblemData(problemData);
 
-
       var targetInterval = shapeConstraintProblemData.VariableRanges.GetInterval(shapeConstraintProblemData.TargetVariable);
       var estimationWidth = targetInterval.Width * 10;
 
-
       var structureTemplate = new StructureTemplate();
-      structureTemplate.Changed += OnTemplateChanged;
 
       var evaluators = new ItemSet<SymbolicRegressionSingleObjectiveEvaluator>(
@@ -100 +97 @@
         ProblemDataParameterName,
         shapeConstraintProblemData));
-      ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged;
 
       Parameters.Add(new FixedValueParameter<StructureTemplate>(
@@ -123 +119 @@
       Operators.Add(new SymbolicExpressionSymbolFrequencyAnalyzer());
 
+      RegisterEventHandlers();
       StructureTemplate.Template =
         "(" +
@@ -132 +129 @@
 
     public StructuredSymbolicRegressionSingleObjectiveProblem(StructuredSymbolicRegressionSingleObjectiveProblem original,
-      Cloner cloner) : base(original, cloner) { }
+      Cloner cloner) : base(original, cloner) {
+      ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged;
+      RegisterEventHandlers();
+    }
 
     [StorableConstructor]
     protected StructuredSymbolicRegressionSingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
+
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
+
     #endregion
 
@@ -148 +155 @@
     }
 
+    private void RegisterEventHandlers() {
+      if (StructureTemplate != null) {
+        StructureTemplate.Changed += OnTemplateChanged;
+      }
+
+      ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged;
+    }
+
     private void OnTemplateChanged(object sender, EventArgs args) {
       SetupStructureTemplate();
@@ -156 +171 @@
         Encoding.Remove(e);
 
-      foreach (var f in StructureTemplate.SubFunctions.Values) {
+      foreach (var f in StructureTemplate.SubFunctions) {
         SetupVariables(f);
         if (!Encoding.Encodings.Any(x => x.Name == f.Name)) // to prevent the same encoding twice

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

@@ -44 +44 @@
       if(visualTreeNode != null) {
         var subFunctionTreeNode = visualTreeNode.Content as SubFunctionTreeNode;
-        if(subFunctionTreeNode != null && Content.SubFunctions.TryGetValue(subFunctionTreeNode.Name, out SubFunction subFunction))
-          viewHost.Content = subFunction;
+        var selectedSubFunction = Content.SubFunctions.Where(x => x.Name == subFunctionTreeNode.Name).FirstOrDefault();
+        if(subFunctionTreeNode != null && selectedSubFunction != null)
+          viewHost.Content = selectedSubFunction;
       }
     }

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

@@ -33 +33 @@
         treeWithLinearScaling = AddLinearScalingTerms(value);
         treeWithoutLinearScaling = value;
-        SubFunctions = GetSubFunctions();
+        subFunctions = GetSubFunctions();
       }
     }
 
     [Storable]
-    public IReadOnlyDictionary<string, SubFunction> SubFunctions { get; private set; }
+    private IList<SubFunction> subFunctions = new List<SubFunction>();
+    public IEnumerable<SubFunction> SubFunctions => subFunctions;
 
     [Storable]
@@ -72 +73 @@
       this.Template = original.Template;
       this.ApplyLinearScaling = original.ApplyLinearScaling;
-      this.SubFunctions = original.SubFunctions;
+      this.subFunctions = original.subFunctions.Select(cloner.Clone).ToList();
+      RegisterEventHandlers();
+    }
+
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
     }
     #endregion
@@ -82 +90 @@
 
     public void Reset() {
-      SubFunctions = new Dictionary<string, SubFunction>();
+      subFunctions = new List<SubFunction>();
       treeWithoutLinearScaling = null;
       treeWithLinearScaling = null;
@@ -90 +98 @@
     }
 
-    private Dictionary<string, SubFunction> GetSubFunctions() {
-      var subFunctions = new Dictionary<string, SubFunction>();
+    private IList<SubFunction> GetSubFunctions() {
+      var subFunctions = new List<SubFunction>();
       foreach (var node in Tree.IterateNodesPrefix())
         if (node is SubFunctionTreeNode subFunctionTreeNode) {
@@ -97 +105 @@
             throw new ArgumentException($"The sub-function '{subFunctionTreeNode}' requires inputs (e.g. {subFunctionTreeNode.Name}(var1, var2)).");
 
-          if (subFunctions.TryGetValue(subFunctionTreeNode.Name, out SubFunction v)) {
-            if(!v.Arguments.SequenceEqual(subFunctionTreeNode.Arguments))
+          var existingSubFunction = subFunctions.Where(x => x.Name == subFunctionTreeNode.Name).FirstOrDefault();
+          if (existingSubFunction != null) {
+            // an existing subFunction needs the same signature
+            if(!existingSubFunction.Arguments.SequenceEqual(subFunctionTreeNode.Arguments))
               throw new ArgumentException(
-                $"The sub-function '{v.Name}' has (at least two) different signatures " +
-                $"({v.Name}({string.Join(",", v.Arguments)}) <> {subFunctionTreeNode.Name}({string.Join(",", subFunctionTreeNode.Arguments)})).");
+                $"The sub-function '{existingSubFunction.Name}' has (at least two) different signatures " +
+                $"({existingSubFunction.Name}({string.Join(",", existingSubFunction.Arguments)}) <> " +
+                $"{subFunctionTreeNode.Name}({string.Join(",", subFunctionTreeNode.Arguments)})).");
           } else {
             var subFunction = new SubFunction() {
@@ -108 +119 @@
             };
             subFunction.Changed += OnSubFunctionChanged;
-            subFunctions.Add(subFunction.Name, subFunction);
+            subFunctions.Add(subFunction);
           }
         }
       return subFunctions;
+    }
+
+    private void RegisterEventHandlers() {
+      foreach(var sf in SubFunctions) {
+        sf.Changed += OnSubFunctionChanged;
+      }
     }
 

branches/3136_Structural_GP/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -471 +471 @@
     <Compile Include="HeuristicLab-3.3\Samples\GAGroupingProblemSampleTest.cs" />
     <Compile Include="HeuristicLab-3.3\Samples\ShapeConstrainedRegressionSampleTest.cs" />
+    <Compile Include="HeuristicLab-3.3\Samples\StructureTemplateRegressionSampleTest.cs" />
     <Compile Include="HeuristicLab-3.3\Samples\VnsOpSampleTest.cs" />
     <Compile Include="HeuristicLab-3.3\Samples\EsGriewankSampleTest.cs" />