From cfb2d544ee52d4c680d52dd7e2de761672b2e28a Mon Sep 17 00:00:00 2001
From: wesley <wesley@zipcoders-MacBook-Pro-8.local>
Date: Mon, 27 Nov 2017 10:04:17 -0500
Subject: [PATCH 1/2] problem 1

---
 src/main/java/io/zipcoder/Problem1.java     | 41 +++++++++++++++++++++
 src/test/java/io/zipcoder/Problem1Test.java | 32 ++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/src/main/java/io/zipcoder/Problem1.java b/src/main/java/io/zipcoder/Problem1.java
index 6cd6024..49c79d6 100644
--- a/src/main/java/io/zipcoder/Problem1.java
+++ b/src/main/java/io/zipcoder/Problem1.java
@@ -1,4 +1,45 @@
 package io.zipcoder;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class Problem1 {
+    private HashMap<Character,Character> changeMap = new HashMap<Character, Character>();
+    private String sentence;
+
+    public Problem1(String sentence, HashMap<Character,Character> changeMap){
+        this.sentence = sentence;
+        this.changeMap = changeMap;
+    }
+
+    public String changeWithLoop(){
+        StringBuilder newSentence = new StringBuilder();
+        for(int i = 0;i<sentence.length();i++){
+            Character currentCharacter = sentence.charAt(i);
+            if(changeMap.containsKey(Character.toLowerCase(currentCharacter)) ||
+                    changeMap.containsKey(Character.toUpperCase(currentCharacter))){
+                newSentence.append(changeMap.get(Character.toLowerCase(currentCharacter)));
+            }else{
+                newSentence.append(currentCharacter);
+            }
+        }
+        return newSentence.toString();
+    }
+
+    public String withRecursion(){
+        return replace(sentence,0);
+    }
+
+    public String replace(String sentence, int place){
+        Character currentCharacter = sentence.charAt(place);
+        if(changeMap.containsKey(Character.toLowerCase(currentCharacter)) || changeMap.containsKey(Character.toUpperCase(currentCharacter))){
+            currentCharacter = changeMap.get(Character.toLowerCase(currentCharacter));
+        }
+        sentence = sentence.substring(0,place)+currentCharacter+sentence.substring(place+1);
+
+        if(place<sentence.length()-1) {
+            sentence = replace(sentence,place+=1);
+        }
+        return sentence;
+    }
 }
