Changeset 4108 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation

Timestamp:

07/27/10 00:07:36 (14 years ago)

Author:

abeham

Message:

#1033

• Changed collection to list
• Rebuilding dispatcher after every change to the list

#1110

• Added clone method

Location:

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation

Files:

• ITreeInterpreter.cs (modified) (1 diff)
• TreeInterpreter.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation/ITreeInterpreter.cs

@@ -26 +26 @@
 namespace HeuristicLab.Problems.ExternalEvaluation.GP {
   public interface ISymbolicExpressionTreeInterpreter : IItem {
-    double InterpretTree(SymbolicExpressionTree tree, Dictionary<string, double> variables);
+    void Prepare(SymbolicExpressionTree tree);
+    double InterpretTree(Dictionary<string, double> variables);
   }
 }

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation/TreeInterpreter.cs

@@ -92 +92 @@
     private Instruction[] code;
     private int pc;
-
+    
     public override bool CanChangeName {
       get { return false; }
@@ -104 +104 @@
     }
 
-    public double InterpretTree(SymbolicExpressionTree tree, Dictionary<string, double> variables) {
-      this.variables = variables;
+    public void Prepare(SymbolicExpressionTree tree) {
       var compiler = new SymbolicExpressionTreeCompiler();
       code = compiler.Compile(tree, MapSymbolToOpCode);
+    }
+
+    public double InterpretTree(Dictionary<string, double> variables) {
+      this.variables = variables;
       pc = 0;
       argStackPointer = 0;
@@ -123 +126 @@
     private int argStackPointer;
 
-    public double Evaluate() {
+    private double Evaluate() {
       var currentInstr = code[pc++];
       switch (currentInstr.opCode) {