Changeset 3442 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Creators/ProbabilisticTreeCreator.cs

Timestamp:

04/20/10 15:49:22 (14 years ago)

Author:

gkronber

Message:

Implemented views for DataAnalysisProblems and DataAnalysisSolutions. #938 (Data types and operators for regression problems)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Creators/ProbabilisticTreeCreator.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Creators/ProbabilisticTreeCreator.cs

@@ -56 +56 @@
       SymbolicExpressionTree tree = new SymbolicExpressionTree();
       var rootNode = grammar.StartSymbol.CreateTreeNode();
+      if (rootNode.HasLocalParameters) rootNode.ResetLocalParameters(random);
       rootNode.Grammar = grammar;
       tree.Root = PTC2(random, rootNode, maxTreeSize, maxTreeHeight, maxFunctionDefinitions, maxFunctionArguments);
@@ -111 +112 @@
         var dummy = new SymbolicExpressionTreeNode();
         root.AddSubTree(dummy);
-        // dummy.Grammar = (ISymbolicExpressionGrammar)dummy.Grammar.Clone();
         extensionPoints.Add(new TreeExtensionPoint { Parent = root, ChildIndex = i, ExtensionPointDepth = 2 });
       }
@@ -132 +132 @@
           Symbol selectedSymbol = SelectRandomSymbol(random, allowedSymbols);
           SymbolicExpressionTreeNode newTree = selectedSymbol.CreateTreeNode();
+          if (newTree.HasLocalParameters) newTree.ResetLocalParameters(random);
           parent.RemoveSubTree(argumentIndex);
           parent.InsertSubTree(argumentIndex, newTree);
@@ -145 +146 @@
             var dummy = new SymbolicExpressionTreeNode();
             newTree.AddSubTree(dummy);
-            //if (IsTopLevelBranch(root, dummy))
-            //  dummy.Grammar = (ISymbolicExpressionGrammar)dummy.Grammar.Clone();
             extensionPoints.Add(new TreeExtensionPoint { Parent = newTree, ChildIndex = i, ExtensionPointDepth = extensionDepth + 1 });
           }
@@ -172 +171 @@
       var selectedSymbol = SelectRandomSymbol(random, possibleSymbols);
       var tree = selectedSymbol.CreateTreeNode();
+      if (tree.HasLocalParameters) tree.ResetLocalParameters(random);
       parent.RemoveSubTree(argumentIndex);
       parent.InsertSubTree(argumentIndex, tree);
@@ -179 +179 @@
         var dummy = new SymbolicExpressionTreeNode();
         tree.AddSubTree(dummy);
-        // dummy.Grammar = (ISymbolicExpressionGrammar)dummy.Grammar.Clone();
         // replace the just inserted dummy by recursive application
         ReplaceWithMinimalTree(random, root, tree, i, maxFunctionDefinitions, maxFunctionArguments);
@@ -229 +228 @@
 
     private static bool IsTopLevelBranch(SymbolicExpressionTreeNode root, SymbolicExpressionTreeNode branch) {
-      //return root.SubTrees.IndexOf(branch) > -1;
       return branch is SymbolicExpressionTreeTopLevelNode;
     }