From 63d88eb8db1f7a6d5924ec2a8b7f462373d5ac9a Mon Sep 17 00:00:00 2001 From: bjculkin Date: Fri, 7 Apr 2017 10:51:31 -0400 Subject: Cleanup --- .../src/main/java/bjc/utils/esodata/Stack.java | 43 +++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java') diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java index c112732..217c671 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java @@ -79,7 +79,7 @@ public abstract class Stack { public Stack spaghettify() { return new SpaghettiStack<>(this); } - + /* * Basic combinators */ @@ -91,7 +91,7 @@ public abstract class Stack { * The number of items to drop. */ public void drop(int n) { - for(int i = 0; i < n; i++) { + for (int i = 0; i < n; i++) { pop(); } } @@ -135,12 +135,12 @@ public abstract class Stack { public void multidup(int n, int m) { List lst = new ArrayList<>(n); - for(int i = n; i > 0; i--) { + for (int i = n; i > 0; i--) { lst.set(i - 1, pop()); } - for(int i = 0; i < m; i++) { - for(T elm : lst) { + for (int i = 0; i < m; i++) { + for (T elm : lst) { push(elm); } } @@ -176,17 +176,17 @@ public abstract class Stack { T elm = pop(); - for(int i = n; i > 0; i--) { + for (int i = n; i > 0; i--) { lst.set(i - 1, pop()); } - for(T nelm : lst) { + for (T nelm : lst) { push(nelm); } push(elm); - for(int i = 1; i < m; i++) { - for(T nelm : lst) { + for (int i = 1; i < m; i++) { + for (T nelm : lst) { push(nelm); } } @@ -299,13 +299,13 @@ public abstract class Stack { public void dip(int n, Consumer> cons) { List elms = new ArrayList<>(n); - for(int i = n; i > 0; i--) { + for (int i = n; i > 0; i--) { elms.set(i - 1, pop()); } cons.accept(this); - for(T elm : elms) { + for (T elm : elms) { push(elm); } } @@ -345,12 +345,12 @@ public abstract class Stack { public void multicleave(int n, List>> conses) { List elms = new ArrayList<>(n); - for(int i = n; i > 0; i--) { + for (int i = n; i > 0; i--) { elms.set(i - 1, pop()); } - for(Consumer> cons : conses) { - for(T elm : elms) { + for (Consumer> cons : conses) { + for (T elm : elms) { push(elm); } @@ -379,10 +379,10 @@ public abstract class Stack { public void multispread(int n, List>> conses) { List> nelms = new ArrayList<>(conses.size()); - for(int i = conses.size(); i > 0; i--) { + for (int i = conses.size(); i > 0; i--) { List elms = new ArrayList<>(n); - for(int j = n; j > 0; j--) { + for (int j = n; j > 0; j--) { elms.set(j, pop()); } @@ -390,8 +390,8 @@ public abstract class Stack { } int i = 0; - for(List elms : nelms) { - for(T elm : elms) { + for (List elms : nelms) { + for (T elm : elms) { push(elm); } @@ -403,7 +403,8 @@ public abstract class Stack { /** * Apply the actions in cons to corresponding elements from the stack. * - * @param conses The actions to execute. + * @param conses + * The actions to execute. */ public void spread(List>> conses) { multispread(1, conses); @@ -422,7 +423,7 @@ public abstract class Stack { public void multiapply(int n, int m, Consumer> cons) { List>> conses = new ArrayList<>(m); - for(int i = 0; i < m; i++) { + for (int i = 0; i < m; i++) { conses.add(cons); } @@ -440,7 +441,7 @@ public abstract class Stack { public void apply(int n, Consumer> cons) { multiapply(1, n, cons); } - + /* * Misc. functions */ -- cgit v1.2.3