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

Timestamp:

05/03/17 12:48:46 (8 years ago)

Author:

pkimmesw

Message:

#2665 Added Dictionary of stacks to interperter, clear all stacks

Location:

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

Files:

• Extensions.cs (modified) (2 diffs)
• IPushInterpreter.cs (modified) (1 diff)
• PushInterpreter.cs (modified) (6 diffs)

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

@@ -24 +24 @@
     }
 
-    public static IPushStackBase GetStackBaseByType(this IPushInterpreter interpreter, StackTypes stackType) {
-      return StackProperties.ContainsKey(stackType)
-        ? (IPushStackBase)StackProperties[stackType].GetValue(interpreter)
-        : null;
-    }
-
     public static Type GetStackEntryType(this StackTypes stackType) {
       return StackProperties.ContainsKey(stackType)
@@ -41 +35 @@
       foreach (StackTypes type in Enum.GetValues(stackTypesType)) {
         var stackName = Enum.GetName(stackTypesType, type);
-        var stack = GetStackBaseByType(interpreter, type);
+        var stack = interpreter.Stacks[type];
 
         if (stack.IsEmpty || !stack.IsEnabled) return;

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

@@ -26 +26 @@
     IPushStack<string> PrintStack { get; }
     IDictionary<string, Expression> CustomExpressions { get; }
+    IReadOnlyDictionary<StackTypes, IPushStack> Stacks { get; }
     IReadOnlyPushConfiguration Configuration { get; }
     void Clear();

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

@@ -5 +5 @@
   using System.Threading;
   using System.Threading.Tasks;
-  using Attributes;
   using Configuration;
   using Core;
   using Expressions;
+
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
+
   using Parser;
   using Random;
@@ -26 +28 @@
       Configuration = config ?? new PushConfiguration();
 
-      // setting the capacity of the stacks to max points ensures that there will be enough memory at runtime
+      // setting the capacity of the Stacks to max points ensures that there will be enough memory at runtime
       ExecStack = new PushStack<Expression>(Configuration.MaxPointsInProgram);
 
@@ -77 +79 @@
       };
 
+      Stacks = new Dictionary<StackTypes, IPushStack> {
+        { StackTypes.Exec, ExecStack },
+        { StackTypes.Code, CodeStack },
+        { StackTypes.Integer, IntegerStack },
+        { StackTypes.Float, FloatStack },
+        { StackTypes.Boolean, BooleanStack },
+        { StackTypes.Char, CharStack },
+        { StackTypes.String, StringStack },
+        { StackTypes.Name, NameStack },
+        { StackTypes.IntegerVector, IntegerVectorStack },
+        { StackTypes.FloatVector, FloatVectorStack },
+        { StackTypes.BooleanVector, BooleanVectorStack },
+        { StackTypes.StringVector, StringVectorStack },
+        { StackTypes.Print, PrintStack },
+      };
+
       CustomExpressions = new Dictionary<string, Expression>();
       PoolContainer = poolContainer ?? new InterpreterPoolContainer();
@@ -84 +102 @@
       : this(config, new FastRandom(seed)) {
     }
+
+    public IReadOnlyDictionary<StackTypes, IPushStack> Stacks { get; private set; }
 
     public IRandom Random { get; set; }
@@ -123 +143 @@
 
     public IReadOnlyPushConfiguration Configuration { get; protected set; }
-
     [PushStack(StackTypes.Code)]
     public IPushStack<Expression> CodeStack { get; private set; }
-
     [PushStack(StackTypes.Exec)]
     public IPushStack<Expression> ExecStack { get; private set; }
-
     [PushStack(StackTypes.Name)]
     public IPushStack<string> NameStack { get; private set; }
-
     [PushStack(StackTypes.Boolean)]
     public IPushStack<bool> BooleanStack { get; private set; }
-
     [PushStack(StackTypes.Integer)]
     public IPushStack<long> IntegerStack { get; private set; }
-
     [PushStack(StackTypes.Float)]
     public IPushStack<double> FloatStack { get; private set; }
-
     [PushStack(StackTypes.Char)]
     public IPushStack<char> CharStack { get; private set; }
-
     [PushStack(StackTypes.String)]
     public IPushStack<string> StringStack { get; private set; }
-
     [PushStack(StackTypes.IntegerVector)]
     public IPushStack<List<long>> IntegerVectorStack { get; private set; }
-
     [PushStack(StackTypes.FloatVector)]
     public IPushStack<List<double>> FloatVectorStack { get; private set; }
-
     [PushStack(StackTypes.BooleanVector)]
     public IPushStack<List<bool>> BooleanVectorStack { get; private set; }
-
     [PushStack(StackTypes.StringVector)]
     public IPushStack<List<string>> StringVectorStack { get; private set; }
-
     [PushStack(StackTypes.Print)]
     public IPushStack<string> PrintStack { get; private set; }
@@ -275 +282 @@
 
     /// <summary>
-    /// Clears stacks and custom expressions
+    /// Clears Stacks and custom expressions
     /// </summary>
     public void Clear() {
-      ExecStack.Clear();
-      CodeStack.Clear();
-      NameStack.Clear();
-      BooleanStack.Clear();
-      IntegerStack.Clear();
-      FloatStack.Clear();
+      foreach (var stack in Stacks)
+        stack.Value.Clear();
 
       CustomExpressions.Clear();