Changeset 2675 for trunk/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionBase.cs

Timestamp:

01/22/10 16:12:26 (14 years ago)

Author:

gkronber

Message:

Implemented a fix in TreeGardener for #836 (Initial population doesn't contain all functions in combination with SimpleFunctionLibraryInjector). Added test cases for SimpleFunctionLibraryInjector. Changed code for calculation of minTreeHeight and minTreeSize in FunctionBase

File:

• trunk/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionBase.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionBase.cs

@@ -27 +27 @@
 using System.Diagnostics;
 using HeuristicLab.GP.Interfaces;
+using System.Linq;
 
 namespace HeuristicLab.GP {
@@ -72 +73 @@
       get {
         if (minTreeSize <= 0) RecalculateMinimalTreeSize();
+        Debug.Assert(minTreeSize > 0);
         return minTreeSize;
       }
@@ -79 +81 @@
       get {
         if (minTreeHeight <= 0) RecalculateMinimalTreeHeight();
+        Debug.Assert(minTreeHeight > 0);
         return minTreeHeight;
       }
@@ -130 +133 @@
 
     private void RecalculateMinimalTreeSize() {
-      minTreeSize = int.MaxValue;
-      int sum = 1;
-      int minSize = int.MaxValue;
-      for (int i = 0; i < MinSubTrees; i++) {
-        foreach (IFunction subFun in GetAllowedSubFunctions(i)) {
-          minSize = Math.Min(minSize, subFun.MinTreeSize);
-        }
-        sum += minSize;
-      }
-      minTreeSize = sum;
+      if (MinSubTrees == 0) minTreeSize = 1;
+      else {
+        minTreeSize = int.MaxValue; // prevent infinite recursion
+        minTreeSize = 1 + (from slot in Enumerable.Range(0, MinSubTrees)
+                           let minForSlot = (from function in GetAllowedSubFunctions(slot)
+                                             where function != this
+                                             select function.MinTreeSize).Min()
+                           select minForSlot).Sum();
+      }
     }
 
     private void RecalculateMinimalTreeHeight() {
-      minTreeHeight = int.MaxValue;
-      int height = 0;
-      int minHeight = int.MaxValue;
-      for (int i = 0; i < MinSubTrees; i++) {
-        foreach (IFunction subFun in GetAllowedSubFunctions(i)) {
-          minHeight = Math.Min(minHeight, subFun.MinTreeHeight);
-        }
-        height = Math.Max(height, minHeight);
-      }
-      minTreeHeight = height + 1;
+      if (MinSubTrees == 0) minTreeHeight = 1;
+      else {
+        minTreeHeight = int.MaxValue;
+        minTreeHeight = 1 + (from slot in Enumerable.Range(0, MinSubTrees)
+                             let minForSlot = (from function in GetAllowedSubFunctions(slot)
+                                               where function != this
+                                               select function.MinTreeHeight).Min()
+                             select minForSlot).Max();
+      }
     }