Changeset 2364 for trunk

Timestamp:

09/16/09 14:26:29 (15 years ago)

Author:

mkommend

Message:

added FunctionTreeIterator to HeuristicLab.GP.Interfaces (ticket #749)

Location:

trunk/sources

Files:

• HeuristicLab.GP.Interfaces/3.3/FunctionTreeIterator.cs (added)
• HeuristicLab.GP.Interfaces/3.3/HeuristicLab.GP.Interfaces-3.3.csproj (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/TreeEvaluatorBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.Interfaces/3.3/HeuristicLab.GP.Interfaces-3.3.csproj

@@ -80 +80 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="FunctionTreeIterator.cs" />
     <Compile Include="IFunctionTreeSerializer.cs">
       <SubType>Code</SubType>

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/TreeEvaluatorBase.cs

@@ -64 +64 @@
       codeArr = new Instr[functionTree.GetSize()];
       int i = 0;
-      foreach (IFunctionTree tree in IteratePrefix(functionTree)) {
+      foreach (IFunctionTree tree in FunctionTreeIterator.IteratePrefix(functionTree)) {
         codeArr[i++] = TranslateToInstr(tree);
       }
-    }
-
-    private IEnumerable<IFunctionTree> IteratePrefix(IFunctionTree functionTree) {
-      List<IFunctionTree> prefixForm = new List<IFunctionTree>();
-      prefixForm.Add(functionTree);
-      foreach (IFunctionTree subTree in functionTree.SubTrees) {
-        prefixForm.AddRange(IteratePrefix(subTree));
-      }
-      return prefixForm;
     }