finished lab

src/main/java/org/zipcoder/store/Cart.java

@@ -12,4 +12,19 @@ public class Cart {
     public long getId(){
         return this.id;
     }
+
+    public int hashCode(){
+        return (int) id;
+    }
+
+    @Override
+    public boolean equals(Object o){
+        boolean answer =false;
+        Cart cart = (Cart) o;
+        if (this.getId() == cart.getId()) {
+            answer = true;
+        }
+        return answer;
+    }
 }
+

src/main/java/org/zipcoder/store/Entry.java

@@ -20,4 +20,4 @@ public class Entry {
     public void setValue(Cart value) {
         this.value = value;
     }
-}
+}

src/main/java/org/zipcoder/store/ListMap.java

@@ -7,42 +7,63 @@ public class ListMap implements MyMap {
     // instance field that is intialize to an ArrayList
     private List<Entry> entries = new ArrayList<>();
 
+    public ListMap(){
+    }
+
     @Override
     public int size() {
-        return -1;
+        return entries.size();
     }
 
     @Override
-    public boolean isEmptry() {
-        return false;
+    public boolean isEmpty() {
+        return entries.isEmpty();
     }
 
     @Override
     public Cart get(User key) {
-        // find the cart associate with the key
+
+        for(Entry e : entries)
+            if (e.getKey().equals(key))
+                return e.getValue();
+
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
-        // add the key, value entry to the entries list
+        if (get(key) != null) remove(key);
+        entries.add(new Entry(key, value));
     }
 
 
     @Override
     public List<User> getKeys() {
-        // get all the keys in the map
-        return null;
+        List<User>  users = new ArrayList<>();
+        for (Entry e : entries)
+            users.add(e.getKey());
+        return users;
     }
 
     @Override
     public List<Cart> getValues() {
-        // get all the values in the map
-        return null;
+        List<Cart>  carts = new ArrayList<>();
+        for (Entry e : entries)
+            carts.add(e.getValue());
+        return carts;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart cart = null;
+        for(Entry e : entries)
+            if (e.getKey().equals(key)) {
+                cart = e.getValue();
+                entries.remove(e);
+                break;
+            }
+
+        return cart;
     }
 }
+

src/main/java/org/zipcoder/store/MyHashMap.java

@@ -4,7 +4,7 @@ import java.util.*;
 
 public class MyHashMap implements MyMap{
     // final field that doesn't change for any object
-    private static final int BUCKET_SIZE = 15;
+    private static final int BUCKET_SIZE = 100;
 
     // instance field that can only be set once. It is different for every Object
     private final List<Entry>[] entries;
@@ -19,40 +19,67 @@ public class MyHashMap implements MyMap{
 
     @Override
     public int size() {
-        return -1;
+        int count = 0;
+        for(List<Entry> e : entries)
+            count += e.size();
+        return count;
     }
 
     @Override
-    public boolean isEmptry() {
-        return false;
+    public boolean isEmpty() {
+        return (size() ==0);
     }
 
     @Override
     public Cart get(User key) {
-        return null;
+        Cart cart = null;
+        List<Entry> entry = entries[bucketIndex(key)];
+        for(Entry e : entry) {
+            if (e.getKey().equals(key))
+                cart =  e.getValue();
+        }
+        return cart;
     }
 
     @Override
     public void put(User key, Cart value) {
-
+        entries[bucketIndex(key)].add(new Entry(key, value));
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> users = new ArrayList<>();
+        for(List<Entry> entry : entries)
+            for (Entry e: entry)
+                users.add(e.getKey());
+        return users;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> carts = new ArrayList<>();
+        for(List<Entry> entry : entries)
+            for (Entry e: entry)
+                carts.add(e.getValue());
+        return carts;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart cart = null;
+        List<Entry> entry = entries[bucketIndex(key)];
+        for(Entry e : entry){
+            if(e.getKey().equals(key)){
+                cart = e.getValue();
+                entry.remove(e);
+                break;
+            }
+        }
+        return cart;
     }
 
     private int bucketIndex(User key){
         return Math.abs(key.hashCode()) % entries.length;
     }
 }
+

src/main/java/org/zipcoder/store/MyMap.java

@@ -12,7 +12,7 @@ public interface MyMap {
     /**
      * @return true if the map has one or more item in it. False otherwise.
      */
-    public boolean isEmptry();
+    public boolean isEmpty();
 
     /**
      * Return the cart associated with the user

src/main/java/org/zipcoder/store/User.java

@@ -37,4 +37,23 @@ public class User {
     public void setName(String name) {
         this.name = name;
     }
+
+
+    public int hashCode(){
+        if (getName() == null)
+            return (int) id;
+        else
+            return (int) id + getName().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o){
+        boolean answer =false;
+        User user = (User) o;
+        if ((this.getId() == user.getId()) && (this.getName() == user.getName())) {
+            answer = true;
+        }
+        return answer;
+    }
 }
+

src/test/java/org/zipcoder/store/ListMapTest.java

@@ -116,7 +116,7 @@ public class ListMapTest {
 
     @Test
     public void testIsEmpty_WithoutEntry(){
-        Assert.assertTrue(myMap.isEmptry());
+        Assert.assertTrue(myMap.isEmpty());
     }
 
     @Test
@@ -129,7 +129,7 @@ public class ListMapTest {
         myMap.put(user1, cart1);
 
         // Then
-        Assert.assertFalse(myMap.isEmptry());
+        Assert.assertFalse(myMap.isEmpty());
     }
 
     @Test
@@ -174,58 +174,58 @@ public class ListMapTest {
         Assert.assertTrue(values.contains(cart2));
     }
 
-//    I commented this out because it takes a long time to run. Uncomment it when implement your put method, uncomment this test
-//    @Test
-//    public void testPutAndGet_WithManyItems(){
-//        // Given
-//        int numberOfEntries = 70000;
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            myMap.put(new User(i), new Cart(i));
-//        }
-//
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            // When
-//            Cart actualCart = myMap.get(new User(i));
-//            Cart expectedCart = new Cart(i);
-//
-//            // Then
-//            Assert.assertEquals(actualCart, expectedCart);
-//        }
-//    }
-
-//    BONUS
-//    @Test
-//    public void testRemove(){
-//        // Given
-//        User user1 = new User("Lena");
-//        Cart cart1 = new Cart(11);
-//
-//        User user2 = new User("Jamal");
-//        Cart cart2 = new Cart(21);
-//
-//        User user3 = new User("Kelvin");
-//        Cart cart3 = new Cart(31);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//        myMap.put(user3, cart3);
-//
-//        // Then
-//        Cart actualCart = myMap.remove(user2);
-//
-//        Assert.assertEquals(cart2, actualCart);
-//        Assert.assertNull(myMap.get(user2));
-//    }
-//
-//    @Test
-//    public void testRemove_CartNotInTheMap(){
-//        // Given
-//        User user1 = new User("Lena");
-//
-//        // When & Then
-//        Assert.assertNull(myMap.remove(user1));
-//    }
+   // I commented this out because it takes a long time to run. Uncomment it when implement your put method, uncomment this test
+    @Test
+    public void testPutAndGet_WithManyItems(){
+        // Given
+        int numberOfEntries = 70000;
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            myMap.put(new User(i), new Cart(i));
+        }
+
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            // When
+            Cart actualCart = myMap.get(new User(i));
+            Cart expectedCart = new Cart(i);
+
+            // Then
+            Assert.assertEquals(actualCart, expectedCart);
+        }
+    }
+
+    //BONUS
+    @Test
+    public void testRemove(){
+        // Given
+        User user1 = new User("Lena");
+        Cart cart1 = new Cart(11);
+
+        User user2 = new User("Jamal");
+        Cart cart2 = new Cart(21);
+
+        User user3 = new User("Kelvin");
+        Cart cart3 = new Cart(31);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+        myMap.put(user3, cart3);
+
+        // Then
+        Cart actualCart = myMap.remove(user2);
+
+        Assert.assertEquals(cart2, actualCart);
+        Assert.assertNull(myMap.get(user2));
+    }
+
+    @Test
+    public void testRemove_CartNotInTheMap(){
+        // Given
+        User user1 = new User("Lena");
+
+        // When & Then
+        Assert.assertNull(myMap.remove(user1));
+    }
 }

src/test/java/org/zipcoder/store/MyHashMapTest.java

@@ -116,7 +116,7 @@ public class MyHashMapTest {
 
     @Test
     public void testIsEmpty_WithoutEntry(){
-        Assert.assertTrue(myMap.isEmptry());
+        Assert.assertTrue(myMap.isEmpty());
     }
 
     @Test
@@ -129,7 +129,7 @@ public class MyHashMapTest {
         myMap.put(user1, cart1);
 
         // Then
-        Assert.assertFalse(myMap.isEmptry());
+        Assert.assertFalse(myMap.isEmpty());
     }
 
     @Test
@@ -174,57 +174,57 @@ public class MyHashMapTest {
         Assert.assertTrue(values.contains(cart2));
     }
 
-//    I commented this out because it takes a long time to run. Uncomment it when implement your put method, uncomment this test
-//    @Test
-//    public void testPutAndGet_WithManyItems(){
-//        // Given
-//        int numberOfEntries = 70000;
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            myMap.put(new User(i), new Cart(i));
-//        }
-//
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            // When
-//            Cart actualCart = myMap.get(new User(i));
-//            Cart expectedCart = new Cart(i);
-//
-//            // Then
-//            Assert.assertEquals(actualCart, expectedCart);
-//        }
-//    }
-
-//    @Test
-//    public void testRemove(){
-//        // Given
-//        User user1 = new User("Lena");
-//        Cart cart1 = new Cart(11);
-//
-//        User user2 = new User("Jamal");
-//        Cart cart2 = new Cart(21);
-//
-//        User user3 = new User("Kelvin");
-//        Cart cart3 = new Cart(31);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//        myMap.put(user3, cart3);
-//
-//        // Then
-//        Cart actualCart = myMap.remove(user2);
-//
-//        Assert.assertEquals(cart2, actualCart);
-//        Assert.assertNull(myMap.get(user2));
-//    }
-//
-//    @Test
-//    public void testRemove_CartNotInTheMap(){
-//        // Given
-//        User user1 = new User("Lena");
-//
-//        // When & Then
-//        Assert.assertNull(myMap.remove(user1));
-//    }
+    //I commented this out because it takes a long time to run. Uncomment it when implement your put method, uncomment this test
+    @Test
+    public void testPutAndGet_WithManyItems(){
+        // Given
+        int numberOfEntries = 70000;
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            myMap.put(new User(i), new Cart(i));
+        }
+
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            // When
+            Cart actualCart = myMap.get(new User(i));
+            Cart expectedCart = new Cart(i);
+
+            // Then
+            Assert.assertEquals(actualCart, expectedCart);
+        }
+    }
+
+    @Test
+    public void testRemove(){
+        // Given
+        User user1 = new User("Lena");
+        Cart cart1 = new Cart(11);
+
+        User user2 = new User("Jamal");
+        Cart cart2 = new Cart(21);
+
+        User user3 = new User("Kelvin");
+        Cart cart3 = new Cart(31);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+        myMap.put(user3, cart3);
+
+        // Then
+        Cart actualCart = myMap.remove(user2);
+
+        Assert.assertEquals(cart2, actualCart);
+        Assert.assertNull(myMap.get(user2));
+    }
+
+    @Test
+    public void testRemove_CartNotInTheMap(){
+        // Given
+        User user1 = new User("Lena");
+
+        // When & Then
+        Assert.assertNull(myMap.remove(user1));
+    }
 }