Changeset 13280 for stable/HeuristicLab.Tests

Timestamp:

11/19/15 11:42:02 (8 years ago)

Author:

gkronber

Message:

#2472: merged r12921,r12936:12938,r12940,r12947,r13055:13058,r13163,r13267,r13269 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPArtificialAntSampleTest.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPLawnMowerSampleTest.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPMultiplexerSampleTest.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (2 diffs)
• HeuristicLab.Tests/Test Resources/multiplexer11.csv (deleted)

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPArtificialAntSampleTest.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.Xml;
-using HeuristicLab.Problems.ArtificialAnt;
+using HeuristicLab.Problems.GeneticProgramming.ArtificialAnt;
 using HeuristicLab.Selection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -60 +60 @@
 
       #region Problem Configuration
-      ArtificialAntProblem antProblem = new ArtificialAntProblem();
-      antProblem.BestKnownQuality.Value = 89;
-      antProblem.MaxExpressionDepth.Value = 10;
-      antProblem.MaxExpressionLength.Value = 100;
-      antProblem.MaxFunctionArguments.Value = 3;
-      antProblem.MaxFunctionDefinitions.Value = 3;
+      Problem antProblem = new Problem();
+      antProblem.BestKnownQuality = 89;
+      antProblem.Encoding.TreeDepth = 10;
+      antProblem.Encoding.TreeLength = 100;
+      antProblem.Encoding.FunctionDefinitions = 3;
+      antProblem.Encoding.FunctionArguments = 3;
       antProblem.MaxTimeSteps.Value = 600;
       #endregion

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPLawnMowerSampleTest.cs

@@ -36 +36 @@
       ga.SetSeedRandomly.Value = false;
       SamplesUtils.RunAlgorithm(ga);
+      Assert.AreEqual(55, SamplesUtils.GetDoubleResult(ga, "BestQuality"));
+      Assert.AreEqual(49.266, SamplesUtils.GetDoubleResult(ga, "CurrentAverageQuality"));
+      Assert.AreEqual(1, SamplesUtils.GetDoubleResult(ga, "CurrentWorstQuality"));
+      Assert.AreEqual(50950, SamplesUtils.GetIntResult(ga, "EvaluatedSolutions"));
     }
 
@@ -43 +47 @@
       #region Problem Configuration
 
-      var problem = new HeuristicLab.Problems.LawnMower.Problem();
+      var problem = new Problems.GeneticProgramming.LawnMower.Problem();
 
       #endregion

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPMultiplexerSampleTest.cs

@@ -24 +24 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.Xml;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
-using HeuristicLab.Problems.Instances.DataAnalysis;
 using HeuristicLab.Selection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -51 +48 @@
       SamplesUtils.RunAlgorithm(osga);
 
-      Assert.AreEqual(0.125, SamplesUtils.GetDoubleResult(osga, "BestQuality"), 1E-8);
-      Assert.AreEqual(0.237275390625, SamplesUtils.GetDoubleResult(osga, "CurrentAverageQuality"), 1E-8);
-      Assert.AreEqual(1.181640625, SamplesUtils.GetDoubleResult(osga, "CurrentWorstQuality"), 1E-8);
-      Assert.AreEqual(105500, SamplesUtils.GetIntResult(osga, "EvaluatedSolutions"));
+      Assert.AreEqual(1856, SamplesUtils.GetDoubleResult(osga, "BestQuality"), 1E-8);
+      Assert.AreEqual(1784.76, SamplesUtils.GetDoubleResult(osga, "CurrentAverageQuality"), 1E-8);
+      Assert.AreEqual(1536, SamplesUtils.GetDoubleResult(osga, "CurrentWorstQuality"), 1E-8);
+      Assert.AreEqual(66900, SamplesUtils.GetIntResult(osga, "EvaluatedSolutions"));
     }
 
     public static OffspringSelectionGeneticAlgorithm CreateGpMultiplexerSample() {
-      var instanceProvider = new RegressionCSVInstanceProvider();
-      var regressionImportType = new RegressionImportType();
-      regressionImportType.TargetVariable = "output";
-      regressionImportType.TrainingPercentage = 100;
-      var dataAnalysisCSVFormat = new DataAnalysisCSVFormat();
-      dataAnalysisCSVFormat.Separator = ',';
-      dataAnalysisCSVFormat.VariableNamesAvailable = true;
-
-      var problemData = instanceProvider.ImportData(@"Test Resources\Multiplexer11.csv", regressionImportType, dataAnalysisCSVFormat);
-      problemData.Name = "11-Multiplexer";
-
-      var problem = new SymbolicRegressionSingleObjectiveProblem();
+      var problem = new HeuristicLab.Problems.GeneticProgramming.Boolean.MultiplexerProblem();
       problem.Name = "11-Multiplexer Problem";
-      problem.ProblemData = problemData;
-      problem.MaximumSymbolicExpressionTreeLength.Value = 50;
-      problem.MaximumSymbolicExpressionTreeDepth.Value = 50;
-      problem.EvaluatorParameter.Value = new SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator();
-      problem.ApplyLinearScaling.Value = false;
-
-
-      var grammar = new FullFunctionalExpressionGrammar();
-      problem.SymbolicExpressionTreeGrammar = grammar;
-      foreach (var symbol in grammar.Symbols) {
-        if (symbol is ProgramRootSymbol) symbol.Enabled = true;
-        else if (symbol is StartSymbol) symbol.Enabled = true;
-        else if (symbol is IfThenElse) symbol.Enabled = true;
-        else if (symbol is And) symbol.Enabled = true;
-        else if (symbol is Or) symbol.Enabled = true;
-        else if (symbol is Xor) symbol.Enabled = true;
-        else if (symbol.GetType() == typeof(Variable)) {
-          //necessary as there are multiple classes derived from Variable (e.g., VariableCondition)
-          symbol.Enabled = true;
-          var variableSymbol = (Variable)symbol;
-          variableSymbol.MultiplicativeWeightManipulatorSigma = 0.0;
-          variableSymbol.WeightManipulatorSigma = 0.0;
-          variableSymbol.WeightSigma = 0.0;
-        } else symbol.Enabled = false;
-      }
+      problem.Encoding.TreeLength = 50;
+      problem.Encoding.TreeDepth = 50;
 
       var osga = new OffspringSelectionGeneticAlgorithm();

stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -296 +296 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation.Views-3.4.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.GeneticProgramming-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\bin\HeuristicLab.Problems.GeneticProgramming-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -622 +627 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Test Resources\Multiplexer11.csv">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="Test Resources\SamplesExperimentFinished.hl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>