Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter

Timestamp:

04/18/17 01:15:25 (8 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter

Files:

• InterpreterPoolContainer.cs (modified) (2 diffs)
• PushInterpreter.cs (modified) (11 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/InterpreterPoolContainer.cs

@@ -67 +67 @@
 
     private void InitStatefulExpressionPools(int partitionSize, int maxPartitionCount) {
-      for (var i = 0; i < ExpressionTable.StatefulExpressionTypes.Length; i++) {
+      for (var i = 0; i < ExpressionTable.StatefulExpressionTypes.Count; i++) {
         var type = ExpressionTable.StatefulExpressionTypes[i];
         var name = ExpressionTable.TypeToNameTable[type];
@@ -104 +104 @@
       }
 
-      for (var i = 0; i < ExpressionTable.StatefulExpressionTypes.Length; i++) {
+      for (var i = 0; i < ExpressionTable.StatefulExpressionTypes.Count; i++) {
         var type = ExpressionTable.StatefulExpressionTypes[i];
         var pool = statefulExpressionPools[type];

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreter.cs

@@ -21 +21 @@
     private Task currentTask;
 
-
     public PushInterpreter(IReadOnlyPushConfiguration config = null, IRandom random = null, InterpreterPoolContainer poolContainer = null) {
       Random = random ?? new FastRandom();
@@ -28 +27 @@
 
       // setting the capacity of the stacks to max points ensures that there will be enough memory at runtime
-      ExecStack = new PushStack<Expression>(Configuration.EvalPushLimit);
-
-      CodeStack = new PushStack<Expression>(Configuration.EvalPushLimit) {
+      ExecStack = new PushStack<Expression>(Configuration.MaxPointsInProgram);
+
+      CodeStack = new PushStack<Expression> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.Code]
       };
@@ -37 +36 @@
         IsEnabled = Configuration.EnabledStacks[StackTypes.Code]
       };
+
       BooleanStack = new PushStack<bool> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.Boolean]
       };
+
       IntegerStack = new PushStack<long> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.Integer]
       };
+
       FloatStack = new PushStack<double> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.Float]
       };
+
       CharStack = new PushStack<char> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.Char]
       };
+
       StringStack = new PushStack<string> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.String]
       };
+
       IntegerVectorStack = new PushStack<List<long>> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.IntegerVector]
       };
+
       FloatVectorStack = new PushStack<List<double>> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.FloatVector]
       };
+
       BooleanVectorStack = new PushStack<List<bool>> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.BooleanVector]
       };
+
       StringVectorStack = new PushStack<List<string>> {
         IsEnabled = Configuration.EnabledStacks[StackTypes.StringVector]
@@ -66 +74 @@
 
       CustomExpressions = new Dictionary<string, Expression>();
-
       PoolContainer = poolContainer ?? new InterpreterPoolContainer();
     }
@@ -76 +83 @@
     public IRandom Random { get; set; }
 
-    public int ExecCounter { get; private set; }
+    public long ExecCounter { get; private set; }
 
     public bool IsPaused { get; private set; }
@@ -159 +166 @@
     }
     public async Task RunAsync(Expression expression, CancellationToken token = default(CancellationToken)) {
-      await Task.Run(() => Run(expression, false), token);
+      await Task.Run(() => Run(expression), token);
     }
 
@@ -176 +183 @@
       ExecStack.Push(expression);
 
-      if (Configuration.TopLevelPushCode) CodeStack.Insert(0, expression);
+      if (Configuration.TopLevelPushCode) CodeStack.Push(expression);
 
       // expand if program
@@ -183 +190 @@
 
       Run();
+    }
+
+    public bool CanRun(int count) {
+      return ExecStack.Count >= count &&
+             !IsPaused &&
+             !IsAborted &&
+             ExecCounter + count < Configuration.EvalPushLimit;
     }
 
@@ -237 +251 @@
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void Step(int count) {
-      for (var i = 0; i < count; i++) Step();
+      for (var i = 0u; i < count; i++) Step();
     }
 
     /// <summary>
-    /// Clears stacks
+    /// Reset while interpreter
     /// </summary>
     public void Reset() {
@@ -269 +283 @@
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private void Run() {
+      // if no stack which is modifies the exec stack is enabled, unroll loop due to performance reasons
+      if (!Configuration.EnabledStacks[StackTypes.Exec] &&
+          !Configuration.EnabledStacks[StackTypes.Code]) {
+        while (CanRun(10))
+          DoTenSteps();
+      }
+
       while (IsRunning)
         DoStep();
@@ -314 +335 @@
 #endif
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private void DoTenSteps() {
+      ExecStack[0].Eval(this);
+      ExecStack[1].Eval(this);
+      ExecStack[2].Eval(this);
+      ExecStack[3].Eval(this);
+      ExecStack[4].Eval(this);
+      ExecStack[5].Eval(this);
+      ExecStack[6].Eval(this);
+      ExecStack[7].Eval(this);
+      ExecStack[8].Eval(this);
+      ExecStack[9].Eval(this);
+
+      ExecStack.Remove(10);
+      ExecCounter += 10;
+    }
+
     private Task InterpretAsync() {
       currentTask = Task.Run(() => this.Run());