Changeset 2210 for branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/Logging

Timestamp:

07/29/09 18:28:45 (15 years ago)

Author:

gkronber

Message:

GP Refactoring #713

• introduced a plugin for GP interfaces
• created a new interface IGeneticProgrammingModel which represents GP models in HL scopes instead of IFunctionTree
• changed interfaces IFunction and IFunctionTree
• moved some files to new directories (general housekeeping)
• changed all GP operators and engines to work with IGeneticProgrammingModels
• removed parameters TreeSize and TreeHeight in all GP operators
• changed parameter OperatorLibrary to FunctionLibrary in all GP operators

File:

• branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/Logging/TreeArityAnalyser.cs (modified) (3 diffs)

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/Logging/TreeArityAnalyser.cs

@@ -30 +30 @@
 using HeuristicLab.Constraints;
 using System.Diagnostics;
+using HeuristicLab.GP.Interfaces;
 
 namespace HeuristicLab.GP {
@@ -43 +44 @@
     public TreeArityAnalyser()
       : base() {
-      AddVariableInfo(new VariableInfo("FunctionTree", "The tree to mutate", typeof(IFunctionTree), VariableKind.In));
+      AddVariableInfo(new VariableInfo("FunctionTree", "The tree to analyse", typeof(IGeneticProgrammingModel), VariableKind.In));
       AddVariableInfo(new VariableInfo("Histogram", "The histogram of arities over all functions in all functiontrees", typeof(ItemList<ItemList<IntData>>), VariableKind.New | VariableKind.Out));
     }
@@ -69 +70 @@
 
     private ItemList<ItemList<IntData>> GetArityHistogram(IScope subScope) {
-      IFunctionTree tree = GetVariableValue<IFunctionTree>("FunctionTree", subScope, false);
+      IGeneticProgrammingModel gpModel = GetVariableValue<IGeneticProgrammingModel>("FunctionTree", subScope, false);
       List<int> arities = new List<int>();
-      Arities(tree, arities);
+      Arities(gpModel.FunctionTree, arities);
       var histogram = arities.GroupBy(x => x, (g, xs) => new { Group = g, Count = xs.Count() }).OrderBy(g=>g.Group); // count number of distinct arities
       ItemList<ItemList<IntData>> result = new ItemList<ItemList<IntData>>();