renamed peek to top/head for interoperability with queue

6jkruege · 6jkruege · commit 59253ab2e6dd · 2021-03-13T11:08:46.000+01:00
diff --git a/src/jokrey/utilities/simple/data_structure/stack/EvaluableStack.java b/src/jokrey/utilities/simple/data_structure/stack/EvaluableStack.java
@@ -4,5 +4,6 @@ public interface EvaluableStack<E> extends Stack<E> {
     void println();
     void push(E e, long sleep_at_some_point);
     E pop(long sleep_at_some_point);
-    E peek(long sleep_at_some_point);
+    E top(long sleep_at_some_point);
+    default E head(long sleep_at_some_point) {return top(sleep_at_some_point);}
 }
diff --git a/src/jokrey/utilities/simple/data_structure/stack/LFStack.java b/src/jokrey/utilities/simple/data_structure/stack/LFStack.java
@@ -35,7 +35,7 @@ public class LFStack<E> implements EvaluableStack<E> {
         return oldHead.val;
     }
 
-    @Override public E peek() {
+    @Override public E top() {
         Node<E> headNode = head.get();
         return headNode==null? null: headNode.val;
     }
@@ -87,7 +87,7 @@ public class LFStack<E> implements EvaluableStack<E> {
         return oldHead.val;
     }
 
-    @Override public E peek(long sleep_at_some_point) {
+    @Override public E top(long sleep_at_some_point) {
         sleep(sleep_at_some_point/2);
         Node<E> headNode = head.get();
         sleep(sleep_at_some_point/2);
diff --git a/src/jokrey/utilities/simple/data_structure/stack/LinkedStack.java b/src/jokrey/utilities/simple/data_structure/stack/LinkedStack.java
@@ -24,7 +24,7 @@ public class LinkedStack<E> implements EvaluableStack<E> {
         }
     }
 
-    @Override public E peek() {
+    @Override public E top() {
         return head==null? null: head.val;
     }
 
@@ -65,9 +65,11 @@ public class LinkedStack<E> implements EvaluableStack<E> {
         }
     }
 
-    @Override public E peek(long sleep_at_some_point) {
-        sleep(sleep_at_some_point);
-        return head==null? null: head.val;
+    @Override public E top(long sleep_at_some_point) {
+        sleep(sleep_at_some_point/2);
+        boolean headNull = head == null;
+        sleep(sleep_at_some_point/2);
+        return headNull? null: head.val;
     }
 
     @Override public String toString() {
diff --git a/src/jokrey/utilities/simple/data_structure/stack/LockedStack.java b/src/jokrey/utilities/simple/data_structure/stack/LockedStack.java
@@ -31,10 +31,10 @@ public class LockedStack<E> extends LinkedStack<E> {
         } finally {lock.unlock();}
     }
 
-    @Override public E peek() {
+    @Override public E top() {
         lock.lock();
         try {
-            return super.peek();
+            return super.top();
         } finally {lock.unlock();}
     }
 
@@ -54,10 +54,10 @@ public class LockedStack<E> extends LinkedStack<E> {
         } finally {lock.unlock();}
     }
 
-    @Override public E peek(long sleep_at_some_point) {
+    @Override public E top(long sleep_at_some_point) {
         lock.lock();
         try {
-            return super.peek(sleep_at_some_point);
+            return super.top(sleep_at_some_point);
         } finally {lock.unlock();}
     }
 }
diff --git a/src/jokrey/utilities/simple/data_structure/stack/Stack.java b/src/jokrey/utilities/simple/data_structure/stack/Stack.java
@@ -6,9 +6,10 @@
 public interface Stack<E> {
     void push(E e);
     E pop();
-    E peek();
+    E top();
     int size();
     default boolean isEmpty() {return size()==0;}
+    default E head() {return top();}
 
     void clear();
 }
diff --git a/src/jokrey/utilities/simple/data_structure/stack/SynchronizedStack.java b/src/jokrey/utilities/simple/data_structure/stack/SynchronizedStack.java
@@ -12,8 +12,8 @@ public class SynchronizedStack<E> extends LinkedStack<E> {
         return super.pop();
     }
 
-    @Override public synchronized E peek() {
-        return super.peek();
+    @Override public synchronized E top() {
+        return super.top();
     }
 
     @Override public synchronized int size() {
@@ -29,7 +29,7 @@ public class SynchronizedStack<E> extends LinkedStack<E> {
         return super.pop(sleep_at_some_point);
     }
 
-    @Override public synchronized E peek(long sleep_at_some_point) {
-        return super.peek(sleep_at_some_point);
+    @Override public synchronized E top(long sleep_at_some_point) {
+        return super.top(sleep_at_some_point);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ public interface EvaluableStack<E> extends Stack<E> {`
`4`	`4`	`void println();`
`5`	`5`	`void push(E e, long sleep_at_some_point);`
`6`	`6`	`E pop(long sleep_at_some_point);`
`7`		`- E peek(long sleep_at_some_point);`
	`7`	`+ E top(long sleep_at_some_point);`
	`8`	`+ default E head(long sleep_at_some_point) {return top(sleep_at_some_point);}`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class LFStack<E> implements EvaluableStack<E> {`
`35`	`35`	`return oldHead.val;`
`36`	`36`	`}`
`37`	`37`
`38`		`- @Override public E peek() {`
	`38`	`+ @Override public E top() {`
`39`	`39`	`Node<E> headNode = head.get();`
`40`	`40`	`return headNode==null? null: headNode.val;`
`41`	`41`	`}`
`@@ -87,7 +87,7 @@ public class LFStack<E> implements EvaluableStack<E> {`
`87`	`87`	`return oldHead.val;`
`88`	`88`	`}`
`89`	`89`
`90`		`- @Override public E peek(long sleep_at_some_point) {`
	`90`	`+ @Override public E top(long sleep_at_some_point) {`
`91`	`91`	`sleep(sleep_at_some_point/2);`
`92`	`92`	`Node<E> headNode = head.get();`
`93`	`93`	`sleep(sleep_at_some_point/2);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class LinkedStack<E> implements EvaluableStack<E> {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- @Override public E peek() {`
	`27`	`+ @Override public E top() {`
`28`	`28`	`return head==null? null: head.val;`
`29`	`29`	`}`
`30`	`30`
`@@ -65,9 +65,11 @@ public class LinkedStack<E> implements EvaluableStack<E> {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- @Override public E peek(long sleep_at_some_point) {`
`69`		`- sleep(sleep_at_some_point);`
`70`		`- return head==null? null: head.val;`
	`68`	`+ @Override public E top(long sleep_at_some_point) {`
	`69`	`+ sleep(sleep_at_some_point/2);`
	`70`	`+ boolean headNull = head == null;`
	`71`	`+ sleep(sleep_at_some_point/2);`
	`72`	`+ return headNull? null: head.val;`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`@Override public String toString() {`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ public class LockedStack<E> extends LinkedStack<E> {`
`31`	`31`	`} finally {lock.unlock();}`
`32`	`32`	`}`
`33`	`33`
`34`		`- @Override public E peek() {`
	`34`	`+ @Override public E top() {`
`35`	`35`	`lock.lock();`
`36`	`36`	`try {`
`37`		`- return super.peek();`
	`37`	`+ return super.top();`
`38`	`38`	`} finally {lock.unlock();}`
`39`	`39`	`}`
`40`	`40`
`@@ -54,10 +54,10 @@ public class LockedStack<E> extends LinkedStack<E> {`
`54`	`54`	`} finally {lock.unlock();}`
`55`	`55`	`}`
`56`	`56`
`57`		`- @Override public E peek(long sleep_at_some_point) {`
	`57`	`+ @Override public E top(long sleep_at_some_point) {`
`58`	`58`	`lock.lock();`
`59`	`59`	`try {`
`60`		`- return super.peek(sleep_at_some_point);`
	`60`	`+ return super.top(sleep_at_some_point);`
`61`	`61`	`} finally {lock.unlock();}`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class SynchronizedStack<E> extends LinkedStack<E> {`
`12`	`12`	`return super.pop();`
`13`	`13`	`}`
`14`	`14`
`15`		`- @Override public synchronized E peek() {`
`16`		`- return super.peek();`
	`15`	`+ @Override public synchronized E top() {`
	`16`	`+ return super.top();`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override public synchronized int size() {`
`@@ -29,7 +29,7 @@ public class SynchronizedStack<E> extends LinkedStack<E> {`
`29`	`29`	`return super.pop(sleep_at_some_point);`
`30`	`30`	`}`
`31`	`31`
`32`		`- @Override public synchronized E peek(long sleep_at_some_point) {`
`33`		`- return super.peek(sleep_at_some_point);`
	`32`	`+ @Override public synchronized E top(long sleep_at_some_point) {`
	`33`	`+ return super.top(sleep_at_some_point);`
`34`	`34`	`}`
`35`	`35`	`}`