Changeset 5727

Timestamp:

03/17/11 10:56:23 (14 years ago)

Author:

mkommend

Message:

#1418: Adapted ProbabilisticTreeCreator.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs (modified) (6 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

@@ -113 +113 @@
         if (targetTreeLength <= 1 || maxDepth <= 1) return;
 
-        bool success = CreateFullTreeFromSeed(random, seedNode, seedNode.Grammar, targetTreeLength, maxDepth);
+        bool success = TryCreateFullTreeFromSeed(random, seedNode, seedNode.Grammar, targetTreeLength, maxDepth);
 
         // if successful => check constraints and return the tree if everything looks ok        
@@ -127 +127 @@
     }
 
-    private static bool CreateFullTreeFromSeed(IRandom random, ISymbolicExpressionTreeNode root, ISymbolicExpressionTreeGrammar globalGrammar,
-      int targetLength, int maxDepth) {
-      try {
-        TryCreateFullTreeFromSeed(random, root, globalGrammar, targetLength, maxDepth);
-        return true;
-      }
-      catch (ArgumentException) { return false; }
-    }
-
-    private static void TryCreateFullTreeFromSeed(IRandom random, ISymbolicExpressionTreeNode root, ISymbolicExpressionTreeGrammar globalGrammar,
+    private static bool TryCreateFullTreeFromSeed(IRandom random, ISymbolicExpressionTreeNode root, ISymbolicExpressionTreeGrammar globalGrammar,
       int targetLength, int maxDepth) {
       List<TreeExtensionPoint> extensionPoints = new List<TreeExtensionPoint>();
@@ -142 +133 @@
       int totalListMinLength = globalGrammar.GetMinimumExpressionLength(root.Symbol) - 1;
       int actualArity = SampleArity(random, root, targetLength);
+      if (actualArity < 0) return false;
+
       for (int i = 0; i < actualArity; i++) {
         // insert a dummy sub-tree and add the pending extension to the list
@@ -180 +173 @@
 
           actualArity = SampleArity(random, newTree, targetLength - currentLength);
+          if (actualArity < 0) return false;
           for (int i = 0; i < actualArity; i++) {
             // insert a dummy sub-tree and add the pending extension to the list
@@ -199 +193 @@
         ReplaceWithMinimalTree(random, root, parent, a);
       }
+      return true;
     }
 
@@ -260 +255 @@
         }
       }
-      if (minArity > maxArity) throw new ArgumentException();
+      if (minArity > maxArity) return -1;
       return random.Next(minArity, maxArity + 1);
     }