Changeset 285 for trunk/sources

Timestamp:

06/03/08 13:17:31 (16 years ago)

Author:

gkronber

Message:

• removed the randomly selected size-limit from the RandomTreeCreator to force a more uniform distribution of tree-heights.
• added a parameter minimum tree-height

File:

• trunk/sources/HeuristicLab.StructureIdentification/RandomTreeCreator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.StructureIdentification/RandomTreeCreator.cs

@@ -38 +38 @@
       AddVariableInfo(new VariableInfo("Random", "Uniform random number generator", typeof(MersenneTwister), VariableKind.In));
       AddVariableInfo(new VariableInfo("OperatorLibrary", "The operator library containing all available operators", typeof(GPOperatorLibrary), VariableKind.In));
+      AddVariableInfo(new VariableInfo("MinTreeHeight", "The minimal allowed height of the tree", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("MaxTreeHeight", "The maximal allowed height of the tree", typeof(IntData), VariableKind.In));
-      AddVariableInfo(new VariableInfo("MaxTreeSize", "The maximal allowed size (number of nodes) of the tree", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("BalancedTreesRate", "Determines how many trees should be balanced", typeof(DoubleData), VariableKind.In));
       AddVariableInfo(new VariableInfo("FunctionTree", "The created tree", typeof(IFunctionTree), VariableKind.New | VariableKind.Out));
@@ -49 +49 @@
       IRandom random = GetVariableValue<IRandom>("Random", scope, true);
       GPOperatorLibrary opLibrary = GetVariableValue<GPOperatorLibrary>("OperatorLibrary", scope, true);
+      int minTreeHeight = GetVariableValue<IntData>("MinTreeHeight", scope, true).Data;
       int maxTreeHeight = GetVariableValue<IntData>("MaxTreeHeight", scope, true).Data;
-      int maxTreeSize = GetVariableValue<IntData>("MaxTreeSize", scope, true).Data;
       double balancedTreesRate = GetVariableValue<DoubleData>("BalancedTreesRate", scope, true).Data;
 
       TreeGardener gardener = new TreeGardener(random, opLibrary);
 
-      int treeHeight = random.Next(1, maxTreeHeight + 1);
-      int treeSize = random.Next(1, maxTreeSize + 1);
+      int treeHeight = random.Next(minTreeHeight, maxTreeHeight + 1);
       IFunctionTree root;
       if(random.NextDouble() <= balancedTreesRate) {
-        root = gardener.CreateBalancedRandomTree(treeSize, treeHeight);
+        root = gardener.CreateBalancedRandomTree(Int32.MaxValue, treeHeight);
       } else {
-        root = gardener.CreateUnbalancedRandomTree(treeSize, treeHeight);
+        root = gardener.CreateUnbalancedRandomTree(Int32.MaxValue, treeHeight);
       }
 
@@ -73 +72 @@
       if(!gardener.IsValidTree(root)) { throw new InvalidProgramException(); }
 
-      if(actualTreeSize > maxTreeSize ||
-        actualTreeHeight > maxTreeHeight) {
+      if(actualTreeHeight > maxTreeHeight) {
         throw new InvalidProgramException();
       }