Changeset 8585 for branches/HeuristicLab.Mono/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

Timestamp:

09/06/12 09:52:52 (12 years ago)

Author:

ascheibe

Message:

#1861 merged changes from trunk into branch

Location:

branches/HeuristicLab.Mono

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs (modified) (5 diffs)

branches/HeuristicLab.Mono/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

@@ -97 +97 @@
       ConfigureGeneticAlgorithmParameters<ProportionalSelector, OrderCrossover2, InversionManipulator>(
         ga, 100, 1, 1000, 0.05);
-
-      ga.Analyzer.Operators.SetItemCheckedState(ga.Analyzer.Operators
-        .OfType<TSPAlleleFrequencyAnalyzer>()
-        .Single(), false);
-      ga.Analyzer.Operators.SetItemCheckedState(ga.Analyzer.Operators
-        .OfType<TSPPopulationDiversityAnalyzer>()
-        .Single(), false);
       #endregion
       return ga;
@@ -350 +343 @@
       Assert.AreEqual(100.62175156249987, GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
       Assert.AreEqual(100900, GetIntResult(ga, "EvaluatedSolutions"));
+      var bestTrainingSolution = (IClassificationSolution)ga.Results["Best training solution"].Value;
+      Assert.AreEqual(0.80625, bestTrainingSolution.TrainingAccuracy, 1E-8);
+      Assert.AreEqual(0.782608695652174, bestTrainingSolution.TestAccuracy, 1E-8);
     }
 
@@ -555 +551 @@
         UnidirectionalRingMigrator, BestSelector, WorstReplacer>(
         ga, 100, 1, 1000, 0.05, 5, 50, 0.25);
-
-      ga.Analyzer.Operators.SetItemCheckedState(ga.Analyzer.Operators
-        .OfType<TSPAlleleFrequencyAnalyzer>()
-        .Single(), false);
-      ga.Analyzer.Operators.SetItemCheckedState(ga.Analyzer.Operators
-        .OfType<TSPPopulationDiversityAnalyzer>()
-        .Single(), false);
       #endregion
       return ga;
@@ -836 +825 @@
       ts.TabuTenure.Value = 60;
 
-      ts.Analyzer.Operators.SetItemCheckedState(ts.Analyzer.Operators
-        .OfType<TSPAlleleFrequencyAnalyzer>()
-        .Single(), false);
-      ts.Analyzer.Operators.SetItemCheckedState(ts.Analyzer.Operators
-        .OfType<TSPPopulationDiversityAnalyzer>()
-        .Single(), false);
       #endregion
       ts.Engine = new ParallelEngine();
@@ -920 +903 @@
         .Single(), false);
       vns.ShakingOperator = shakingOperator;
-      vns.Analyzer.Operators.SetItemCheckedState(vns.Analyzer.Operators
-        .OfType<TSPAlleleFrequencyAnalyzer>()
-        .Single(), false);
-      vns.Analyzer.Operators.SetItemCheckedState(vns.Analyzer.Operators
-        .OfType<TSPPopulationDiversityAnalyzer>()
-        .Single(), false);
       #endregion
       vns.Engine = new ParallelEngine();