Changeset 18207

Timestamp:

01/21/22 12:15:50 (3 years ago)

Author:

dpiringe

Message:

#3136

• updated test cases for StructureTemplateSymbolicRegressionProblem
• updated optimizer template for StructureTemplateSymbolicRegressionProblem
• updated project file for HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (forgot to include last commit)

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Optimizer/3.3/Documents/GP_Structure_Template_Regression.hl (modified) (previous)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/StructureTemplateRegressionSampleTest.cs (modified) (3 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -142 +142 @@
     <Compile Include="SingleObjective\SolutionQualityAnalyzer.cs" />
     <Compile Include="SingleObjective\SolutionRSquaredAnalyzer.cs" />
-    <Compile Include="SingleObjective\StructuredSymbolicRegressionSingleObjectiveProblem.cs" />
+    <Compile Include="SingleObjective\StructureTemplateSymbolicRegressionProblem.cs" />
     <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPruningAnalyzer.cs" />

branches/3136_Structural_GP/HeuristicLab.Tests/HeuristicLab-3.3/Samples/StructureTemplateRegressionSampleTest.cs

@@ -30 +30 @@
 
       if (Environment.Is64BitProcess) {
-        Assert.AreEqual(1.2142319244409949E-06, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
-        Assert.AreEqual(120.13505532841884, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
-        Assert.AreEqual(8322.6086777405562, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
+        Assert.AreEqual(5.0286947997733353E-07, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
+        Assert.AreEqual(79.100605440090362, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
+        Assert.AreEqual(7905.465554758197, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
         Assert.AreEqual(5050, SamplesUtils.GetIntResult(ga, "EvaluatedSolutions"));
       } else {
-        Assert.AreEqual(1.2142319244408615E-06, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
-        Assert.AreEqual(120.135055328418, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
-        Assert.AreEqual(8322.6086777405562, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
+        Assert.AreEqual(5.45285034915826E-07, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
+        Assert.AreEqual(0.25447047591366467, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
+        Assert.AreEqual(23.211139545787372, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
         Assert.AreEqual(5050, SamplesUtils.GetIntResult(ga, "EvaluatedSolutions"));
       }
@@ -55 +55 @@
       var provider = new PhysicsInstanceProvider(seed: 0);
       var descriptor = new SheetBendingProcess(seed: 0);
-      var problem = new StructuredSymbolicRegressionSingleObjectiveProblem();
+      var problem = new StructureTemplateSymbolicRegressionProblem();
       problem.Load(provider.LoadData(descriptor));
       problem.StructureTemplate.Template =
@@ -68 +68 @@
         subFunction.Grammar = new ArithmeticExpressionGrammar();
       }
-      var evaluator = problem.TreeEvaluatorParameter.ValidValues
-        .OfType<NMSESingleObjectiveConstraintsEvaluator>()
-        .First();
-      evaluator.OptimizeParameters = true;
-      problem.TreeEvaluatorParameter.Value = evaluator;
 
       #region Algorithm Configuration