Changeset 18207


Ignore:
Timestamp:
01/21/22 12:15:50 (7 months 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r18194 r18207  
    142142    <Compile Include="SingleObjective\SolutionQualityAnalyzer.cs" />
    143143    <Compile Include="SingleObjective\SolutionRSquaredAnalyzer.cs" />
    144     <Compile Include="SingleObjective\StructuredSymbolicRegressionSingleObjectiveProblem.cs" />
     144    <Compile Include="SingleObjective\StructureTemplateSymbolicRegressionProblem.cs" />
    145145    <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />
    146146    <Compile Include="SymbolicRegressionPruningAnalyzer.cs" />
  • branches/3136_Structural_GP/HeuristicLab.Tests/HeuristicLab-3.3/Samples/StructureTemplateRegressionSampleTest.cs

    r18156 r18207  
    3030
    3131      if (Environment.Is64BitProcess) {
    32         Assert.AreEqual(1.2142319244409949E-06, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
    33         Assert.AreEqual(120.13505532841884, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
    34         Assert.AreEqual(8322.6086777405562, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
     32        Assert.AreEqual(5.0286947997733353E-07, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
     33        Assert.AreEqual(79.100605440090362, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
     34        Assert.AreEqual(7905.465554758197, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
    3535        Assert.AreEqual(5050, SamplesUtils.GetIntResult(ga, "EvaluatedSolutions"));
    3636      } else {
    37         Assert.AreEqual(1.2142319244408615E-06, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
    38         Assert.AreEqual(120.135055328418, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
    39         Assert.AreEqual(8322.6086777405562, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
     37        Assert.AreEqual(5.45285034915826E-07, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
     38        Assert.AreEqual(0.25447047591366467, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
     39        Assert.AreEqual(23.211139545787372, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
    4040        Assert.AreEqual(5050, SamplesUtils.GetIntResult(ga, "EvaluatedSolutions"));
    4141      }
     
    5555      var provider = new PhysicsInstanceProvider(seed: 0);
    5656      var descriptor = new SheetBendingProcess(seed: 0);
    57       var problem = new StructuredSymbolicRegressionSingleObjectiveProblem();
     57      var problem = new StructureTemplateSymbolicRegressionProblem();
    5858      problem.Load(provider.LoadData(descriptor));
    5959      problem.StructureTemplate.Template =
     
    6868        subFunction.Grammar = new ArithmeticExpressionGrammar();
    6969      }
    70       var evaluator = problem.TreeEvaluatorParameter.ValidValues
    71         .OfType<NMSESingleObjectiveConstraintsEvaluator>()
    72         .First();
    73       evaluator.OptimizeParameters = true;
    74       problem.TreeEvaluatorParameter.Value = evaluator;
    7570
    7671      #region Algorithm Configuration
Note: See TracChangeset for help on using the changeset viewer.