Changeset 18119

Timestamp:

12/15/21 09:44:55 (3 years ago)

Author:

gkronber

Message:

#3140: fix compilation errors in test solution

Location:

branches/3140_NumberSymbol/HeuristicLab.Tests

Files:

• HeuristicLab-3.3/Samples/GPSymbolicClassificationSampleTest.cs (modified) (1 diff)
• HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleTest.cs (modified) (1 diff)
• HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleWithOSTest.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs (modified) (2 diffs)

branches/3140_NumberSymbol/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicClassificationSampleTest.cs

@@ -109 +109 @@
       varSymbol.WeightManipulatorSigma = 0.05;
       varSymbol.MultiplicativeWeightManipulatorSigma = 0.03;
-      var constSymbol = grammar.Symbols.OfType<Constant>().Single();
-      constSymbol.MaxValue = 20;
-      constSymbol.MinValue = -20;
-      constSymbol.ManipulatorMu = 0.0;
-      constSymbol.ManipulatorSigma = 1;
-      constSymbol.MultiplicativeManipulatorSigma = 0.03;
+      var numSymbol = grammar.Symbols.OfType<Number>().Single();
+      numSymbol.MaxValue = 20;
+      numSymbol.MinValue = -20;
+      numSymbol.ManipulatorMu = 0.0;
+      numSymbol.ManipulatorSigma = 1;
+      numSymbol.MultiplicativeManipulatorSigma = 0.03;
       symbClassProblem.SymbolicExpressionTreeGrammar = grammar;
 

branches/3140_NumberSymbol/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleTest.cs

@@ -110 +110 @@
       varSymbol.WeightManipulatorSigma = 0.05;
       varSymbol.MultiplicativeWeightManipulatorSigma = 0.03;
-      var constSymbol = grammar.Symbols.OfType<Constant>().Single();
-      constSymbol.MaxValue = 20;
-      constSymbol.MinValue = -20;
-      constSymbol.ManipulatorMu = 0.0;
-      constSymbol.ManipulatorSigma = 1;
-      constSymbol.MultiplicativeManipulatorSigma = 0.03;
+      var numSymbol = grammar.Symbols.OfType<Number>().Single();
+      numSymbol.MaxValue = 20;
+      numSymbol.MinValue = -20;
+      numSymbol.ManipulatorMu = 0.0;
+      numSymbol.ManipulatorSigma = 1;
+      numSymbol.MultiplicativeManipulatorSigma = 0.03;
       symbRegProblem.SymbolicExpressionTreeGrammar = grammar;
 

branches/3140_NumberSymbol/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleWithOSTest.cs

@@ -184 +184 @@
       problem.MaximumFunctionArguments.Value = 0;
 
-      var evaluator = new SymbolicRegressionConstantOptimizationEvaluator();
-      evaluator.ConstantOptimizationIterations.Value = 5;
+      var evaluator = new SymbolicRegressionParameterOptimizationEvaluator();
+      evaluator.ParameterOptimizationIterations.Value = 5;
       problem.EvaluatorParameter.Value = evaluator;
       problem.RelativeNumberOfEvaluatedSamplesParameter.Hidden = true;

branches/3140_NumberSymbol/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs

@@ -82 +82 @@
       var sw = new Stopwatch();
 
-      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchVariableWeights = false, MatchConstantValues = false };
+      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchVariableWeights = false, MatchParameterValues = false };
 
       sw.Start();
@@ -117 +117 @@
       var trees = Util.CreateRandomTrees(twister, ds, grammar, N, 1, 100, 0, 0);
 
-      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchConstantValues = strict, MatchVariableWeights = strict };
+      var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { MatchParameterValues = strict, MatchVariableWeights = strict };
       var bottomUpSimilarity = 0d;
       for (int i = 0; i < trees.Length - 1; ++i) {