Changeset 155 for trunk/sources/HeuristicLab.StructureIdentification/RandomTreeCreator.cs

Timestamp:

04/22/08 18:05:14 (17 years ago)

Author:

gkronber

Message:

merged FunctionsAndStructIdRefactoring-branch (r142, r143, r144, r145, r146, r147, r148, r149, r152, r153) back into the trunk (ticket #112)

File:

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

trunk/sources/HeuristicLab.StructureIdentification/RandomTreeCreator.cs

@@ -26 +26 @@
 using System;
 using HeuristicLab.Random;
+using HeuristicLab.Functions;
 
 namespace HeuristicLab.StructureIdentification {
@@ -40 +41 @@
       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("OperatorTree", "The tree to mutate", typeof(IOperator), VariableKind.In));
-      AddVariableInfo(new VariableInfo("TreeSize", "The size (number of nodes) of the tree", typeof(IntData), VariableKind.In));
-      AddVariableInfo(new VariableInfo("TreeHeight", "The height of the tree", typeof(IntData), VariableKind.In));
+      AddVariableInfo(new VariableInfo("FunctionTree", "The created tree", typeof(IFunctionTree), VariableKind.New | VariableKind.Out));
+      AddVariableInfo(new VariableInfo("TreeSize", "The size (number of nodes) of the tree", typeof(IntData), VariableKind.New | VariableKind.Out));
+      AddVariableInfo(new VariableInfo("TreeHeight", "The height of the tree", typeof(IntData), VariableKind.New | VariableKind.Out));
     }
 
@@ -56 +57 @@
       int treeHeight = random.Next(1, maxTreeHeight + 1);
       int treeSize = random.Next(1, maxTreeSize + 1);
-      IOperator rootOperator;
+      IFunctionTree root;
       if(random.NextDouble() <= balancedTreesRate) {
-        rootOperator = gardener.CreateRandomTree(treeSize, treeHeight, true);
+        root = gardener.CreateRandomTree(treeSize, treeHeight, true);
       } else {
-        rootOperator = gardener.CreateRandomTree(treeSize, treeHeight, false);
+        root = gardener.CreateRandomTree(treeSize, treeHeight, false);
       }
 
-      int actualTreeSize = gardener.GetTreeSize(rootOperator);
-      int actualTreeHeight = gardener.GetTreeHeight(rootOperator);
+      int actualTreeSize = gardener.GetTreeSize(root);
+      int actualTreeHeight = gardener.GetTreeHeight(root);
 
-      scope.AddVariable(new Variable("OperatorTree", rootOperator));
-      scope.AddVariable(new Variable("TreeSize", new IntData(actualTreeSize)));
-      scope.AddVariable(new Variable("TreeHeight", new IntData(actualTreeHeight)));
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("FunctionTree"), root));
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TreeSize"), new IntData(actualTreeSize)));
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TreeHeight"), new IntData(actualTreeHeight)));
 
-      if(!gardener.IsValidTree(rootOperator)) { throw new InvalidProgramException(); }
+      if(!gardener.IsValidTree(root)) { throw new InvalidProgramException(); }
 
       if(actualTreeSize > maxTreeSize ||
@@ -77 +78 @@
       }
 
-      return gardener.CreateInitializationOperation(gardener.GetAllOperators(rootOperator), scope);
+      return gardener.CreateInitializationOperation(gardener.GetAllSubTrees(root), scope);
     }
   }