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

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/Stack

Files:

• IPushStack.cs (modified) (1 diff)
• PushStack.cs (modified) (7 diffs)
• StackTypes.cs (modified) (2 diffs)

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

@@ -9 +9 @@
     T BottomOrDefault { get; }
     T this[int key] { get; set; }
-
     void Push(T item);
     void Push(T item1, T item2);
     void Push(T item1, T item2, T item3);
     void Push(T item1, T item2, T item3, T item4);
-
     void Push(IReadOnlyList<T> items, int startIndex = 0);
+    void Push(IReadOnlyList<T> items);
     T Peek();
     T[] Peek(int count);

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

@@ -118 +118 @@
 
     public T ReverseElementAt(int offset) {
-      return data[data.Count - 1 - offset];
+      return data[offset];
     }
 
@@ -125 +125 @@
     }
 
-    public T this[int key]
-    {
-      get
-      {
-        return data[key];
-      }
-      set
-      {
-        data[key] = value;
-      }
+    public T this[int index]
+    {
+      get { return data[Count - 1 - index]; }
+      set { data[Count - 1 - index] = value; }
     }
 
@@ -141 +135 @@
       var bottomIndex = Count - count;
 
-      for (var i = Count - 1; i > bottomIndex; i--) data[i] = data[i - 1];
+      for (var i = Count - 1; i > bottomIndex; i--)
+        data[i] = data[i - 1];
 
       data[bottomIndex] = top;
@@ -149 +144 @@
       if (index == Count - 1) return;
 
-      var item = ElementAt(index);
+      var item = ReverseElementAt(index);
       data.RemoveAt(index);
       data.Add(item);
@@ -155 +150 @@
 
     public T Pop() {
-      var value = data[Count - 1];
+      var top = Top;
       data.RemoveAt(Count - 1);
 
-      return value;
+      return top;
     }
 
@@ -223 +218 @@
     }
 
-    public void Push(IReadOnlyList<T> items, int startIndex = 0) {
+    public void Push(IReadOnlyList<T> items, int startIndex) {
       if (!IsEnabled) return;
 
@@ -229 +224 @@
     }
 
+    public void Push(IReadOnlyList<T> items) {
+      if (!IsEnabled) return;
+
+      data.AddRange(items);
+    }
+
     public void Insert(int index, T item) {
       if (!IsEnabled) return;
 
-      data.Insert(index, item);
+      data.Insert(Count - index, item);
     }
 

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

@@ -2 +2 @@
   using System;
 
+  // Be aware that it is assumed that this values are equal to HeuristicLab.BenchmarkSuite.DataTypes
   [Flags]
   public enum StackTypes : ushort {
@@ -13 +14 @@
     Code = 0x80,
     Exec = 0x100,
-    IntegerVector = 0x200,
-    FloatVector = 0x400,
-    BooleanVector = 0x800,
-    StringVector = 0x1000
+    Return = 0x200,
+    IntegerVector = 0x400,
+    FloatVector = 0x800,
+    StringVector = 0x1000,
+    BooleanVector = 0x2000
   }
 }