Changeset 3338 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/ArchitectureAlteringOperators/SubroutineDuplicater.cs

Timestamp:

04/13/10 20:44:31 (14 years ago)

Author:

gkronber

Message:

Fixed bugs related to dynamic symbol constraints with ADFs. #290 (Implement ADFs)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/ArchitectureAlteringOperators/SubroutineDuplicater.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/ArchitectureAlteringOperators/SubroutineDuplicater.cs

@@ -65 +65 @@
         // no function defining branches to duplicate or already reached the max number of ADFs
         return false;
-      var selectedBranch = (DefunTreeNode)SelectRandomBranch(random, functionDefiningBranches);
+      var selectedBranch = functionDefiningBranches.SelectRandom(random);
       var clonedBranch = (DefunTreeNode)selectedBranch.Clone();
       clonedBranch.Name = allowedFunctionNames.Except(UsedFunctionNames(symbolicExpressionTree)).First();
@@ -73 +73 @@
         if (invokeFunctionNode != null && invokeFunctionNode.InvokedFunctionName == selectedBranch.Name) {
           // add the new function name to the list of known functions in the branches that used the originating function
-          var branch = FindDefiningBranch(symbolicExpressionTree, invokeFunctionNode);
+          var branch = symbolicExpressionTree.GetTopLevelBranchOf(invokeFunctionNode);
           branch.AddDynamicSymbol(clonedBranch.Name, clonedBranch.NumberOfArguments);
           // flip coin wether to replace with newly defined function
@@ -83 +83 @@
       Debug.Assert(grammar.IsValidExpression(symbolicExpressionTree));
       return true;
-    }
-
-    private static SymbolicExpressionTreeNode FindDefiningBranch(SymbolicExpressionTree tree, SymbolicExpressionTreeNode node) {
-      foreach (var subtree in tree.Root.SubTrees) {
-        if (ContainsNode(subtree, node)) return subtree;
-      }
-      return null;
     }
 
@@ -106 +99 @@
     }
 
-    private static SymbolicExpressionTreeNode SelectRandomBranch(IRandom random, IEnumerable<DefunTreeNode> branches) {
-      var list = branches.ToList();
-      return list[random.Next(list.Count)];
-    }
+
   }
 }