Changeset 1198

Timestamp:

02/02/09 12:49:44 (16 years ago)

Author:

gkronber

Message:

merged fix for #476 (ProbabilisticTreeCreator can create trees that are slightly larger than allowed) (r1181) from CEDMA refactoring branch to trunk.

File:

• trunk/sources/HeuristicLab.GP/ProbabilisticTreeCreator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.GP/ProbabilisticTreeCreator.cs

@@ -30 +30 @@
 namespace HeuristicLab.GP {
   public class ProbabilisticTreeCreator : OperatorBase {
+    private int MAX_TRIES { get { return 100; } }
+
     public override string Description {
       get { return @"Generates a new random operator tree."; }
@@ -56 +58 @@
 
       int treeSize = random.Next(minTreeSize, maxTreeSize + 1);
-      IFunctionTree root = gardener.PTC2(random, treeSize, maxTreeHeight);
 
-      int actualTreeSize = root.Size;
-      int actualTreeHeight = root.Height;
+      IFunctionTree root;
+      int actualTreeSize;
+      int actualTreeHeight;
+      int tries = 0;
+      do {
+        root = gardener.PTC2(random, treeSize, maxTreeHeight);
+        actualTreeSize = root.Size;
+        actualTreeHeight = root.Height;
+        if (tries++ >= MAX_TRIES) {
+          // try a different size
+          treeSize = random.Next(minTreeSize, maxTreeSize + 1);
+          tries = 0;
+        }
+      } while (actualTreeSize > maxTreeSize || actualTreeHeight > maxTreeHeight);
 
       scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("FunctionTree"), root));
@@ -65 +78 @@
       scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TreeHeight"), new IntData(actualTreeHeight)));
 
-      Debug.Assert(gardener.IsValidTree(root) && actualTreeHeight<=maxTreeHeight);
-
       return gardener.CreateInitializationOperation(gardener.GetAllSubTrees(root), scope);
     }