From 4c0f86566eb65c1e2ab05773d3398c642aadd19b Mon Sep 17 00:00:00 2001 From: Vincent Gasbarro Date: Sun, 11 Mar 2018 12:49:07 -0400 Subject: [PATCH 1/5] through table --- src/main/java/Pair/Arrays.java | 4 +- src/main/java/StackArray/GenericStack.java | 49 +++++++++ src/main/java/StackArray/ObjectStack.java | 43 ++++++++ src/main/java/StackArrayList/Stack.java | 24 +++++ src/main/java/Table/Entry.java | 4 + src/main/java/Table/Table.java | 44 +++++++- .../java/StackArray/GenericStackTest.java | 82 +++++++------- src/test/java/StackArray/ObjectStackTest.java | 78 +++++++------- src/test/java/StackArrayList/StackTest.java | 90 ++++++++-------- src/test/java/Table/TableTest.java | 100 +++++++++--------- 10 files changed, 340 insertions(+), 178 deletions(-) diff --git a/src/main/java/Pair/Arrays.java b/src/main/java/Pair/Arrays.java index 5bdf780..952aee7 100644 --- a/src/main/java/Pair/Arrays.java +++ b/src/main/java/Pair/Arrays.java @@ -11,6 +11,6 @@ * And a minmax method that returns a pair containing the largest and smallest items from the array list */ public class Arrays { - public static <___> Pair firstLast(ArrayList<___> a) { - } +// public static <___> Pair firstLast(ArrayList<___> a) { +// } } diff --git a/src/main/java/StackArray/GenericStack.java b/src/main/java/StackArray/GenericStack.java index d84c4db..d93d47a 100644 --- a/src/main/java/StackArray/GenericStack.java +++ b/src/main/java/StackArray/GenericStack.java @@ -1,15 +1,64 @@ package StackArray; +import java.util.ArrayList; import java.util.Arrays; /** * Expand the ArrayList implementation of stack here to use an E[] array. Still implement push, pop, and isEmpty. * Remember, you might need to resize the stack in the push method. + * * @param */ public class GenericStack { + private E[] elements; public GenericStack() { + elements = (E[]) new Object[0]; + } + + public E push(E aThing) { + + E[] temp = Arrays.copyOf(elements, elements.length + 1); + + if (elements.length > 0) { + + for (int i = 0; i < elements.length; i++) { + temp[i + 1] = elements[i]; + } + } + + temp[0] = aThing; + elements = temp; + return aThing; + } + + public E pop() { + + if (elements.length == 0) { + return null; + } else { + E[] temp = Arrays.copyOf(elements, elements.length - 1); + int iterator = 0; + + for (int i = 1; i < elements.length; i++) { + temp[iterator] = elements[i]; + iterator++; + } + + E poppedObj = elements[0]; + elements = temp; + return poppedObj; + } } + + public boolean isEmpty() { + if (elements.length > 0) { + return false; + } else { + return true; + } + } + + } diff --git a/src/main/java/StackArray/ObjectStack.java b/src/main/java/StackArray/ObjectStack.java index 1124698..2c8c134 100644 --- a/src/main/java/StackArray/ObjectStack.java +++ b/src/main/java/StackArray/ObjectStack.java @@ -11,6 +11,49 @@ public class ObjectStack { private Object[] elements; public ObjectStack() { + elements = new Object[0]; + } + + public Object push(Object aThing) { + + Object[] temp = Arrays.copyOf(elements, elements.length + 1); + + if (elements.length > 0) { + + for (int i = 0; i < elements.length; i++) { + temp[i + 1] = elements[i]; + } + } + + temp[0] = aThing; + elements = temp; + return aThing; + } + + public Object pop() { + + if (elements.length == 0) { + return null; + } else { + Object[] temp = Arrays.copyOf(elements, elements.length - 1); + int iterator = 0; + + for (int i = 1; i < elements.length; i++) { + temp[iterator] = elements[i]; + iterator++; + } + + Object poppedObj = elements[0]; + elements = temp; + return poppedObj; + } + } + public boolean isEmpty() { + if (elements.length > 0) { + return false; + } else { + return true; + } } } diff --git a/src/main/java/StackArrayList/Stack.java b/src/main/java/StackArrayList/Stack.java index 0338de3..06692fe 100644 --- a/src/main/java/StackArrayList/Stack.java +++ b/src/main/java/StackArrayList/Stack.java @@ -11,6 +11,30 @@ public class Stack { public Stack(){ + elements = new ArrayList(); + } + + public E push(E aThing) { + ArrayList temp = new ArrayList(); + temp.add(aThing); + temp.addAll(elements); + elements = temp; + return (E)elements.get(0); + } + + public E pop() throws IndexOutOfBoundsException { + + return (E)elements.remove(0); } + + public boolean isEmpty() { + if (elements.size() > 0) { + return false; + } else { + return true; + } + } + + } diff --git a/src/main/java/Table/Entry.java b/src/main/java/Table/Entry.java index 8c97478..f758bfd 100644 --- a/src/main/java/Table/Entry.java +++ b/src/main/java/Table/Entry.java @@ -17,4 +17,8 @@ public V getValue() { return value; } + public void setValue(V anotherValue) { + this.value = anotherValue; + } + } diff --git a/src/main/java/Table/Table.java b/src/main/java/Table/Table.java index 5ccce23..6018d41 100644 --- a/src/main/java/Table/Table.java +++ b/src/main/java/Table/Table.java @@ -10,8 +10,50 @@ * Void return on `remove`. */ public class Table { - private ArrayList entries; + private ArrayList entries; public Table() { + this.entries = new ArrayList(); } + + public V get(K key) { + + for (int i = 0; i < entries.size(); i++) { + if (entries.get(i).getKey().equals(key)) { + return (V) entries.get(i).getValue(); + } + } + return null; + } + + public void put(K key, V value) { + if (containsKey(key)) { + for (int i = 0; i < entries.size(); i++) { + if (entries.get(i).getKey().equals(key)) { + entries.get(i).setValue(value); + } + } + } else { + entries.add(new Entry(key, value)); + } + } + + public void remove(K key) { + + for (int i = 0; i < entries.size(); i++) { + if (entries.get(i).getKey().equals(key)){ + entries.remove(i); + } + } + } + + public boolean containsKey(K key) { + for (int i = 0; i < entries.size(); i++) { + if (entries.get(i).getKey().equals(key)) { + return true; + } + } + return false; + } + } diff --git a/src/test/java/StackArray/GenericStackTest.java b/src/test/java/StackArray/GenericStackTest.java index 0aacd92..c61b904 100644 --- a/src/test/java/StackArray/GenericStackTest.java +++ b/src/test/java/StackArray/GenericStackTest.java @@ -1,41 +1,41 @@ -//package StackArray; -// -//import org.junit.Assert; -//import org.junit.Test; -// -//public class GenericStackTest { -// @Test -// public void testPushingGrowsTheStack() throws Exception { -// // Given an empty stack -// GenericStack stack = new GenericStack<>(); -// -// // Assert that it is empty. -// Assert.assertEquals(true, stack.isEmpty()); -// // When we push something onto the stack -// stack.push("foobar"); -// // Then it shouldn't be empty -// Assert.assertEquals(false, stack.isEmpty()); -// } -// -// @Test -// public void testPushingAndPoppingOrder() throws Exception { -// // Given an empty stack -// GenericStack stack = new GenericStack<>(); -// // When we push two elements on it -// stack.push("foo"); -// stack.push("bar"); -// // Then we should see them returned in the correct order -// Assert.assertEquals("bar", stack.pop()); -// Assert.assertEquals("foo", stack.pop()); -// } -// -// @Test(expected = IndexOutOfBoundsException.class) -// public void testPopFirst() throws Exception { -// // Given an empty stack -// GenericStack stack = new GenericStack<>(); -// // When it's popped -// stack.pop(); -// // Then we should get an exception -// } -// -//} \ No newline at end of file +package StackArray; + +import org.junit.Assert; +import org.junit.Test; + +public class GenericStackTest { + @Test + public void testPushingGrowsTheStack() throws Exception { + // Given an empty stack + GenericStack stack = new GenericStack<>(); + + // Assert that it is empty. + Assert.assertEquals(true, stack.isEmpty()); + // When we push something onto the stack + stack.push("foobar"); + // Then it shouldn't be empty + Assert.assertEquals(false, stack.isEmpty()); + } + + @Test + public void testPushingAndPoppingOrder() throws Exception { + // Given an empty stack + GenericStack stack = new GenericStack<>(); + // When we push two elements on it + stack.push("foo"); + stack.push("bar"); + // Then we should see them returned in the correct order + Assert.assertEquals("bar", stack.pop()); + Assert.assertEquals("foo", stack.pop()); + } + + @Test(expected = IndexOutOfBoundsException.class) + public void testPopFirst() throws Exception { + // Given an empty stack + GenericStack stack = new GenericStack<>(); + // When it's popped + stack.pop(); + // Then we should get an exception + } + +} \ No newline at end of file diff --git a/src/test/java/StackArray/ObjectStackTest.java b/src/test/java/StackArray/ObjectStackTest.java index 9ec9615..2576f1b 100644 --- a/src/test/java/StackArray/ObjectStackTest.java +++ b/src/test/java/StackArray/ObjectStackTest.java @@ -1,39 +1,39 @@ -//package StackArray; -// -//import org.junit.Assert; -//import org.junit.Test; -// -//public class ObjectStackTest { -// @Test -// public void testPushingGrowsTheStack() throws Exception { -// // Given an empty stack -// ObjectStack stack = new ObjectStack<>(); -// // Assert that it is empty. -// Assert.assertEquals(true, stack.isEmpty()); -// // When we push something onto the stack -// stack.push("foobar"); -// // Then it shouldn't be empty -// Assert.assertEquals(false, stack.isEmpty()); -// } -// -// @Test -// public void testPushingAndPoppingOrder() throws Exception { -// // Given an empty stack -// ObjectStack stack = new ObjectStack<>(); -// // When we push two elements on it -// stack.push("foo"); -// stack.push("bar"); -// // Then we should see them returned in the correct order -// Assert.assertEquals("bar", stack.pop()); -// Assert.assertEquals("foo", stack.pop()); -// } -// -// @Test(expected = IndexOutOfBoundsException.class) -// public void testPopFirst() throws Exception { -// // Given an empty stack -// ObjectStack stack = new ObjectStack<>(); -// // When it's popped -// stack.pop(); -// // Then we should get an exception -// } -//} \ No newline at end of file +package StackArray; + +import org.junit.Assert; +import org.junit.Test; + +public class ObjectStackTest { + @Test + public void testPushingGrowsTheStack() throws Exception { + // Given an empty stack + ObjectStack stack = new ObjectStack<>(); + // Assert that it is empty. + Assert.assertEquals(true, stack.isEmpty()); + // When we push something onto the stack + stack.push("foobar"); + // Then it shouldn't be empty + Assert.assertEquals(false, stack.isEmpty()); + } + + @Test + public void testPushingAndPoppingOrder() throws Exception { + // Given an empty stack + ObjectStack stack = new ObjectStack<>(); + // When we push two elements on it + stack.push("foo"); + stack.push("bar"); + // Then we should see them returned in the correct order + Assert.assertEquals("bar", stack.pop()); + Assert.assertEquals("foo", stack.pop()); + } + + @Test(expected = IndexOutOfBoundsException.class) + public void testPopFirst() throws Exception { + // Given an empty stack + ObjectStack stack = new ObjectStack<>(); + // When it's popped + stack.pop(); + // Then we should get an exception + } +} \ No newline at end of file diff --git a/src/test/java/StackArrayList/StackTest.java b/src/test/java/StackArrayList/StackTest.java index 0ce7cf0..00dc659 100644 --- a/src/test/java/StackArrayList/StackTest.java +++ b/src/test/java/StackArrayList/StackTest.java @@ -1,45 +1,45 @@ -//package StackArrayList; -// -//import org.junit.Test; -// -//import org.junit.Assert; -// -//public class StackTest { -// @Test -// public void testEmptyStackStopsBeingEmptyWhenAnItemIsAdded() throws Exception { -// // Given an empty stack -// Stack stack = new Stack<>(); -// // Assert that it starts empty -// Assert.assertEquals(true, stack.isEmpty()); -// // When an element gets pushed -// stack.push("foobar"); -// // Then the stack should not be empty. -// Assert.assertEquals(false, stack.isEmpty()); -// } -// -// @Test -// public void testTwoItemsPushedComeOutInCorrectOrder() throws Exception { -// // Given an empty stack -// Stack stack = new Stack<>(); -// -// //When two items are pushed -// stack.push("foo"); -// stack.push("bar"); -// -// // Then they should come off in reverse order. -// Assert.assertEquals("bar", stack.pop()); -// Assert.assertEquals("foo", stack.pop()); -// -// // And then the stack should be empty -// Assert.assertEquals(true, stack.isEmpty()); -// } -// -// @Test(expected = IndexOutOfBoundsException.class) -// public void testPopFirst() throws Exception { -// // Given an empty stack -// Stack stack = new Stack<>(); -// // Then it is popped -// stack.pop(); -// // We should get an exception -// } -//} \ No newline at end of file +package StackArrayList; + +import org.junit.Test; + +import org.junit.Assert; + +public class StackTest { + @Test + public void testEmptyStackStopsBeingEmptyWhenAnItemIsAdded() throws Exception { + // Given an empty stack + Stack stack = new Stack<>(); + // Assert that it starts empty + Assert.assertEquals(true, stack.isEmpty()); + // When an element gets pushed + stack.push("foobar"); + // Then the stack should not be empty. + Assert.assertEquals(false, stack.isEmpty()); + } + + @Test + public void testTwoItemsPushedComeOutInCorrectOrder() throws Exception { + // Given an empty stack + Stack stack = new Stack<>(); + + //When two items are pushed + stack.push("foo"); + stack.push("bar"); + + // Then they should come off in reverse order. + Assert.assertEquals("bar", stack.pop()); + Assert.assertEquals("foo", stack.pop()); + + // And then the stack should be empty + Assert.assertEquals(true, stack.isEmpty()); + } + + @Test(expected = IndexOutOfBoundsException.class) + public void testPopFirst() throws Exception { + // Given an empty stack + Stack stack = new Stack<>(); + // Then it is popped + stack.pop(); + // We should get an exception + } +} \ No newline at end of file diff --git a/src/test/java/Table/TableTest.java b/src/test/java/Table/TableTest.java index 15ac19c..8bebde6 100644 --- a/src/test/java/Table/TableTest.java +++ b/src/test/java/Table/TableTest.java @@ -1,50 +1,50 @@ -//package Table; -// -//import org.junit.Assert; -//import org.junit.Test; -// -//public class TableTest { -// @Test -// public void testGetWithoutAnItemReturnsNull() throws Exception { -// // Given an empty table -// Table table = new Table(); -// // When we try and get an item then it returns null -// Assert.assertEquals(table.get("foo"), null); -// } -// -// @Test -// public void testPutAnItemReturnsAndDoesNotDelete() throws Exception { -// //Given an empty table -// Table table = new Table(); -// // When we put an item in it -// table.put("foo", 1); -// // Then we should be able to get it's value -// Assert.assertEquals(table.get("foo"), new Integer(1)); -// // And then we should be able to get it again as it wasn't removed -// Assert.assertEquals(table.get("foo"), new Integer(1)); -// } -// -// @Test -// public void testOverwritingAnItem() throws Exception { -// //Given an empty table -// Table table = new Table(); -// // When we put an item in it -// table.put("foo", 1); -// // And we put a new value with the same key -// table.put("foo", 2); -// // Then we should get back the new value -// Assert.assertEquals(table.get("foo"), new Integer(2)); -// } -// -// @Test -// public void testRemoveAnItem() throws Exception { -// //Given an empty table -// Table table = new Table(); -// // When we put an item in it -// table.put("foo", 1); -// // And we remove that item -// table.remove("foo"); -// // Then we should get back null for that balue -// Assert.assertEquals(table.get("foo"), null); -// } -//} \ No newline at end of file +package Table; + +import org.junit.Assert; +import org.junit.Test; + +public class TableTest { + @Test + public void testGetWithoutAnItemReturnsNull() throws Exception { + // Given an empty table + Table table = new Table(); + // When we try and get an item then it returns null + Assert.assertEquals(table.get("foo"), null); + } + + @Test + public void testPutAnItemReturnsAndDoesNotDelete() throws Exception { + //Given an empty table + Table table = new Table(); + // When we put an item in it + table.put("foo", 1); + // Then we should be able to get it's value + Assert.assertEquals(table.get("foo"), new Integer(1)); + // And then we should be able to get it again as it wasn't removed + Assert.assertEquals(table.get("foo"), new Integer(1)); + } + + @Test + public void testOverwritingAnItem() throws Exception { + //Given an empty table + Table table = new Table(); + // When we put an item in it + table.put("foo", 1); + // And we put a new value with the same key + table.put("foo", 2); + // Then we should get back the new value + Assert.assertEquals(table.get("foo"), new Integer(2)); + } + + @Test + public void testRemoveAnItem() throws Exception { + //Given an empty table + Table table = new Table(); + // When we put an item in it + table.put("foo", 1); + // And we remove that item + table.remove("foo"); + // Then we should get back null for that balue + Assert.assertEquals(table.get("foo"), null); + } +} \ No newline at end of file From 78e71e28797bff14b93677240d05e5a98c62350d Mon Sep 17 00:00:00 2001 From: Vincent Gasbarro Date: Sun, 11 Mar 2018 16:46:21 -0400 Subject: [PATCH 2/5] vg --- src/main/java/TableNested/TableNested.java | 70 ++++++++++++ src/test/java/Swap/SwapTest.java | 30 +++--- .../java/TableNested/TableNestedTest.java | 100 +++++++++--------- 3 files changed, 135 insertions(+), 65 deletions(-) diff --git a/src/main/java/TableNested/TableNested.java b/src/main/java/TableNested/TableNested.java index 7e0dfdd..3a1c6da 100644 --- a/src/main/java/TableNested/TableNested.java +++ b/src/main/java/TableNested/TableNested.java @@ -1,5 +1,7 @@ package TableNested; +import Table.Entry; + import java.util.ArrayList; /** @@ -8,4 +10,72 @@ */ public class TableNested { + private class EntryNested { + private K key; + private V value; + + private EntryNested(K key, V value) { + this.key = key; + this.value = value; + } + + private K getKey() { + return key; + } + + private V getValue() { + return value; + } + + private void setValue(V anotherValue) { + this.value = anotherValue; + } + } + + private ArrayList entries; + + public TableNested() { + this.entries = new ArrayList(); + } + + public V get(K key) { + + for (int i = 0; i < entries.size(); i++) { + if (entries.get(i).getKey().equals(key)) { + return entries.get(i).getValue(); + } + } + return null; + } + + public void put(K key, V value) { + if (containsKey(key)) { + for (int i = 0; i < entries.size(); i++) { + if (entries.get(i).getKey().equals(key)) { + entries.get(i).setValue(value); + } + } + } else { + entries.add(new EntryNested(key, value)); + } + } + + public void remove(K key) { + + for (int i = 0; i < entries.size(); i++) { + if (entries.get(i).getKey().equals(key)){ + entries.remove(i); + } + } + } + + private boolean containsKey(K key) { + for (int i = 0; i < entries.size(); i++) { + if (entries.get(i).getKey().equals(key)) { + return true; + } + } + return false; + } + } diff --git a/src/test/java/Swap/SwapTest.java b/src/test/java/Swap/SwapTest.java index 2583b9d..167e0de 100644 --- a/src/test/java/Swap/SwapTest.java +++ b/src/test/java/Swap/SwapTest.java @@ -1,16 +1,16 @@ package Swap; -// -//import org.junit.Assert; -//import org.junit.Test; -// -///** -// * Get the tests passing. -// */ -//public class SwapTest { -// @Test -// public void testSwap() throws Exception { -// Double[] result = Swap.swap(0,1, 1.5, 2,3); -// Double[] expected = {2.0, 1.5, 3.0}; -// Assert.assertArrayEquals(expected, result); -// } -//} \ No newline at end of file + +import org.junit.Assert; +import org.junit.Test; + +/** + * Get the tests passing. + */ +public class SwapTest { + @Test + public void testSwap() throws Exception { + Object[] result = Swap.swap(0,1, 1.5, 2.0,3.0); + Object[] expected = {2.0, 1.5, 3.0}; + Assert.assertArrayEquals(expected, result); + } +} \ No newline at end of file diff --git a/src/test/java/TableNested/TableNestedTest.java b/src/test/java/TableNested/TableNestedTest.java index 8432277..fdf12d5 100644 --- a/src/test/java/TableNested/TableNestedTest.java +++ b/src/test/java/TableNested/TableNestedTest.java @@ -1,50 +1,50 @@ -//package TableNested; -// -//import org.junit.Assert; -//import org.junit.Test; -// -//public class TableNestedTest { -// @Test -// public void testGetWithoutAnItemReturnsNull() throws Exception { -// // Given an empty table -// TableNested table = new TableNested(); -// // When we try and get an item then it returns null -// Assert.assertEquals(table.get("foo"), null); -// } -// -// @Test -// public void testPutAnItemReturnsAndDoesNotDelete() throws Exception { -// //Given an empty table -// TableNested table = new TableNested(); -// // When we put an item in it -// table.put("foo", 1); -// // Then we should be able to get it's value -// Assert.assertEquals(table.get("foo"), new Integer(1)); -// // And then we should be able to get it again as it wasn't removed -// Assert.assertEquals(table.get("foo"), new Integer(1)); -// } -// -// @Test -// public void testOverwritingAnItem() throws Exception { -// //Given an empty table -// TableNested table = new TableNested(); -// // When we put an item in it -// table.put("foo", 1); -// // And we put a new value with the same key -// table.put("foo", 2); -// // Then we should get back the new value -// Assert.assertEquals(table.get("foo"), new Integer(2)); -// } -// -// @Test -// public void testRemoveAnItem() throws Exception { -// //Given an empty table -// TableNested table = new TableNested(); -// // When we put an item in it -// table.put("foo", 1); -// // And we remove that item -// table.remove("foo"); -// // Then we should get back null for that balue -// Assert.assertEquals(table.get("foo"), null); -// } -//} \ No newline at end of file +package TableNested; + +import org.junit.Assert; +import org.junit.Test; + +public class TableNestedTest { + @Test + public void testGetWithoutAnItemReturnsNull() throws Exception { + // Given an empty table + TableNested table = new TableNested(); + // When we try and get an item then it returns null + Assert.assertEquals(table.get("foo"), null); + } + + @Test + public void testPutAnItemReturnsAndDoesNotDelete() throws Exception { + //Given an empty table + TableNested table = new TableNested(); + // When we put an item in it + table.put("foo", 1); + // Then we should be able to get it's value + Assert.assertEquals(table.get("foo"), new Integer(1)); + // And then we should be able to get it again as it wasn't removed + Assert.assertEquals(table.get("foo"), new Integer(1)); + } + + @Test + public void testOverwritingAnItem() throws Exception { + //Given an empty table + TableNested table = new TableNested(); + // When we put an item in it + table.put("foo", 1); + // And we put a new value with the same key + table.put("foo", 2); + // Then we should get back the new value + Assert.assertEquals(table.get("foo"), new Integer(2)); + } + + @Test + public void testRemoveAnItem() throws Exception { + //Given an empty table + TableNested table = new TableNested(); + // When we put an item in it + table.put("foo", 1); + // And we remove that item + table.remove("foo"); + // Then we should get back null for that balue + Assert.assertEquals(table.get("foo"), null); + } +} \ No newline at end of file From e4312b79ee21de07990ca2b8b07bd9a744f9dcf1 Mon Sep 17 00:00:00 2001 From: Vincent Gasbarro Date: Sun, 11 Mar 2018 17:55:56 -0400 Subject: [PATCH 3/5] vg --- .../ArrayListCombiner/ArrayListCombiner.java | 21 ++- src/main/java/MapFunc/MapFunc.java | 12 ++ src/main/java/Pair/Arrays.java | 23 ++- src/main/java/Pair/Pair.java | 38 ++++- .../ArrayListCombinerTest.java | 70 ++++----- src/test/java/MapFunc/MapFuncTest.java | 72 ++++----- src/test/java/Pair/ArraysTest.java | 148 +++++++++--------- src/test/java/Pair/PairTest.java | 64 ++++---- 8 files changed, 267 insertions(+), 181 deletions(-) diff --git a/src/main/java/ArrayListCombiner/ArrayListCombiner.java b/src/main/java/ArrayListCombiner/ArrayListCombiner.java index d302cd2..6ba620a 100644 --- a/src/main/java/ArrayListCombiner/ArrayListCombiner.java +++ b/src/main/java/ArrayListCombiner/ArrayListCombiner.java @@ -8,5 +8,24 @@ * The first method should be called extendCombiner and should use ? extends E * The second method should be called superCombiner and should use ? super E */ -public class ArrayListCombiner { +public class ArrayListCombiner { + +// private ArrayList first; +// private ArrayList second; + + public ArrayListCombiner() { +// first = new ArrayList<>(); +// second = new ArrayList<>(); + } + + public static void extendCombiner(ArrayList first, ArrayList second) { + first.addAll(second); + + } + + public static void superCombiner(ArrayList first, ArrayList second) { + first.addAll(second); + + } + } diff --git a/src/main/java/MapFunc/MapFunc.java b/src/main/java/MapFunc/MapFunc.java index ed4bf66..199ebab 100644 --- a/src/main/java/MapFunc/MapFunc.java +++ b/src/main/java/MapFunc/MapFunc.java @@ -9,4 +9,16 @@ */ public class MapFunc { + public static ArrayList map(ArrayList list, Function function) { + + ArrayList newList = new ArrayList<>(); + + for (int i = 0; i < list.size(); i++) { + R after = function.apply(list.get(i)); + newList.add(after); + } + + return newList; + } + } diff --git a/src/main/java/Pair/Arrays.java b/src/main/java/Pair/Arrays.java index 952aee7..6741693 100644 --- a/src/main/java/Pair/Arrays.java +++ b/src/main/java/Pair/Arrays.java @@ -11,6 +11,25 @@ * And a minmax method that returns a pair containing the largest and smallest items from the array list */ public class Arrays { -// public static <___> Pair firstLast(ArrayList<___> a) { -// } + + + public static Pair firstLast(ArrayList list) { + return new Pair(list.get(0), list.get(list.size()-1)); + } + + public static E min(ArrayList list) { + Collections.sort(list); + return list.get(0); + } + + public static E max (ArrayList list) { + Collections.sort(list); + return list.get(list.size() - 1); + } + + public static Pair minMax(ArrayList list) { + return new Pair(min(list), max(list)); + + } + } diff --git a/src/main/java/Pair/Pair.java b/src/main/java/Pair/Pair.java index c4dd905..7d481c7 100644 --- a/src/main/java/Pair/Pair.java +++ b/src/main/java/Pair/Pair.java @@ -1,5 +1,8 @@ package Pair; +import java.util.ArrayList; +import java.util.Collections; + /** * You need to store two values of type `E`, set them in a constructor, and have the following methods, * getFirst @@ -7,6 +10,39 @@ * min -> returns the minimum of the pair * max -> returns the maximum of the pair */ -public class Pair { +public class Pair { + + private E first; + private E second; + + public Pair(E thing1, E thing2) { + this.first = thing1; + this.second = thing2; + } + + public E getFirst() { + return this.first; + } + + public E getSecond() { + return this.second; + } + + public E min() { + if (first.compareTo(second) < 0) { + return first; + } else { + return second; + } + } + + public E max() { + if (first.compareTo(second) > 0) { + return first; + } else{ + return second; + } + } + } diff --git a/src/test/java/ArrayListCombiner/ArrayListCombinerTest.java b/src/test/java/ArrayListCombiner/ArrayListCombinerTest.java index 957a878..9e16484 100644 --- a/src/test/java/ArrayListCombiner/ArrayListCombinerTest.java +++ b/src/test/java/ArrayListCombiner/ArrayListCombinerTest.java @@ -9,40 +9,40 @@ import java.util.ArrayList; public class ArrayListCombinerTest { -// Employee foo = new Employee("FOO", 100); -// Manager bar = new Manager("BAR", 100); -// @Test -// public void testExtendCombiner() throws Exception { -// // Given an array list with employees -// ArrayList first = new ArrayList<>(); -// first.add(foo); -// // An an array list with managers -// ArrayList second = new ArrayList<>(); -// second.add(bar); -// // When I combine them -// ArrayListCombiner.extendCombiner(first, second); -// // Then I should get an arrayList with both -// ArrayList expected = new ArrayList<>(); -// expected.add(foo); -// expected.add(bar); -// Assert.assertEquals(expected, first); -// } -// -// @Test -// public void testSuperCombiner() throws Exception { -// // Given an array list with employees -// ArrayList first = new ArrayList<>(); -// first.add(foo); -// // An an array list with managers -// ArrayList second = new ArrayList<>(); -// second.add(bar); -// // When I combine them -// ArrayListCombiner.superCombiner(first, second); -// // Then I should get an arrayList with both -// ArrayList expected = new ArrayList<>(); -// expected.add(foo); -// expected.add(bar); -// Assert.assertEquals(expected, first); -// } + Employee foo = new Employee("FOO", 100); + Manager bar = new Manager("BAR", 100); + @Test + public void testExtendCombiner() throws Exception { + // Given an array list with employees + ArrayList first = new ArrayList<>(); + first.add(foo); + // An an array list with managers + ArrayList second = new ArrayList<>(); + second.add(bar); + // When I combine them + ArrayListCombiner.extendCombiner(first, second); + // Then I should get an arrayList with both + ArrayList expected = new ArrayList<>(); + expected.add(foo); + expected.add(bar); + Assert.assertEquals(expected, first); + } + + @Test + public void testSuperCombiner() throws Exception { + // Given an array list with employees + ArrayList first = new ArrayList<>(); + first.add(foo); + // An an array list with managers + ArrayList second = new ArrayList<>(); + second.add(bar); + // When I combine them + ArrayListCombiner.superCombiner(first, second); + // Then I should get an arrayList with both + ArrayList expected = new ArrayList<>(); + expected.add(foo); + expected.add(bar); + Assert.assertEquals(expected, first); + } } \ No newline at end of file diff --git a/src/test/java/MapFunc/MapFuncTest.java b/src/test/java/MapFunc/MapFuncTest.java index 3c7534f..a3fdf58 100644 --- a/src/test/java/MapFunc/MapFuncTest.java +++ b/src/test/java/MapFunc/MapFuncTest.java @@ -1,36 +1,36 @@ -//package MapFunc; -// -//import MapFunc.MapFunc; -//import org.junit.Test; -// -//import java.util.ArrayList; -//import org.junit.Assert; -// -//public class MapFuncTest { -// @Test -// public void testSingleTypeMap() throws Exception { -// // Given an integer array list -// ArrayList intList = new ArrayList<>(); -// intList.add(1); -// intList.add(2); -// // When it's mapped with a function to double the value -// ArrayList mappedList = MapFunc.map(intList, num -> num*2); -// // Then all the values are doubled -// Assert.assertEquals(new Integer(2), mappedList.get(0)); -// Assert.assertEquals(new Integer(4), mappedList.get(1)); -// } -// -// @Test -// public void testMultipleTypeMap() throws Exception { -// // Given an integer array list -// ArrayList intList = new ArrayList<>(); -// intList.add(1); -// intList.add(2); -// // When it's mapped with to string -// ArrayList mappedList = MapFunc.map(intList, num -> num.toString()); -// // Then all the values are doubled -// Assert.assertEquals("1", mappedList.get(0)); -// Assert.assertEquals("2", mappedList.get(1)); -// } -// -//} \ No newline at end of file +package MapFunc; + +import MapFunc.MapFunc; +import org.junit.Test; + +import java.util.ArrayList; +import org.junit.Assert; + +public class MapFuncTest { + @Test + public void testSingleTypeMap() throws Exception { + // Given an integer array list + ArrayList intList = new ArrayList<>(); + intList.add(1); + intList.add(2); + // When it's mapped with a function to double the value + ArrayList mappedList = MapFunc.map(intList, num -> num*2); + // Then all the values are doubled + Assert.assertEquals(new Integer(2), mappedList.get(0)); + Assert.assertEquals(new Integer(4), mappedList.get(1)); + } + + @Test + public void testMultipleTypeMap() throws Exception { + // Given an integer array list + ArrayList intList = new ArrayList<>(); + intList.add(1); + intList.add(2); + // When it's mapped with to string + ArrayList mappedList = MapFunc.map(intList, num -> num.toString()); + // Then all the values are doubled + Assert.assertEquals("1", mappedList.get(0)); + Assert.assertEquals("2", mappedList.get(1)); + } + +} \ No newline at end of file diff --git a/src/test/java/Pair/ArraysTest.java b/src/test/java/Pair/ArraysTest.java index 4d32e23..0d51970 100644 --- a/src/test/java/Pair/ArraysTest.java +++ b/src/test/java/Pair/ArraysTest.java @@ -1,74 +1,74 @@ -//package Pair; -// -//import org.junit.Assert; -//import org.junit.Test; -// -//import java.util.ArrayList; -// -//public class ArraysTest { -// @Test -// public void firstLast() throws Exception { -// // Given an ArrayList of Integers -// ArrayList al = new ArrayList<>(); -// al.add(1); -// al.add(5); -// al.add(3); -// al.add(4); -// al.add(2); -// al.add(0); -// al.add(1000); -// // When firstLast is called -// Pair result = Arrays.firstLast(al); -// // Then it should return the first and last items -// Assert.assertEquals(new Integer(1), result.getFirst()); -// Assert.assertEquals(new Integer(1000), result.getSecond()); -// } -// -// @Test -// public void testMin() throws Exception { -// // Given an ArrayList of Integers -// ArrayList al = new ArrayList<>(); -// al.add(1); -// al.add(5); -// al.add(3); -// al.add(4); -// al.add(2); -// al.add(0); -// al.add(1000); -// // When min is called assert that it gets the smallest item -// Assert.assertEquals(new Integer(0), Arrays.min(al)); -// } -// -// @Test -// public void testMax() throws Exception { -// // Given an ArrayList of Integers -// ArrayList al = new ArrayList<>(); -// al.add(1); -// al.add(5); -// al.add(3); -// al.add(4); -// al.add(2); -// al.add(0); -// al.add(1000); -// // When min is called assert that it gets the largest item -// Assert.assertEquals(new Integer(1000), Arrays.max(al)); -// } -// -// @Test -// public void testMinMax() throws Exception { -// // Given an ArrayList of Integers -// ArrayList al = new ArrayList<>(); -// al.add(1); -// al.add(5); -// al.add(3); -// al.add(4); -// al.add(2); -// al.add(0); -// al.add(1000); -// // When minMax is called -// Pair result = Arrays.minMax(al); -// // Then it should return the first and last items -// Assert.assertEquals(new Integer(0), result.min()); -// Assert.assertEquals(new Integer(1000), result.max()); -// } -//} +package Pair; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; + +public class ArraysTest { + @Test + public void firstLast() throws Exception { + // Given an ArrayList of Integers + ArrayList al = new ArrayList<>(); + al.add(1); + al.add(5); + al.add(3); + al.add(4); + al.add(2); + al.add(0); + al.add(1000); + // When firstLast is called + Pair result = Arrays.firstLast(al); + // Then it should return the first and last items + Assert.assertEquals(new Integer(1), result.getFirst()); + Assert.assertEquals(new Integer(1000), result.getSecond()); + } + + @Test + public void testMin() throws Exception { + // Given an ArrayList of Integers + ArrayList al = new ArrayList<>(); + al.add(1); + al.add(5); + al.add(3); + al.add(4); + al.add(2); + al.add(0); + al.add(1000); + // When min is called assert that it gets the smallest item + Assert.assertEquals(new Integer(0), Arrays.min(al)); + } + + @Test + public void testMax() throws Exception { + // Given an ArrayList of Integers + ArrayList al = new ArrayList<>(); + al.add(1); + al.add(5); + al.add(3); + al.add(4); + al.add(2); + al.add(0); + al.add(1000); + // When min is called assert that it gets the largest item + Assert.assertEquals(new Integer(1000), Arrays.max(al)); + } + + @Test + public void testMinMax() throws Exception { + // Given an ArrayList of Integers + ArrayList al = new ArrayList<>(); + al.add(1); + al.add(5); + al.add(3); + al.add(4); + al.add(2); + al.add(0); + al.add(1000); + // When minMax is called + Pair result = Arrays.minMax(al); + // Then it should return the first and last items + Assert.assertEquals(new Integer(0), result.min()); + Assert.assertEquals(new Integer(1000), result.max()); + } +} diff --git a/src/test/java/Pair/PairTest.java b/src/test/java/Pair/PairTest.java index d616178..baf2071 100644 --- a/src/test/java/Pair/PairTest.java +++ b/src/test/java/Pair/PairTest.java @@ -1,32 +1,32 @@ -//package Pair; -// -//import org.junit.Test; -//import org.junit.Assert; -// -//public class PairTest { -// -// @Test -// public void testGetters() throws Exception { -// // Given a pair with "Foo" and "Bar" -// Pair p = new Pair("Foo", "Bar"); -// // When getFirst and getSecond are called, they should be returned. -// Assert.assertEquals("Foo", p.getFirst()); -// Assert.assertEquals("Bar", p.getSecond()); -// } -// -// @Test -// public void testMin() throws Exception { -// // Given a pair with two values -// Pair p = new Pair(1.23, 2.34); -// // When p.min() is called, the smallest should be returned. -// Assert.assertEquals(new Double(1.23), p.min()); -// } -// -// @Test -// public void testMax() throws Exception { -// // Given a pair with two values -// Pair p = new Pair(1.23, 2.34); -// // When p.max() is called, the largest should be returned. -// Assert.assertEquals(new Double(2.34), p.max()); -// } -//} \ No newline at end of file +package Pair; + +import org.junit.Test; +import org.junit.Assert; + +public class PairTest { + + @Test + public void testGetters() throws Exception { + // Given a pair with "Foo" and "Bar" + Pair p = new Pair("Foo", "Bar"); + // When getFirst and getSecond are called, they should be returned. + Assert.assertEquals("Foo", p.getFirst()); + Assert.assertEquals("Bar", p.getSecond()); + } + + @Test + public void testMin() throws Exception { + // Given a pair with two values + Pair p = new Pair(1.23, 2.34); + // When p.min() is called, the smallest should be returned. + Assert.assertEquals(new Double(1.23), p.min()); + } + + @Test + public void testMax() throws Exception { + // Given a pair with two values + Pair p = new Pair(1.23, 2.34); + // When p.max() is called, the largest should be returned. + Assert.assertEquals(new Double(2.34), p.max()); + } +} \ No newline at end of file From e2aef10f07d52ced320ef0864a03cbb47e248cbb Mon Sep 17 00:00:00 2001 From: Vincent Gasbarro Date: Sun, 11 Mar 2018 21:58:43 -0400 Subject: [PATCH 4/5] vg --- src/main/java/StackArray/GenericStack.java | 5 +---- src/main/java/StackArray/ObjectStack.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/StackArray/GenericStack.java b/src/main/java/StackArray/GenericStack.java index d93d47a..fcbf0fd 100644 --- a/src/main/java/StackArray/GenericStack.java +++ b/src/main/java/StackArray/GenericStack.java @@ -1,6 +1,5 @@ package StackArray; -import java.util.ArrayList; import java.util.Arrays; /** @@ -27,13 +26,12 @@ public E push(E aThing) { temp[i + 1] = elements[i]; } } - temp[0] = aThing; elements = temp; return aThing; } - public E pop() { + public E pop() throws IndexOutOfBoundsException { if (elements.length == 0) { return null; @@ -60,5 +58,4 @@ public boolean isEmpty() { } } - } diff --git a/src/main/java/StackArray/ObjectStack.java b/src/main/java/StackArray/ObjectStack.java index 2c8c134..3936346 100644 --- a/src/main/java/StackArray/ObjectStack.java +++ b/src/main/java/StackArray/ObjectStack.java @@ -30,7 +30,7 @@ public Object push(Object aThing) { return aThing; } - public Object pop() { + public Object pop() throws IndexOutOfBoundsException { if (elements.length == 0) { return null; From ed50d6eb156a6a9397f1e9093d69f768e72c173b Mon Sep 17 00:00:00 2001 From: Vincent Gasbarro Date: Mon, 12 Mar 2018 07:59:45 -0400 Subject: [PATCH 5/5] finished --- src/main/java/StackArray/GenericStack.java | 25 ++++++-------------- src/main/java/StackArray/ObjectStack.java | 27 +++++++--------------- src/main/java/StackArrayList/Stack.java | 11 ++++----- 3 files changed, 20 insertions(+), 43 deletions(-) diff --git a/src/main/java/StackArray/GenericStack.java b/src/main/java/StackArray/GenericStack.java index fcbf0fd..d72527b 100644 --- a/src/main/java/StackArray/GenericStack.java +++ b/src/main/java/StackArray/GenericStack.java @@ -20,34 +20,23 @@ public E push(E aThing) { E[] temp = Arrays.copyOf(elements, elements.length + 1); - if (elements.length > 0) { - - for (int i = 0; i < elements.length; i++) { - temp[i + 1] = elements[i]; - } - } - temp[0] = aThing; + temp[elements.length] = aThing; elements = temp; return aThing; } public E pop() throws IndexOutOfBoundsException { - if (elements.length == 0) { - return null; - } else { - E[] temp = Arrays.copyOf(elements, elements.length - 1); - int iterator = 0; + E poppedObj = elements[elements.length - 1]; - for (int i = 1; i < elements.length; i++) { - temp[iterator] = elements[i]; - iterator++; + if (elements.length > 0) { + E[] temp = Arrays.copyOf(elements, elements.length - 1); + for (int i = 0; i < elements.length - 1; i++) { + temp[i] = elements[i]; } - - E poppedObj = elements[0]; elements = temp; - return poppedObj; } + return poppedObj; } public boolean isEmpty() { diff --git a/src/main/java/StackArray/ObjectStack.java b/src/main/java/StackArray/ObjectStack.java index 3936346..e1533c3 100644 --- a/src/main/java/StackArray/ObjectStack.java +++ b/src/main/java/StackArray/ObjectStack.java @@ -5,6 +5,7 @@ /** * Expand the ArrayList implementation of stack here to use an Object[] array. Still implement push, pop, and isEmpty. * Remember, you might need to resize the stack in the push method. + * * @param */ public class ObjectStack { @@ -18,35 +19,23 @@ public Object push(Object aThing) { Object[] temp = Arrays.copyOf(elements, elements.length + 1); - if (elements.length > 0) { - - for (int i = 0; i < elements.length; i++) { - temp[i + 1] = elements[i]; - } - } - - temp[0] = aThing; + temp[elements.length] = aThing; elements = temp; return aThing; } public Object pop() throws IndexOutOfBoundsException { - if (elements.length == 0) { - return null; - } else { - Object[] temp = Arrays.copyOf(elements, elements.length - 1); - int iterator = 0; + Object poppedObj = elements[elements.length - 1]; - for (int i = 1; i < elements.length; i++) { - temp[iterator] = elements[i]; - iterator++; + if (elements.length > 0) { + Object[] temp = Arrays.copyOf(elements, elements.length - 1); + for (int i = 0; i < elements.length - 1; i++) { + temp[i] = elements[i]; } - - Object poppedObj = elements[0]; elements = temp; - return poppedObj; } + return poppedObj; } public boolean isEmpty() { diff --git a/src/main/java/StackArrayList/Stack.java b/src/main/java/StackArrayList/Stack.java index 06692fe..6930402 100644 --- a/src/main/java/StackArrayList/Stack.java +++ b/src/main/java/StackArrayList/Stack.java @@ -1,6 +1,7 @@ package StackArrayList; import java.util.ArrayList; +import java.util.Arrays; /** * Implement Stack by adding the push, pop, and isEmpty functions. It must pass the prewritten unit tests. @@ -15,16 +16,14 @@ public Stack(){ } public E push(E aThing) { - ArrayList temp = new ArrayList(); - temp.add(aThing); - temp.addAll(elements); - elements = temp; - return (E)elements.get(0); + + elements.add(aThing); + return (E)elements.get(elements.size() - 1); } public E pop() throws IndexOutOfBoundsException { - return (E)elements.remove(0); + return (E)elements.remove(elements.size() - 1); }