Changeset 2211 for branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3

Timestamp:

07/29/09 19:07:21 (15 years ago)

Author:

gkronber

Message:

#713

• renamed MinArity and MaxArity properties
• fixed a caching bug in the Dataset
• renamed BakedTreeEvaluator to HL3TreeEvaluator
• deleted class BakedFunctionTree

Location:

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• Addition.cs (modified) (1 diff)
• And.cs (modified) (1 diff)
• Average.cs (modified) (1 diff)
• ConstantFunctionTree.cs (modified) (1 diff)
• FunctionLibraryInjector.cs (modified) (1 diff)
• HL3TreeEvaluator.cs (moved) (moved from branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/BakedTreeEvaluator.cs) (1 diff)
• HeuristicLab.GP.StructureIdentification-3.3.csproj (modified) (1 diff)
• IfThenElse.cs (modified) (1 diff)
• Multiplication.cs (modified) (1 diff)
• Or.cs (modified) (1 diff)
• VariableFunctionTree.cs (modified) (1 diff)

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Addition.cs

@@ -42 +42 @@
       : base() {
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
-      MinArity = 2;
-      MaxArity = 3;
+      MinSubTrees = 2;
+      MaxSubTrees = 3;
     }
   }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/And.cs

@@ -38 +38 @@
     public And()
       : base() {
-      MinArity = 2; MaxArity = 3;
+      MinSubTrees = 2; MaxSubTrees = 3;
     }
   }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Average.cs

@@ -36 +36 @@
     public Average()
       : base() {
-      MinArity = 2; MaxArity = 3;
+      MinSubTrees = 2; MaxSubTrees = 3;
     }
   }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/ConstantFunctionTree.cs

@@ -29 +29 @@
 namespace HeuristicLab.GP.StructureIdentification {
   public class ConstantFunctionTree : FunctionTreeBase {
+    private static readonly IList<IFunctionTree> subTrees = new List<IFunctionTree>().AsReadOnly();
     public double Value { get; set; }
 
-    public ConstantFunctionTree(Constant constant)
-      : base(constant) {
+    public ConstantFunctionTree(Constant constant) {
+      Function = constant;
     }
 
-    protected ConstantFunctionTree(ConstantFunctionTree original)
-      : base(original) {
+    protected ConstantFunctionTree(ConstantFunctionTree original) {
+      Function = original.Function;
       Value = original.Value;
+    }
+
+    public override IList<IFunctionTree> SubTrees {
+      get {
+        return subTrees;
+      }
     }
 

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/FunctionLibraryInjector.cs

@@ -238 +238 @@
 
     private void SetAllowedSubOperators(IFunction f, List<IFunction> gs) {
-      for (int i = 0; i < f.MaxArity; i++) {
+      for (int i = 0; i < f.MaxSubTrees; i++) {
         SetAllowedSubOperators(f, i, gs);
       }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/HL3TreeEvaluator.cs

@@ -34 +34 @@
   /// Not thread-safe!
   /// </summary>
-  public class BakedTreeEvaluator : TreeEvaluatorBase {
+  public class HL3TreeEvaluator : TreeEvaluatorBase {
 
 

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj

@@ -85 +85 @@
     <Compile Include="And.cs" />
     <Compile Include="Average.cs" />
-    <Compile Include="BakedTreeEvaluator.cs" />
     <Compile Include="Constant.cs" />
     <Compile Include="AlgorithmBase.cs" />
     <Compile Include="ConstantFunctionTree.cs" />
     <Compile Include="Evaluators\SimpleGPEvaluatorBase.cs" />
+    <Compile Include="HL3TreeEvaluator.cs" />
     <Compile Include="VariableFunctionTree.cs" />
     <Compile Include="TreeEvaluatorBase.cs" />

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/IfThenElse.cs

@@ -38 +38 @@
     public IfThenElse()
       : base() {
-      MinArity = 3; MaxArity = 3;
+      MinSubTrees = 3; MaxSubTrees = 3;
     }
   }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Multiplication.cs

@@ -43 +43 @@
       : base() {
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
-      MinArity = 2; MaxArity = 3;
+      MinSubTrees = 2; MaxSubTrees = 3;
     }
   }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Or.cs

@@ -37 +37 @@
     public Or()
       : base() {
-      MinArity = 2; MaxArity = 3;
+      MinSubTrees = 2; MaxSubTrees = 3;
     }
   }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/VariableFunctionTree.cs

@@ -29 +29 @@
 namespace HeuristicLab.GP.StructureIdentification {
   public class VariableFunctionTree : FunctionTreeBase {
+    private static readonly IList<IFunctionTree> subTrees = new List<IFunctionTree>().AsReadOnly();
     public double Weight { get; set; }
     public string VariableName { get; set; }
     public int SampleOffset { get; set; }
 
-    public VariableFunctionTree(Variable variable)
-      : base(variable) {
+    public VariableFunctionTree(Variable variable) {
+      Function = variable;
     }
 
-    protected VariableFunctionTree(VariableFunctionTree original)
-      : base(original) {
+    protected VariableFunctionTree(VariableFunctionTree original) {
+      Function = original.Function;
       Weight = original.Weight;
       VariableName = original.VariableName;
       SampleOffset = original.SampleOffset;
+    }
+
+    public override IList<IFunctionTree> SubTrees {
+      get {
+        return subTrees;
+      }
     }