Changeset 3369 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests/AllArchitectureAlteringOperatorsTest.cs

Timestamp:

04/16/10 12:12:29 (14 years ago)

Author:

gkronber

Message:

Changed way the grammar is stored in tree nodes to make it more efficient and fixed bugs in symbolic expression tree operators. #290 (Implement ADFs)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests/AllArchitectureAlteringOperatorsTest.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests/AllArchitectureAlteringOperatorsTest.cs

@@ -74 +74 @@
       for (int g = 0; g < N_ITERATIONS; g++) {
         for (int i = 0; i < POPULATION_SIZE; i++) {
-          var selectedTree = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
-          var op = combinedAAOperator.Operators.SelectRandom(random);
-          bool success;
-          op.ModifyArchitecture(random, selectedTree, grammar, maxTreeSize, maxTreeHeigth, maxDefuns, maxArgs, out success);
-          if (!success) failedEvents++;
-          Util.IsValid(selectedTree);
-          newTrees.Add(selectedTree);
+          if (random.NextDouble() < 0.5) {
+            // manipulate
+            var selectedTree = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
+            var op = combinedAAOperator.Operators.SelectRandom(random);
+            bool success;
+            op.ModifyArchitecture(random, selectedTree, grammar, maxTreeSize, maxTreeHeigth, maxDefuns, maxArgs, out success);
+            if (!success) failedEvents++;
+            Util.IsValid(selectedTree);
+            newTrees.Add(selectedTree);
+          } else {
+            // crossover
+            var par0 = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
+            var par1 = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
+            bool success;
+            newTrees.Add(SubtreeCrossover.Cross(random, par0, par1, 0.9, 100, 10, out success));
+            if (!success) failedEvents++;
+          }
         }
         trees = newTrees;