Changeset 5686 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs

Timestamp:

03/15/11 13:34:38 (14 years ago)

Author:

mkommend

Message:

#1418: Finally added results from the grammar refactoring.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs (modified) (5 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -126 +126 @@
                        where node.SubTrees.Count() > 0
                        from subtree in node.SubTrees
-                       select new { Parent = node, ReplacedChildIndex = node.IndexOfSubTree(subtree), ReplacedChild = subtree }).ToList();
+                       select new CutPoint(node, subtree)).ToList();
 
       if (cutPoints.Count() == 0)
@@ -133 +133 @@
       var selectedCutPoint = cutPoints[random.Next(cutPoints.Count)];
       // replace the branch at the cut point with an argument node
-      var replacedBranch = selectedCutPoint.ReplacedChild;
-      selectedCutPoint.Parent.RemoveSubTree(selectedCutPoint.ReplacedChildIndex);
-      selectedCutPoint.Parent.InsertSubTree(selectedCutPoint.ReplacedChildIndex, newArgumentNode);
+      var replacedBranch = selectedCutPoint.Child;
+      selectedCutPoint.Parent.RemoveSubTree(selectedCutPoint.ChildIndex);
+      selectedCutPoint.Parent.InsertSubTree(selectedCutPoint.ChildIndex, newArgumentNode);
 
       // find all old invocations of the selected ADF and attach a cloned version of the replaced branch (with all argument-nodes expanded)
@@ -167 +167 @@
       defunBranch.NumberOfArguments++;
       defunBranch.Grammar.AddSymbol(newArgumentNode.Symbol);
-      defunBranch.Grammar.SetMinSubtreeCount(newArgumentNode.Symbol, 0);
-      defunBranch.Grammar.SetMaxSubtreeCount(newArgumentNode.Symbol, 0);
+      defunBranch.Grammar.SetSubtreeCount(newArgumentNode.Symbol, 0, 0);
       // allow the argument as child of any other symbol
       foreach (var symb in defunBranch.Grammar.Symbols)
-        for (int i = 0; i < defunBranch.Grammar.GetMaxSubtreeCount(symb); i++) {
-          defunBranch.Grammar.SetAllowedChild(symb, newArgumentNode.Symbol, i);
+        for (int i = 0; i < defunBranch.Grammar.GetMaximumSubtreeCount(symb); i++) {
+          defunBranch.Grammar.AddAllowedChildSymbol(symb, newArgumentNode.Symbol, i);
         }
       foreach (var subtree in tree.Root.SubTrees) {
@@ -178 +177 @@
         var matchingSymbol = subtree.Grammar.Symbols.OfType<InvokeFunction>().Where(s => s.FunctionName == defunBranch.FunctionName).SingleOrDefault();
         if (matchingSymbol != null) {
-          subtree.Grammar.SetMinSubtreeCount(matchingSymbol, defunBranch.NumberOfArguments);
-          subtree.Grammar.SetMaxSubtreeCount(matchingSymbol, defunBranch.NumberOfArguments);
-          foreach (var child in subtree.Grammar.GetAllowedSymbols(subtree.Symbol, 0)) {
-            for (int i = 0; i < subtree.Grammar.GetMaxSubtreeCount(matchingSymbol); i++) {
-              subtree.Grammar.SetAllowedChild(matchingSymbol, child, i);
+          subtree.Grammar.SetSubtreeCount(matchingSymbol, defunBranch.NumberOfArguments, defunBranch.NumberOfArguments);
+          foreach (var child in subtree.Grammar.GetAllowedChildSymbols(subtree.Symbol, 0)) {
+            for (int i = 0; i < subtree.Grammar.GetMaximumSubtreeCount(matchingSymbol); i++) {
+              subtree.Grammar.AddAllowedChildSymbol(matchingSymbol, child, i);
             }
           }