Changeset 396 for trunk/sources/HeuristicLab.Functions

Timestamp:

07/28/08 18:46:02 (16 years ago)

Author:

gkronber

Message:

fixed ticket #205 by creating the function-specific evaluator in the evaluation operators.

Location:

trunk/sources/HeuristicLab.Functions

Files:

• BakedFunctionTree.cs (modified) (2 diffs)
• BakedTreeEvaluator.cs (modified) (5 diffs)
• HeuristicLab.Functions.csproj (modified) (1 diff)
• IEvaluator.cs (added)
• IFunctionTree.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

@@ -48 +48 @@
   class BakedFunctionTree : ItemBase, IFunctionTree {
     private List<LightWeightFunction> linearRepresentation;
+    internal List<LightWeightFunction> LinearRepresentation {
+      get {
+        FlattenVariables();
+        FlattenTrees(); 
+        return linearRepresentation;
+      }
+    }
     private bool treesExpanded = false;
     private List<IFunctionTree> subTrees;
     private bool variablesExpanded = false;
     private List<IVariable> variables;
+    private BakedTreeEvaluator evaluator;
 
     public BakedFunctionTree() {
@@ -262 +270 @@
     }
 
-    public void PrepareEvaluation(Dataset dataset) {
-      FlattenVariables();
-      FlattenTrees();
-      BakedTreeEvaluator.ResetEvaluator(dataset, linearRepresentation);
-    }
-
-    public double Evaluate(int sampleIndex) {
-      return BakedTreeEvaluator.Evaluate(sampleIndex);
-    }
-
+    public IEvaluator CreateEvaluator(Dataset dataset) {
+      return new BakedTreeEvaluator(dataset);
+    }
 
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Functions {
-  internal static class BakedTreeEvaluator {
+  internal class BakedTreeEvaluator : IEvaluator {
     private const int MAX_TREE_SIZE = 4096;
 
@@ -40 +40 @@
     }
 
-    private static Instr[] codeArr;
-    private static int PC;
-    private static Dataset dataset;
-    private static int sampleIndex;
-
-
-    static BakedTreeEvaluator() {
+    private Instr[] codeArr;
+    private int PC;
+    private Dataset dataset;
+    private int sampleIndex;
+
+
+    public BakedTreeEvaluator(Dataset dataset) {
+      this.dataset = dataset;
       codeArr = new Instr[MAX_TREE_SIZE];
       for(int i = 0; i < MAX_TREE_SIZE; i++) {
@@ -53 +54 @@
     }
 
-    public static void ResetEvaluator(Dataset dataset, List<LightWeightFunction> linearRepresentation) {
+    public void ResetEvaluator(IFunctionTree functionTree) {
+      List<LightWeightFunction> linearRepresentation = ((BakedFunctionTree)functionTree).LinearRepresentation;
       int i = 0;
-      BakedTreeEvaluator.dataset = dataset;
       foreach(LightWeightFunction f in linearRepresentation) {
         TranslateToInstr(f, codeArr[i++]);
@@ -61 +62 @@
     }
 
-    private static Instr TranslateToInstr(LightWeightFunction f, Instr instr) {
+    private Instr TranslateToInstr(LightWeightFunction f, Instr instr) {
       instr.arity = f.arity;
       instr.symbol = EvaluatorSymbolTable.MapFunction(f.functionType);
@@ -79 +80 @@
     }
 
-    internal static double Evaluate(int sampleIndex) {
+    public double Evaluate(int sampleIndex) {
       PC = 0;
-      BakedTreeEvaluator.sampleIndex = sampleIndex;
+      this.sampleIndex = sampleIndex;
       return EvaluateBakedCode();
     }
 
-    private static double EvaluateBakedCode() {
+    private double EvaluateBakedCode() {
       Instr currInstr = codeArr[PC++];
       switch(currInstr.symbol) {

trunk/sources/HeuristicLab.Functions/HeuristicLab.Functions.csproj

@@ -58 +58 @@
     <Compile Include="Differential.cs" />
     <Compile Include="GreaterThan.cs" />
+    <Compile Include="IEvaluator.cs" />
     <Compile Include="IfThenElse.cs">
       <SubType>Code</SubType>

trunk/sources/HeuristicLab.Functions/IFunctionTree.cs

@@ -40 +40 @@
     void RemoveSubTree(int index);
 
-    void PrepareEvaluation(Dataset dataset);
-    double Evaluate(int sampleIndex);
+    IEvaluator CreateEvaluator(Dataset dataset);
   }
 }