Changeset 13408 for branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples

Timestamp:

11/26/15 17:36:54 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted unit tests in problem refactoring branch.

Location:

branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples

Files:

• EsGriewankSampleTest.cs (modified) (1 diff)
• LocalSearchKnapsackSampleTest.cs (modified) (1 diff)
• OSESGriewankSampleTest.cs (modified) (2 diffs)
• PsoSchwefelSampleTest.cs (modified) (1 diff)
• SimulatedAnnealingRastriginSampleTest.cs (modified) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples/EsGriewankSampleTest.cs

@@ -62 +62 @@
       SingleObjectiveTestFunctionProblem problem = new SingleObjectiveTestFunctionProblem();
 
-      problem.ProblemSize.Value = 10;
-      problem.EvaluatorParameter.Value = new GriewankEvaluator();
+      problem.ProblemSize = 10;
+      problem.TestFunction = new Griewank();
       problem.SolutionCreatorParameter.Value = new UniformRandomRealVectorCreator();
-      problem.Maximization.Value = false;
       problem.Bounds = new DoubleMatrix(new double[,] { { -600, 600 } });
-      problem.BestKnownQuality.Value = 0;
+      problem.BestKnownQuality = 0;
       problem.BestKnownSolutionParameter.Value = new RealVector(10);
       problem.Name = "Single Objective Test Function";

branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples/LocalSearchKnapsackSampleTest.cs

@@ -59 +59 @@
       #region Problem Configuration
       KnapsackProblem problem = new KnapsackProblem();
-      problem.BestKnownQuality = new DoubleValue(362);
+      problem.BestKnownQuality = 362;
       problem.BestKnownSolution = new HeuristicLab.Encodings.BinaryVectorEncoding.BinaryVector(new bool[] { 
        true , false, false, true , true , true , true , true , false, true , true , true , true , true , true , false, true , false, true , true , false, true , true , false, true , false, true , true , true , false, true , true , false, true , true , false, true , false, true , true , true , true , true , true , true , true , true , true , true , true , true , false, true , false, false, true , true , false, true , true , true , true , true , true , true , true , false, true , false, true , true , true , true , false, true , true , true , true , true , true , true , true});
-      problem.EvaluatorParameter.Value = new KnapsackEvaluator();
       problem.SolutionCreatorParameter.Value = new RandomBinaryVectorCreator();
-      problem.KnapsackCapacity.Value = 297;
-      problem.Maximization.Value = true;
-      problem.Penalty.Value = 1;
+      problem.KnapsackCapacity = 297;
       problem.Values = new IntArray(new int[] { 
   6, 1, 1, 6, 7, 8, 7, 4, 2, 5, 2, 6, 7, 8, 7, 1, 7, 1, 9, 4, 2, 6, 5,  3, 5, 3, 3, 6, 5, 2, 4, 9, 4, 5, 7, 1, 4, 3, 5, 5, 8, 3, 6, 7, 3, 9, 7, 7, 5, 5, 7, 1, 4, 4, 3, 9, 5, 1, 6, 2, 2, 6, 1, 6, 5, 4, 4, 7, 1,  8, 9, 9, 7, 4, 3, 8, 7, 5, 7, 4, 4, 5});

branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples/OSESGriewankSampleTest.cs

@@ -21 +21 @@
 
 using System.IO;
-using HeuristicLab.Algorithms.EvolutionStrategy;
 using HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy;
 using HeuristicLab.Data;
@@ -63 +62 @@
       SingleObjectiveTestFunctionProblem problem = new SingleObjectiveTestFunctionProblem();
 
-      problem.ProblemSize.Value = 10;
-      problem.EvaluatorParameter.Value = new GriewankEvaluator();
+      problem.ProblemSize = 10;
+      problem.TestFunction = new Griewank();
       problem.SolutionCreatorParameter.Value = new UniformRandomRealVectorCreator();
-      problem.Maximization.Value = false;
       problem.Bounds = new DoubleMatrix(new double[,] { { -600, 600 } });
-      problem.BestKnownQuality.Value = 0;
+      problem.BestKnownQuality = 0;
       problem.BestKnownSolutionParameter.Value = new RealVector(10);
       problem.Name = "Single Objective Test Function";

branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples/PsoSchwefelSampleTest.cs

@@ -68 +68 @@
       #region Problem Configuration
       var problem = new SingleObjectiveTestFunctionProblem();
-      problem.BestKnownQuality.Value = 0.0;
+      problem.BestKnownQuality = 0.0;
       problem.BestKnownSolutionParameter.Value = new RealVector(new double[] { 420.968746, 420.968746 });
       problem.Bounds = new DoubleMatrix(new double[,] { { -500, 500 } });
-      problem.EvaluatorParameter.Value = new SchwefelEvaluator();
-      problem.Maximization.Value = false;
-      problem.ProblemSize.Value = 2;
+      problem.TestFunction = new Schwefel();
+      problem.ProblemSize = 2;
       problem.SolutionCreatorParameter.Value = new UniformRandomRealVectorCreator();
       #endregion

branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SimulatedAnnealingRastriginSampleTest.cs

@@ -57 +57 @@
       #region Problem Configuration
       var problem = new SingleObjectiveTestFunctionProblem();
-      problem.BestKnownQuality.Value = 0.0;
+      problem.BestKnownQuality = 0.0;
       problem.BestKnownSolutionParameter.Value = new RealVector(new double[] { 0, 0 });
       problem.Bounds = new DoubleMatrix(new double[,] { { -5.12, 5.12 } });
-      problem.EvaluatorParameter.Value = new RastriginEvaluator();
-      problem.Maximization.Value = false;
-      problem.ProblemSize.Value = 2;
+      problem.TestFunction= new Rastrigin();
+      problem.ProblemSize = 2;
       problem.SolutionCreatorParameter.Value = new UniformRandomRealVectorCreator();
       #endregion
@@ -79 +78 @@
       sa.MaximumIterations.Value = 100;
       var moveEvaluator = sa.MoveEvaluatorParameter.ValidValues
-        .OfType<RastriginAdditiveMoveEvaluator>()
+        .OfType<AdditiveMoveEvaluator>()
         .Single();
-      moveEvaluator.A.Value = 10;
       sa.MoveEvaluator = moveEvaluator;