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

Timestamp:

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

Author:

pkimmesw

Message:

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

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/PushStack.cs (modified) (7 diffs)

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);
     }