Changeset 18180 for branches/3138_Shape_Constraints_Transformations/HeuristicLab.Tests/HeuristicLab-3.3

Timestamp:

01/10/22 10:15:25 (2 years ago)

Author:

dpiringe

Message:

#3138

• merged trunk into branch

Location:

branches/3138_Shape_Constraints_Transformations

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicClassificationSampleTest.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleTest.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleWithOSTest.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GeSymbolicRegressionSampleTest.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/ShapeConstrainedRegressionSampleTest.cs (modified) (5 diffs)

branches/3138_Shape_Constraints_Transformations/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/3138_Shape_Constraints_Transformations/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/3138_Shape_Constraints_Transformations/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleWithOSTest.cs

@@ -66 +66 @@
         // Unfortunately, running the same test on a different machine results in different values
         // For x86 environments the results below match but on x64 there is a difference
-        // We tracked down the ConstantOptimizationEvaluator as a possible cause but have not
+        // We tracked down the ParameterOptimizationEvaluator as a possible cause but have not
         // been able to identify the real cause. Presumably, execution on a Xeon and a Core i7 processor 
         // leads to different results. 
@@ -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/3138_Shape_Constraints_Transformations/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GeSymbolicRegressionSampleTest.cs

@@ -113 +113 @@
         problem.SymbolicExpressionTreeGrammar.RemoveSymbol(c);
       }
+      var numbers = problem.SymbolicExpressionTreeGrammar.AllowedSymbols.OfType<Number>().ToList();
+      foreach (var n in numbers) {
+        problem.SymbolicExpressionTreeGrammar.RemoveSymbol(n);
+      }
 
       SamplesUtils.ConfigureOsGeneticAlgorithmParameters<GenderSpecificSelector, Encodings.IntegerVectorEncoding.SinglePointCrossover, Encodings.IntegerVectorEncoding.UniformOnePositionManipulator>(

branches/3138_Shape_Constraints_Transformations/HeuristicLab.Tests/HeuristicLab-3.3/Samples/ShapeConstrainedRegressionSampleTest.cs

@@ -35 +35 @@
   [TestClass]
   public class ShapeConstrainedRegressionSampleTest {
-    private const string SampleFileName = "GA_Shape_Constrained_Regression";
+    private const string SampleFileName = "GP_Shape_Constrained_Regression";
     private static readonly ProtoBufSerializer serializer = new ProtoBufSerializer();
 
@@ -47 +47 @@
 
       if (Environment.Is64BitProcess) {
-        Assert.AreEqual(0.355347729912352, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
-        Assert.AreEqual(27.6606834433137, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
-        Assert.AreEqual(3359.91748220025, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
+        Assert.AreEqual(0.035536903914644882, SamplesUtils.GetDoubleResult(ga, "BestQuality"), 1E-8);
+        Assert.AreEqual(26.707437555596698, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
+        Assert.AreEqual(3294.1754151628993, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
         Assert.AreEqual(150200, SamplesUtils.GetIntResult(ga, "EvaluatedSolutions"));
       } else {
@@ -57 +57 @@
         Assert.AreEqual(150200, SamplesUtils.GetIntResult(ga, "EvaluatedSolutions"));
       }
+    }
+
+    [TestMethod]
+    [TestCategory("Samples.Create")]
+    [TestProperty("Time", "medium")]
+    public void CreateShapeConstrainedRegressionSampleTest() {
+      var ga = CreateShapeConstrainedRegressionSample();
+      string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
+      serializer.Serialize(ga, path);
     }
 
@@ -82 +91 @@
 
       #region Algorithm Configuration
-      alg.Name = "Genetic Programming - Shape constrained Regression";
+      alg.Name = "Genetic Programming - Shape-constrained Regression";
       alg.Description = "A standard genetic programming algorithm to solve a shape constrained regression problem (Radiated gravitational wave power - Feynman instance)";
       alg.Problem = problem;
@@ -93 +102 @@
 
       alg.Engine = new ParallelEngine.ParallelEngine();
+
       return alg;
     }