Changeset 1212 for trunk/sources/HeuristicLab.GP/Recombination/SizeFairCrossOver.cs

Timestamp:

02/10/09 12:59:37 (15 years ago)

Author:

gkronber

Message:

merged r1200 and r1209 from CEDMA refactoring branch into trunk. #479 (Crossover operators create trees that are larger than the allowed max size)

File:

• trunk/sources/HeuristicLab.GP/Recombination/SizeFairCrossOver.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP/Recombination/SizeFairCrossOver.cs

@@ -83 +83 @@
       if (shorterBranches.Count > 0 && longerBranches.Count > 0) {
         double pEqualLength = equalLengthBranches.Count > 0 ? 1.0 / removedBranchSize : 0.0;
-        double pLonger = (1.0 - pEqualLength) / (longerBranches.Count * (1.0 + longerBranches.Average(p => p.branchSize) / shorterBranches.Average(p => p.branchSize)));
+        double pLonger;
+        if (parent.Size == maxTreeSize) {
+          pLonger = 0.0;
+        } else {
+          pLonger = (1.0 - pEqualLength) / (longerBranches.Count * (1.0 + longerBranches.Average(p => p.branchSize) / shorterBranches.Average(p => p.branchSize)));
+        }
         double pShorter = (1.0 - pEqualLength - pLonger);