Changeset 8436 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/InterpreterState.cs

Timestamp:

08/08/12 16:04:29 (12 years ago)

Author:

mkommend

Message:

#1081: Merged changes from trunk into timeseries branch and refactored GP interpreter.

File:

• branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/InterpreterState.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/InterpreterState.cs

@@ -24 +24 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public class InterpreterState {
-    private double[] argumentStack;
+    private readonly double[] argumentStack;
     private int argumentStackPointer;
-    private Instruction[] code;
-    private int pc;
-    public int ProgramCounter {
-      get { return pc; }
-      set { pc = value; }
-    }
+    private readonly Instruction[] code;
+
+    public int ProgramCounter { get; set; }
+    public bool InLaggedContext { get; set; }
+
     public InterpreterState(Instruction[] code, int argumentStackSize) {
       this.code = code;
-      this.pc = 0;
+      this.ProgramCounter = 0;
+      this.InLaggedContext = false;
       if (argumentStackSize > 0) {
         this.argumentStack = new double[argumentStackSize];
@@ -42 +42 @@
 
     public void Reset() {
-      this.pc = 0;
+      this.ProgramCounter = 0;
       this.argumentStackPointer = 0;
+      this.InLaggedContext = false;
     }
 
     public Instruction NextInstruction() {
-      return code[pc++];
+      return code[ProgramCounter++];
     }
     // skips a whole branch