Changeset 3297 for trunk

Timestamp:

04/10/10 11:26:26 (14 years ago)

Author:

gkronber

Message:

Added test classes for crossover and subroutine creater. #290 (Implement ADFs)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• ArchitectureAlteringOperators/SubroutineCreater.cs (modified) (1 diff)
• Creators/ProbabilisticTreeCreator.cs (modified) (1 diff)
• Crossovers/SubtreeCrossover.cs (modified) (2 diffs)
• Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.Tests.csproj (modified) (1 diff)
• Tests/ProbabilisticTreeCreaterTest.cs (modified) (6 diffs)
• Tests/SubroutineCreaterTest.cs (added)
• Tests/SubtreeCrossoverTest.cs (added)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/ArchitectureAlteringOperators/SubroutineCreater.cs

@@ -119 +119 @@
       // add new function name to original branch
       selectedBody.AddDynamicSymbol(functionName, argumentBranches.Count);
-      Debug.Assert(grammar.IsValidExpression(symbolicExpressionTree));
       return true;
     }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Creators/ProbabilisticTreeCreator.cs

@@ -57 +57 @@
         }
       } while (tree.Root.SubTrees.Count == 0 || tree.Size > maxTreeSize || tree.Height > maxTreeHeight);
-      System.Diagnostics.Debug.Assert(grammar.IsValidExpression(tree));
       return tree;
     }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Crossovers/SubtreeCrossover.cs

@@ -74 +74 @@
                             select branch;
 
-      if (allowedBranches.Count() > 0) {
+      if (allowedBranches.Count() == 0) {
+        success = false;
+        return parent0;
+      } else {
         var selectedBranch = SelectRandomBranch(random, allowedBranches, internalCrossoverPointProbability);
 
@@ -84 +87 @@
         return parent0;
       }
-
-      success = false;
-      return parent0;
     }
 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.Tests.csproj

@@ -39 +39 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SubroutineCreaterTest.cs" />
+    <Compile Include="SubtreeCrossoverTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProbabilisticTreeCreaterTest.cs" />

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

@@ -6 +6 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Random;
+using System.Diagnostics;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding_3._3.Tests {
@@ -18 +19 @@
         randomTrees.Add(ProbabilisticTreeCreator.Create(random, grammar, 100, 10));
       }
+      foreach (var tree in randomTrees)
+        Assert.IsTrue(grammar.IsValidExpression(tree));
     }
 
@@ -77 +80 @@
 
     [TestMethod()]
-    public void SizeDistributionTest() {
+    public void ProbabilisticTreeCreaterSizeDistributionTest() {
       int[] histogram = new int[105 / 5];
       for (int i = 0; i < randomTrees.Count; i++) {
@@ -92 +95 @@
 
     [TestMethod()]
-    public void FunctionDistributionTest() {
+    public void ProbabilisticTreeCreaterFunctionDistributionTest() {
       Dictionary<Symbol, int> occurances = new Dictionary<Symbol, int>();
       double n = 0.0;
@@ -115 +118 @@
 
     [TestMethod()]
-    public void NumberOfSubTreesDistributionTest() {
+    public void ProbabilisticTreeCreaterNumberOfSubTreesDistributionTest() {
       Dictionary<int, int> occurances = new Dictionary<int, int>();
       double n = 0.0;
@@ -137 +140 @@
 
     [TestMethod()]
-    public void TerminalDistributionTest() {
+    public void ProbabilisticTreeCreaterTerminalDistributionTest() {
       Dictionary<Symbol, int> occurances = new Dictionary<Symbol, int>();
       double n = 0.0;