Changeset 3989 for trunk

Timestamp:

06/30/10 15:26:36 (14 years ago)

Author:

gkronber

Message:

Improved LINQ statements in SubtreeCrossover to make them more efficient. #938

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Crossovers/SubtreeCrossover.cs (modified) (3 diffs)

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

@@ -67 +67 @@
       int maxInsertedBranchHeight = maxTreeHeight - GetBranchLevel(parent0.Root, crossoverPoint0);
 
-      var allowedBranches = (from branch in parent1.Root.IterateNodesPrefix()
+      var allowedBranches = (from branch in parent1.Root.IterateNodesPostfix()
                              where branch.GetSize() < maxInsertedBranchSize
                              where branch.GetHeight() < maxInsertedBranchHeight
@@ -103 +103 @@
 
     private static void SelectCrossoverPoint(IRandom random, SymbolicExpressionTree parent0, double internalNodeProbability, int maxBranchSize, int maxBranchHeight, out SymbolicExpressionTreeNode crossoverPoint, out int subtreeIndex) {
-      var crossoverPoints = from branch in parent0.Root.IterateNodesPrefix()
-                            where branch.SubTrees.Count > 0
-                            where branch != parent0.Root
-                            where branch.GetSize() < maxBranchSize
-                            where branch.GetHeight() < maxBranchHeight
-                            from index in Enumerable.Range(0, branch.SubTrees.Count)
-                            let p = new { CrossoverPoint = branch, SubtreeIndex = index, IsLeaf = branch.SubTrees[index].SubTrees.Count == 0 }
-                            select p;
+      var crossoverPoints = (from branch in parent0.Root.IterateNodesPostfix()
+                             where branch.SubTrees.Count > 0
+                             where branch != parent0.Root
+                             where branch.GetSize() < maxBranchSize
+                             where branch.GetHeight() < maxBranchHeight
+                             from index in Enumerable.Range(0, branch.SubTrees.Count)
+                             let p = new { CrossoverPoint = branch, SubtreeIndex = index, IsLeaf = branch.SubTrees[index].SubTrees.Count == 0 }
+                             select p).ToList();
       var internalCrossoverPoints = (from p in crossoverPoints
                                      where !p.IsLeaf
@@ -139 +139 @@
     private static SymbolicExpressionTreeNode SelectRandomBranch(IRandom random, IEnumerable<SymbolicExpressionTreeNode> branches, double internalNodeProbability) {
       if (internalNodeProbability < 0.0 || internalNodeProbability > 1.0) throw new ArgumentException("internalNodeProbability");
-      var groupedBranches = (from branch in branches
-                             group branch by branch.SubTrees.Count into g
-                             select g).ToList();
-      var allowedInternalBranches = (from g in groupedBranches
-                                     where g.Key > 0
-                                     from branch in g
+      var allowedInternalBranches = (from branch in branches
+                                     where branch.SubTrees.Count > 0
                                      select branch).ToList();
-      var allowedLeafBranches = (from g in groupedBranches
-                                 where g.Key == 0
-                                 from leaf in g
-                                 select leaf).ToList();
+      var allowedLeafBranches = (from branch in branches
+                                 where branch.SubTrees.Count == 0
+                                 select branch).ToList();
       if (allowedInternalBranches.Count == 0) {
         return allowedLeafBranches.SelectRandom(random);