Restructure a bit

4 files changed, 0 insertions, 485 deletions

diff --git a/src/test/java/bjc/esodata/MinMaxListTest.java b/src/test/java/bjc/esodata/MinMaxListTest.java
deleted file mode 100644
index 08901f0..0000000
--- a/src/test/java/bjc/esodata/MinMaxListTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package bjc.esodata;
-
-import static org.junit.Assert.*;
-
-import java.util.*;
-
-import org.junit.*;
-
-@SuppressWarnings("javadoc")
-public class MinMaxListTest {
-	private final static Comparator<Integer> intComparator = (lhs, rhs) -> lhs - rhs;;
-
-	@Test
-	public void minMaxListInitializesMinMax() {
-		MinMaxList<Integer> list = new MinMaxList<>(intComparator,
-				1, 2, 3, 4, 5);
-		
-		assertEquals("List contains 5 elements", 5, list.size());
-		
-		assertEquals("Minimum is 1", 1, (int)list.minimum());
-		assertEquals("Maximum is 5", 5, (int)list.maximum());
-	}
-	
-	@Test
-	public void minMaxListAddUpdatesMinMax() {
-		MinMaxList<Integer> list = new MinMaxList<>(intComparator,
-				2, 3, 4);
-		
-		assertEquals("Minimum is 2", 2, (int)list.minimum());
-		assertEquals("Maximum is 4", 4, (int)list.maximum());
-		
-		list.add(1);
-		list.add(5);
-
-		assertEquals("Minimum is 1", 1, (int)list.minimum());
-		assertEquals("Maximum is 5", 5, (int)list.maximum());
-	}
-	
-	public void minMaxListRemoveUpdatesMinMax() {
-		MinMaxList<Integer> list = new MinMaxList<>(intComparator,
-				1, 2, 3, 4, 5);
-
-		assertEquals("Minimum is 1", 1, (int)list.minimum());
-		assertEquals("Maximum is 5", 5, (int)list.maximum());
-		
-		list.remove((Integer)1);
-		list.remove((Integer)5);
-		
-		assertEquals("Minimum is 2", 2, (int)list.minimum());
-		assertEquals("Maximum is 4", 4, (int)list.maximum());
-	}
-}
diff --git a/src/test/java/bjc/esodata/NestListTest.java b/src/test/java/bjc/esodata/NestListTest.java
deleted file mode 100644
index ff3723e..0000000
--- a/src/test/java/bjc/esodata/NestListTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package bjc.esodata;
-
-import static org.junit.Assert.*;
-
-import java.util.*;
-
-import org.junit.*;
-
-import bjc.*;
-
-@SuppressWarnings("javadoc")
-public class NestListTest
-{
-
-	@Test
-	public void testAddItemElement() {
-		NestList<String> nl = new NestList<>();
-		
-		assertEquals("NestLists are created empty", 0, nl.size());
-		
-		nl.addItems("hello", "there");
-		
-		assertEquals("Adding two items to an empty NestList makes it size 2",
-				2, nl.size());
-	}
-
-	@Test
-	public void testAddItemNestListOfElement() {
-		NestList<String> nl = new NestList<>();
-		
-		NestList<String> nl2 = new NestList<>();
-		
-		nl2.addItem("friend");
-		
-		nl.addItems("hello", "there");
-		nl.addItem(nl2);
-		
-		assertEquals("Adding a sublist increases the size of NestList by 1",
-				3, nl.size());
-	}
-
-	@Test
-	public void testAddSublist() {
-		NestList<String> nl = new NestList<>();
-		
-		nl.addSublist("here", "is", "a");
-		nl.addItem("thing");
-		
-		assertEquals("addSublist increases size of NestList by 1", 2, nl.size());
-	}
-
-	@Test
-	public void testFlatIterator() {
-		NestList<String> nl1 = new NestList<>();
-		NestList<String> nl2 = new NestList<>();
-		NestList<String> nl3 = new NestList<>();
-		
-		nl1.addItems("of", "means");
-		
-		nl2.addItem(nl1);
-		
-		nl3.addItem("Hello");
-		nl3.addSublist("my", "unfortunate");
-		nl3.addItem("friend");
-		nl3.addItem(nl2);
-		
-		TestUtils.assertIteratorEquals(nl3.flatIterator(),
-				"Hello", "my", "unfortunate", "friend", "of", "means");
-	}
-
-	@Test
-	public void testFlatten() {	
-		NestList<String> nl1A = new NestList<>();
-		NestList<String> nl2A = new NestList<>();
-		NestList<String> nl3A = new NestList<>();
-		
-		nl1A.addItems("of", "means");
-		
-		nl2A.addItem(nl1A);
-		
-		nl3A.addItem("Hello");
-		nl3A.addSublist("my", "unfortunate");
-		nl3A.addItem("friend");
-		nl3A.addItem(nl2A);
-		
-		NestList<String> nl1B = new NestList<>();
-		NestList<String> nl2B = new NestList<>();
-		
-		nl1B.addItems("of", "means");
-
-		nl2B.addItems("Hello", "my", "unfortunate", "friend");
-		nl2B.addItem(nl1B);
-		
-		assertEquals("Flatten removes one level of nesting",
-				nl2B, nl3A.flatten());
-	}
-
-	@Test
-	public void testDeepFlatten() {
-		NestList<String> nl1 = new NestList<>();
-		NestList<String> nl2 = new NestList<>();
-		NestList<String> nl3 = new NestList<>();
-		
-		nl1.addItems("of", "means");
-		
-		nl2.addItem(nl1);
-		
-		nl3.addItem("Hello");
-		nl3.addSublist("my", "unfortunate");
-		nl3.addItem("friend");
-		nl3.addItem(nl2);
-		
-		List<String> testList = Arrays.asList(
-				"Hello", "my", "unfortunate", "friend", "of", "means");
-		
-		assertEquals("deepFlatten flattens out all sublists",
-				testList, nl3.deepFlatten());
-	}
-}
diff --git a/src/test/java/bjc/esodata/StackTest.java b/src/test/java/bjc/esodata/StackTest.java
deleted file mode 100644
index b4b98cc..0000000
--- a/src/test/java/bjc/esodata/StackTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package bjc.esodata;
-
-import org.junit.Test;
-
-import static bjc.TestUtils.*;
-
-import static org.junit.Assert.*;
-
-/**
- * Tests of Stack.
- *
- * @author Ben Culkin
- */
-@SuppressWarnings("javadoc")
-public class StackTest {
-	@Test
-	public void testBasic() {
-		Stack<String> st = new SimpleStack<>();
-
-		assertEquals(0, st.size());
-
-		st.push("a");
-		assertEquals(1, st.size());
-
-		assertEquals("a", st.top());
-		assertEquals(1, st.size());
-
-		assertEquals("a", st.pop());
-		assertEquals(0, st.size());
-		assertTrue(st.isEmpty());
-	}
-
-	@Test
-	public void testSpaghetti() {
-		Stack<String> st = new SimpleStack<>();
-
-		st.pushAll("a", "b", "c");
-
-		Stack<String> spst1 = st.spaghettify();
-		Stack<String> spst2 = st.spaghettify();
-
-		// st should be [a, b, c]
-		// spst1 should be [[a, b, c]]
-		// spst2 should be [[a, b, c]]
-
-		assertEquals("c", st.top());
-		assertEquals("c", spst1.top());
-		assertEquals("c", spst2.top());
-
-		assertEquals(3, st.size());
-		assertEquals(3, spst1.size());
-		assertEquals(3, spst2.size());
-
-		st.push("d");
-		spst1.push("e");
-		spst2.push("f");
-
-		// st should be [a, b, c, d]
-		// spst1 should be [[a, b, c, d], e]
-		// spst2 should be [[a, b, c, d], f]
-
-		assertEquals("d", st.top());
-		assertEquals("e", spst1.top());
-		assertEquals("f", spst2.top());
-
-		assertEquals(4, st.size());
-		assertEquals(5, spst1.size());
-		assertEquals(5, spst2.size());
-
-		spst1.pop();
-
-		// st should be [a, b, c]
-		// spst1 should be [[a, b, c]]
-		// spst2 should be [[a, b, c], f]
-
-		assertEquals("d", spst1.pop());
-		assertEquals("c", st.top());
-
-		assertEquals(3, st.size());
-		assertEquals(3, spst1.size());
-		assertEquals(4, spst2.size());
-	}
-
-	@Test
-	public void testBasicComb() {
-		Stack<String> st = new SimpleStack<>();
-
-		st.pushAll("a", "b", "c", "d");
-
-		st.drop();
-
-		// assertStackEquals goes from [top] -> [bottom]
-		assertStackEquals(st, "c", "b", "a");
-
-		st.drop(2);
-
-		assertStackEquals(st, "a");
-
-		st.pushAll("b", "c", "d");
-
-		st.nip();
-		st.nip();
-
-		assertStackEquals(st, "d", "a");
-
-		st.drop();
-
-		st.dup();
-
-		assertStackEquals(st, "a", "a");
-
-		st.pushAll("b", "c");
-
-		st.multidup(3, 1);
-
-		assertStackEquals(st, "c", "b", "a", "c", "b", "a", "a");
-
-		st.drop(3);
-
-		assertStackEquals(st, "c", "b", "a", "a");
-
-		st.over();
-
-		assertStackEquals(st, "b", "c", "b", "a", "a");
-
-		st.drop(2);
-
-		assertStackEquals(st, "b", "a", "a");
-
-		st.multiover(2, 2);
-
-		assertStackEquals(st, "a", "a", "a", "a", "b", "a", "a");
-
-		st.drop(6);
-
-		assertStackEquals(st, "a");
-
-		st.push("b");
-		st.push("c");
-
-		assertStackEquals(st, "c", "b", "a");
-
-		st.pick();
-
-		assertStackEquals(st, "a", "c", "b", "a");
-
-		st.swap();
-
-		assertStackEquals(st, "c", "a", "b", "a");
-
-		st.deepdup();
-
-		assertStackEquals(st, "c", "a", "a", "b", "a");
-
-		st.swap();
-		st.deepswap();
-
-		assertStackEquals(st, "a", "a", "c", "b", "a");
-
-		st.rot();
-
-		assertStackEquals(st, "c", "a", "a", "b", "a");
-
-		st.invrot();
-
-		assertStackEquals(st, "a", "a", "c", "b", "a");
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testDataComb() {
-		Stack<Integer> stk = new SimpleStack<>();
-
-		stk.pushAll(2, 3, 4);
-
-		assertStackEquals(stk, 4, 3, 2);
-
-		stk.dip(st -> {
-			int x = stk.pop();
-			int y = stk.pop();
-
-			stk.push(x + y);
-		});
-
-		assertStackEquals(stk, 4, 5);
-
-		stk.dip(2, st -> {
-			stk.push(6);
-		});
-
-		assertStackEquals(stk, 4, 5, 6);
-
-		stk.keep(st -> {
-			int v = st.pop();
-
-			st.push(v + 1);
-		});
-
-		assertStackEquals(stk, 4, 5, 5, 6);
-
-		stk.multicleave(2, st -> {
-			int x = st.pop();
-			int y = st.pop();
-
-			st.push(x + y);
-		}, st -> {
-			int x = st.pop();
-			int y = st.pop();
-
-			st.push(y - x);
-		});
-
-		assertStackEquals(stk, 1, 9, 5, 6);
-
-		stk.spread(st -> {
-			int x = st.pop();
-			int y = st.pop();
-
-			st.push(x + y);
-		}, st -> {
-			int y = st.pop();
-
-			st.push(y + 1);
-		});
-
-		assertStackEquals(stk, 10, 6, 6);
-
-		stk.apply(2, st -> {
-			int lhs = st.pop();
-			st.push(lhs - st.pop());
-		});
-
-		assertStackEquals(stk, 2);
-	}
-}
diff --git a/src/test/java/bjc/esodata/ThresholdSetTest.java b/src/test/java/bjc/esodata/ThresholdSetTest.java
deleted file mode 100644
index c9403da..0000000
--- a/src/test/java/bjc/esodata/ThresholdSetTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package bjc.esodata;
-
-import org.junit.Test;
-
-import static bjc.TestUtils.*;
-
-import static bjc.esodata.ThresholdSet.*;
-
-import static org.junit.Assert.*;
-
-/**
- * Tests for ThresholdSet
- *
- * @author Ben Culkin.
- */
-@SuppressWarnings("javadoc")
-public class ThresholdSetTest {
-	@Test
-	public void testAdd() {
-		ThresholdSet<String> thst = TS("a", "b");
-
-		assertIteratorSet(false, thst.setView().iterator(), "a", "b");
-		assertEquals(thst.setSize(), 2);
-	}
-
-	@Test
-	public void testAddMulti() {
-		ThresholdSet<String> thst = TS("a", "b", "a");
-
-		assertIteratorSet(false, thst.setView().iterator(), "b");
-		assertEquals(thst.setSize(), 1);
-	}
-
-	@Test
-	public void testAddMulti2() {
-		ThresholdSet<String> thst = TS("a", "b");
-		thst.add("a");
-
-		assertIteratorSet(false, thst.setView().iterator(), "b");
-		assertEquals(thst.setSize(), 1);
-	}
-
-	@Test
-	public void testContains() {
-		ThresholdSet<String> thst = TS("1", "2", "2", "x", "z");
-
-		int[] exps = new int[] {
-				1, 2, -1
-		};
-		assertArrayEquals(exps, thst.containsKeys("1", "2", "y"));
-	}
-
-	@Test
-	public void testRemoveMulti() {
-		ThresholdSet<String> thst = TS("a", "a", "b");
-
-		thst.remove("a");
-
-		assertIteratorSet(false, thst.setView().iterator(), "a", "b");
-		assertEquals(2, thst.setSize());
-
-		thst.remove("a");
-
-		assertIteratorSet(false, thst.setView().iterator(), "b");
-		assertEquals(1, thst.setSize());
-	}
-
-	@Test
-	public void testSetTransparency() {
-		ThresholdSet<String> thst = TS("a", "b", "c");
-
-		thst.setView().add("b");
-		assertIteratorSet(false, thst.setView().iterator(), "a", "c");
-		assertEquals(2, thst.setView().size());
-
-		thst.setView().remove("c");
-		assertIteratorSet(false, thst.setView().iterator(), "a");
-	}
-}