Changeset 5792 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/SubtreeCrossoverTest.cs

Timestamp:

03/22/11 15:07:20 (13 years ago)

Author:

mkommend

Message:

#1418: Corrected ADFs and adapted unit tests.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/SubtreeCrossoverTest.cs (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/SubtreeCrossoverTest.cs

@@ -52 +52 @@
       var grammar = Grammars.CreateArithmeticAndAdfGrammar();
       var random = new MersenneTwister(31415);
-      List<ISymbolicExpressionTree> crossoverTrees;
       double msPerCrossoverEvent;
 
@@ -63 +62 @@
       stopwatch.Start();
       for (int gCount = 0; gCount < generations; gCount++) {
-        var newPopulation = new List<ISymbolicExpressionTree>();
         for (int i = 0; i < POPULATION_SIZE; i++) {
-          var par0 = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
-          var par1 = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
-          newPopulation.Add(SubtreeCrossover.Cross(random, par0, par1, 0.9, 100, 10));
+          var par0 = (ISymbolicExpressionTree)trees.SelectRandom(random).Clone();
+          var par1 = (ISymbolicExpressionTree)trees.SelectRandom(random).Clone();
+          SubtreeCrossover.Cross(random, par0, par1, 0.9, 100, 10);
         }
-        crossoverTrees = newPopulation;
       }
       stopwatch.Stop();