Changeset 15189 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack

Timestamp:

07/10/17 21:36:03 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed small issues, testet benchmark suite, added INX Expressions

Location:

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

Files:

• IPrintStack.cs (added)
• IPushStack.cs (modified) (2 diffs)
• InterpreterStackStringifier.cs (modified) (1 diff)
• PrintStack.cs (added)
• PushStack.cs (modified) (5 diffs)
• StackTypes.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/IPushStack.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Stack {
-  using System;
   using System.Collections.Generic;
 
@@ -18 +17 @@
     void Push(IEnumerable<T> items);
     new void Clear();
-    T Peek();
-    T[] Peek(int count);
-    void PushResult(int count, Func<T[], T> templateFunc);
+    IReadOnlyList<T> Peek(int count);
     void Insert(int index, T item);
-    T ReverseElementAt(int offset);
     T Pop();
-    T[] Pop(int count);
+    IReadOnlyList<T> Pop(int count);
     bool TryPop(out T item);
     T ElementAt(int index);

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/InterpreterStackStringifier.cs

@@ -45 +45 @@
 
     private static IEnumerable<string> StringifyLiteralStack<T>(IPushStack<T> stack, string prefix = "", string postfix = "", bool reverse = true) {
-      var result = stack.AsEnumerable();
+      var result = stack.AsStrings();
 
       if (reverse)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/PushStack.cs

@@ -122 +122 @@
     }
 
-    public T ReverseElementAt(int offset) {
-      return data[offset];
-    }
-
     public T this[int index]
     {
@@ -145 +141 @@
       if (index == Count - 1) return;
 
-      var item = ReverseElementAt(index);
+      var item = data[index];
       data.RemoveAt(index);
       data.Add(item);
@@ -157 +153 @@
     }
 
-    public T[] Pop(int count) {
+    public IReadOnlyList<T> Pop(int count) {
       var items = Peek(count);
       Remove(count);
@@ -164 +160 @@
     }
 
-    public T Peek() {
-      return Top;
-    }
-
-    public T[] Peek(int count) {
+    public IReadOnlyList<T> Peek(int count) {
       var startIndex = Count - count;
 
@@ -207 +199 @@
     }
 
-    public void PushResult(int count, Func<T[], T> templateFunc) {
-      if (!IsEnabled) return;
-
-      var startIndex = Count - count;
-      var items = new T[count];
-
-      data.CopyTo(startIndex, items, 0, count);
-      Remove(count - 1);
-
-      data[Count - 1] = templateFunc(items);
-    }
-
     public void Push(IReadOnlyList<T> items, int startIndex) {
       if (!IsEnabled) return;

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/StackTypes.cs

@@ -20 +20 @@
     BooleanVector = 0x2000,
   }
+
+  //public static class StackTypeExtensions {
+  //  private static readonly IReadOnlyDictionary<StackTypes, string> StackTypesNameDict = new Dictionary<StackTypes, string> {
+  //    { StackTypes.Integer, "Integer" },
+  //    { StackTypes.Float, "Float" },
+  //    { StackTypes.Char, "Char" },
+  //    { StackTypes.String, "String" },
+  //    { StackTypes.Boolean, "Boolean" },
+  //    { StackTypes.Name, "Name" },
+  //    { StackTypes.Code, "Code" },
+  //    { StackTypes.Exec, "Exec" },
+  //    { StackTypes.Print, "Print" },
+  //    { StackTypes.IntegerVector, "IntegerVector" },
+  //    { StackTypes.FloatVector, "FloatVector" },
+  //    { StackTypes.StringVector, "StringVector" },
+  //    { StackTypes.BooleanVector, "BooleanVector" },
+  //  };
+
+  //  public static string GetName(this StackTypes types) {
+  //    return StackTypesNameDict[types];
+  //  }
+  //}
 }