diff --git a/src/test/java/io/zipcoder/Problem1Test.java b/src/test/java/io/zipcoder/Problem1Test.java
index de82e99..11f6ca9 100644
--- a/src/test/java/io/zipcoder/Problem1Test.java
+++ b/src/test/java/io/zipcoder/Problem1Test.java
@@ -1,4 +1,36 @@
 package io.zipcoder;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+
 public class Problem1Test {
+    Problem1 problem1;
+
+    @Before
+    public void setUp() {
+        HashMap<Character,Character> changeMap = new HashMap<Character, Character>();
+        changeMap.put('f', '7');
+        changeMap.put('s', '$');
+        changeMap.put('1', '!');
+        changeMap.put('a', '@');
+        problem1 = new Problem1("The Farmer went to the store to get 1 dollar’s worth of fertilizer",changeMap);
+
+    }
+
+    @Test
+    public void withLoop(){
+        String expected = "The 7@rmer went to the $tore to get ! doll@r’$ worth o7 7ertilizer";
+        String actual = problem1.changeWithLoop();
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void withRecursion(){
+        String expected = "The 7@rmer went to the $tore to get ! doll@r’$ worth o7 7ertilizer";
+        String actual = problem1.withRecursion();
+        Assert.assertEquals(expected,actual);
+    }
 }

From adfcf51cab20982bb7c24ae35c1cc1ae6fabe9fd Mon Sep 17 00:00:00 2001
From: wesley <wesley@zipcoders-MacBook-Pro-8.local>
Date: Thu, 30 Nov 2017 21:00:37 -0500
Subject: [PATCH 2/2] cleaned up

---
 src/main/java/io/zipcoder/Problem1.java     | 51 ++++++++-------------
 src/test/java/io/zipcoder/Problem1Test.java | 11 +++--
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/main/java/io/zipcoder/Problem1.java b/src/main/java/io/zipcoder/Problem1.java
index 49c79d6..c36fc75 100644
--- a/src/main/java/io/zipcoder/Problem1.java
+++ b/src/main/java/io/zipcoder/Problem1.java
@@ -1,45 +1,34 @@
 package io.zipcoder;
 
 import java.util.HashMap;
-import java.util.Map;
 
 public class Problem1 {
-    private HashMap<Character,Character> changeMap = new HashMap<Character, Character>();
-    private String sentence;
 
-    public Problem1(String sentence, HashMap<Character,Character> changeMap){
-        this.sentence = sentence;
-        this.changeMap = changeMap;
-    }
-
-    public String changeWithLoop(){
-        StringBuilder newSentence = new StringBuilder();
-        for(int i = 0;i<sentence.length();i++){
-            Character currentCharacter = sentence.charAt(i);
-            if(changeMap.containsKey(Character.toLowerCase(currentCharacter)) ||
-                    changeMap.containsKey(Character.toUpperCase(currentCharacter))){
-                newSentence.append(changeMap.get(Character.toLowerCase(currentCharacter)));
-            }else{
-                newSentence.append(currentCharacter);
+    public String changeLetters(String str,HashMap<Character,Character> changeMap){
+        StringBuilder builder = new StringBuilder();
+        for(int i = 0;i<str.length();i++){
+            Character currentChar = str.charAt(i);
+            if(changeMap.containsKey(Character.toLowerCase(currentChar))){
+                currentChar = changeMap.get(Character.toLowerCase(currentChar));
             }
+            builder.append(currentChar);
         }
-        return newSentence.toString();
+        return builder.toString();
     }
 
-    public String withRecursion(){
-        return replace(sentence,0);
-    }
-
-    public String replace(String sentence, int place){
-        Character currentCharacter = sentence.charAt(place);
-        if(changeMap.containsKey(Character.toLowerCase(currentCharacter)) || changeMap.containsKey(Character.toUpperCase(currentCharacter))){
-            currentCharacter = changeMap.get(Character.toLowerCase(currentCharacter));
+    public String recursion(String str,HashMap<Character,Character> changeMap){
+        if(str.length() == 0){
+            return "";
         }
-        sentence = sentence.substring(0,place)+currentCharacter+sentence.substring(place+1);
-
-        if(place<sentence.length()-1) {
-            sentence = replace(sentence,place+=1);
+        Character currentChar = str.charAt(0);
+        if(changeMap.containsKey(Character.toLowerCase(currentChar))){
+            currentChar = changeMap.get(Character.toLowerCase(currentChar));
         }
-        return sentence;
+        return currentChar + recursion(str.substring(1),changeMap);
+
     }
+
+
+
+    // use replace
 }
diff --git a/src/test/java/io/zipcoder/Problem1Test.java b/src/test/java/io/zipcoder/Problem1Test.java
index 11f6ca9..7ad4806 100644
--- a/src/test/java/io/zipcoder/Problem1Test.java
+++ b/src/test/java/io/zipcoder/Problem1Test.java
@@ -8,29 +8,32 @@
 
 public class Problem1Test {
     Problem1 problem1;
+    HashMap<Character,Character> changeMap;
+    String input;
 
     @Before
     public void setUp() {
-        HashMap<Character,Character> changeMap = new HashMap<Character, Character>();
+        changeMap = new HashMap<Character, Character>();
         changeMap.put('f', '7');
         changeMap.put('s', '$');
         changeMap.put('1', '!');
         changeMap.put('a', '@');
-        problem1 = new Problem1("The Farmer went to the store to get 1 dollar’s worth of fertilizer",changeMap);
+        problem1 = new Problem1();
+        input = "The Farmer went to the store to get 1 dollar’s worth of fertilizer";
 
     }
 
     @Test
     public void withLoop(){
         String expected = "The 7@rmer went to the $tore to get ! doll@r’$ worth o7 7ertilizer";
-        String actual = problem1.changeWithLoop();
+        String actual = problem1.changeLetters(input,changeMap);
         Assert.assertEquals(expected,actual);
     }
 
     @Test
     public void withRecursion(){
         String expected = "The 7@rmer went to the $tore to get ! doll@r’$ worth o7 7ertilizer";
-        String actual = problem1.withRecursion();
+        String actual = problem1.recursion(input,changeMap);
         Assert.assertEquals(expected,actual);
     }
 }