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

Timestamp:

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

Author:

mkommend

Message:

#1418: Corrected ADFs and adapted unit tests.

Location:

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

Files:

• AllArchitectureAlteringOperatorsTest.cs (modified) (2 diffs)
• SubtreeCrossoverTest.cs (modified) (2 diffs)
• Util.cs (modified) (2 diffs)

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

@@ -32 +32 @@
   public class AllArchitectureAlteringOperatorsTest {
     private const int POPULATION_SIZE = 1000;
-    private const int N_ITERATIONS = 100;
+    private const int N_ITERATIONS = 200;
     private const int MAX_TREE_LENGTH = 100;
     private const int MAX_TREE_DEPTH = 10;
@@ -99 +99 @@
               par1 = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
             } while (par0.Length > MAX_TREE_LENGTH || par1.Length > MAX_TREE_LENGTH);
-            newTrees.Add(SubtreeCrossover.Cross(random, par0, par1, 0.9, MAX_TREE_LENGTH, MAX_TREE_DEPTH));
+            var newTree = SubtreeCrossover.Cross(random, par0, par1, 0.9, MAX_TREE_LENGTH, MAX_TREE_DEPTH);
+            Util.IsValid(newTree);
+            newTrees.Add(newTree);
           }
         }
-        trees = newTrees;
+        trees = new List<ISymbolicExpressionTree>(newTrees);
+        newTrees.Clear();
       }
       var msPerOperation = stopwatch.ElapsedMilliseconds / (double)POPULATION_SIZE / (double)N_ITERATIONS;

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();

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

@@ -141 +141 @@
 
       }
+
       foreach (var subtree in tree.Root.Subtrees) {
         Assert.AreNotSame(subtree.Grammar, tree.Root.Grammar);
@@ -159 +160 @@
         }
       }
+
+      foreach (var symbol in grammar.ModifyableSymbols) {
+        //check if ever symbol has at least on 
+        for (int i = 0; i < grammar.GetMaximumSubtreeCount(symbol); i++)
+          Assert.IsTrue(grammar.GetAllowedChildSymbols(symbol, i).Any());
+
+        //if (symbol is ProgramRootSymbol) continue;
+        ////check if symbol is allowed as at least one child symbol
+        //bool result = false;
+        //foreach (var parentSymbol in grammar.Symbols) {
+        //  if (result) break;
+        //  for (int i = 0; i < grammar.GetMaximumSubtreeCount(parentSymbol); i++)
+        //    result = result || grammar.IsAllowedChildSymbol(parentSymbol, symbol, i);
+        //}
+        //Assert.IsTrue(result);
+
+      }
     }