Changeset 1200

Timestamp:

02/03/09 17:35:58 (16 years ago)

Author:

gkronber

Message:

Set probability of creating larger trees to zero when max-tree size is reached in SizeFairCrossOver #479 (Crossover operators create trees that are larger than the allowed max size).

File:

• branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP/Recombination/SizeFairCrossOver.cs (modified) (1 diff)

branches/CEDMA-Refactoring-Ticket419/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);