Changeset 18158

Timestamp:

12/19/21 08:46:31 (3 years ago)

Author:

gkronber

Message:

#3136: fixed "essential" unit tests

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SubFunctionSymbol.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SubFunctionTreeNode.cs (modified) (4 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Plugin.cs.frame

@@ -41 +41 @@
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances.DataAnalysis", "3.3")]
   public class HeuristicLabProblemsDataAnalysisSymbolicRegressionPlugin : PluginBase {
   }

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SubFunctionSymbol.cs

@@ -1 @@
-using System.Collections.Generic;
-using HEAL.Attic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -8 +7 @@
   [StorableType("C6C2FBEE-8F4B-4FF2-80F5-D566BE55ED69")]
   [Item("SubFunction", "Symbol that represents a sub function.")]
-  public class SubFunctionSymbol : Symbol {
+  public sealed class SubFunctionSymbol : Symbol {
     public override int MinimumArity => 0;
     public override int MaximumArity => 1;
@@ -17 +16 @@
 
     [StorableConstructor]
-    public SubFunctionSymbol(StorableConstructorFlag _) : base(_) { }
+    private SubFunctionSymbol(StorableConstructorFlag _) : base(_) { }
 
     public override IDeepCloneable Clone(Cloner cloner) =>

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SubFunctionTreeNode.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -10 +7 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("05130B5F-0125-4367-A4E9-C42D1085024E")]
-  public class SubFunctionTreeNode : SymbolicExpressionTreeNode {
+  public sealed class SubFunctionTreeNode : SymbolicExpressionTreeNode {
 
     #region Properties
@@ -26 +23 @@
 
     [StorableConstructor]
-    protected SubFunctionTreeNode(StorableConstructorFlag _) : base(_) { }
+    private SubFunctionTreeNode(StorableConstructorFlag _) : base(_) { }
 
-    protected SubFunctionTreeNode(SubFunctionTreeNode original, Cloner cloner) : base(original, cloner) {
+    private SubFunctionTreeNode(SubFunctionTreeNode original, Cloner cloner) : base(original, cloner) {
       Arguments = original.Arguments;
       Name = (string)original.Name.Clone();
@@ -43 +40 @@
       return $"{Name}({string.Join(",", Arguments)})";
     }
-    
   }
 }