From 6f008ea9a50aa89fb7afb6d044a50cbe4e74bef8 Mon Sep 17 00:00:00 2001
From: bricktsre <gwoodward21@gmail.com>
Date: Wed, 23 Oct 2019 23:57:57 -0400
Subject: [PATCH 01/11] Made setup methods and variables

---
 VoiceDVR.class | Bin 0 -> 3537 bytes
 VoiceDVR.java  | 107 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 VoiceDVR.class
 create mode 100644 VoiceDVR.java

diff --git a/VoiceDVR.class b/VoiceDVR.class
new file mode 100644
index 0000000000000000000000000000000000000000..c8fc088fa1880c86fdf2983ddca1e6d77625e3c5
GIT binary patch
literal 3537
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

literal 0
HcmV?d00001

diff --git a/VoiceDVR.java b/VoiceDVR.java
new file mode 100644
index 0000000..9d533a1
--- /dev/null
+++ b/VoiceDVR.java
@@ -0,0 +1,107 @@
+import java.util.*;
+import java.awt.*;
+import java.io.*;
+
+public class VoiceDVR {
+	ArrayList<String> searchTerms;		
+	ArrayList<String> output;
+	HashMap<Point, String> pointToString;
+	HashMap<String, Point> stringToPoint;
+
+	public VoiceDVR(String filename){
+		getTerms(filename, searchTerms);
+		makePointToString(pointToString);
+		makeStringToPoint(stringToPoint);
+	}
+
+	private void getTerms(String filename, ArrayList<String> terms){
+		try {
+			BufferedReader br = new BufferedReader(new FileReader(new File(filename)));
+			String line;
+			while ((line = br.readLine()) != null) {
+				terms.add(line);
+			}
+			br.close();
+		}catch(Exception e) {
+			System.out.println("Exception occured reading the file\n");
+		}
+	}
+
+	private void makePointToString(HashMap<Point, String> pts){
+		pts.put(new Point(0,0), "A");
+		pts.put(new Point(1,0), "B");
+		pts.put(new Point(2,0), "C");
+		pts.put(new Point(3,0), "D");
+		pts.put(new Point(4,0), "E");
+		pts.put(new Point(5,0), "R");
+		pts.put(new Point(0,1), "G");
+		pts.put(new Point(1,1), "H");
+		pts.put(new Point(2,1), "I");
+		pts.put(new Point(3,1), "J");
+		pts.put(new Point(4,1), "K");
+		pts.put(new Point(5,1), "L");
+		pts.put(new Point(0,2), "M");
+		pts.put(new Point(1,2), "N");
+		pts.put(new Point(2,2), "O");
+		pts.put(new Point(3,2), "P");
+		pts.put(new Point(4,2), "Q");
+		pts.put(new Point(5,2), "R");
+		pts.put(new Point(0,3), "S");
+		pts.put(new Point(1,3), "T");
+		pts.put(new Point(2,3), "U");
+		pts.put(new Point(3,3), "V");
+		pts.put(new Point(4,3), "W");
+		pts.put(new Point(5,3), "X");
+		pts.put(new Point(0,4), "Y");
+		pts.put(new Point(1,4), "Z");
+		pts.put(new Point(2,4), "1");
+		pts.put(new Point(3,4), "2");
+		pts.put(new Point(4,4), "3");
+		pts.put(new Point(5,4), "4");
+		pts.put(new Point(0,5), "5");
+		pts.put(new Point(1,5), "6");
+		pts.put(new Point(2,5), "7");
+		pts.put(new Point(3,5), "8");
+		pts.put(new Point(4,5), "9");
+		pts.put(new Point(5,5), "0");
+	}
+	
+	private void makeStringToPoint(HashMap<String, Point> stp){
+		stp.put("A", new Point(0,0));
+		stp.put("B", new Point(1,0));
+		stp.put("C", new Point(2,0));
+		stp.put("D", new Point(3,0));
+		stp.put("E", new Point(4,0));
+		stp.put("R", new Point(5,0));
+		stp.put("G", new Point(0,1));
+		stp.put("H", new Point(1,1));
+		stp.put("I", new Point(2,1));
+		stp.put("J", new Point(3,1));
+		stp.put("K", new Point(4,1));
+		stp.put("L", new Point(5,1));
+		stp.put("M", new Point(0,2));
+		stp.put("N", new Point(1,2));
+		stp.put("O", new Point(2,2));
+		stp.put("P", new Point(3,2));
+		stp.put("Q", new Point(4,2));
+		stp.put("R", new Point(5,2));
+		stp.put("S", new Point(0,3));
+		stp.put("T", new Point(1,3));
+		stp.put("U", new Point(2,3));
+		stp.put("V", new Point(3,3));
+		stp.put("W", new Point(4,3));
+		stp.put("X", new Point(5,3));
+		stp.put("Y", new Point(0,4));
+		stp.put("X", new Point(1,4));
+		stp.put("1", new Point(2,4));
+		stp.put("2", new Point(3,4));
+		stp.put("3", new Point(4,4));
+		stp.put("4", new Point(5,4));
+		stp.put("5", new Point(0,5));
+		stp.put("6", new Point(1,5));
+		stp.put("7", new Point(2,5));
+		stp.put("8", new Point(3,5));
+		stp.put("9", new Point(4,5));
+		stp.put("0", new Point(5,5));
+	}
+}

From 1b1ff19f99d07d6e206e5f95177c9fd9f4990fd7 Mon Sep 17 00:00:00 2001
From: bricktsre <gwoodward21@gmail.com>
Date: Thu, 24 Oct 2019 12:40:48 -0400
Subject: [PATCH 02/11] Finished functionality

---
 .VoiceDVR.java.swp | Bin 0 -> 20480 bytes
 Driver.class       | Bin 0 -> 353 bytes
 Driver.java        |   6 ++
 VoiceDVR.class     | Bin 3537 -> 4667 bytes
 VoiceDVR.java      | 173 ++++++++++++++++++++++++---------------------
 output             |   2 +
 test               |   2 +
 7 files changed, 103 insertions(+), 80 deletions(-)
 create mode 100644 .VoiceDVR.java.swp
 create mode 100644 Driver.class
 create mode 100644 Driver.java
 create mode 100644 output
 create mode 100644 test

diff --git a/.VoiceDVR.java.swp b/.VoiceDVR.java.swp
new file mode 100644
index 0000000000000000000000000000000000000000..55ab8aca40083e318f5a51920c4dcb3223fe3408
GIT binary patch
literal 20480
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
F<X?T;oSOgu

literal 0
HcmV?d00001

diff --git a/Driver.class b/Driver.class
new file mode 100644
index 0000000000000000000000000000000000000000..f0acfe5965547eba60434aea1736405f49928787
GIT binary patch
literal 353
zcmZvXK}*9x5QX0)Y0{>#t*xmi58h$~3-#bZ@nZ256l@8Ir%hbSmUIhi+W+Onf`UK5
zA0^J}p%?csGjI6bzTL0y_fG&9I1J&V8=x1$!M-j10D}Mr1pi8DRbLa_<Rm9}H>+n!
z=w?dGyY;e=W+sY?H{MbxO&BIm*+Oi@s1kZUn$||?`K2|6)79FP@>W^6Juzw{&6y=5
z1ZWbP`AU^?l0R4-M;IdJ@IQ{w+ueCzEM!>|;^hCJ*31a~Qi)pP7!CfHJr2mmaBZ<V
z;!fNf=@#_L13!<e|GTtE8xhYIJ%`6;VDJIwF?GjVxY=pyjo;wyj2*a)xNP&#=S;#L
HYX_YlZy-K+

literal 0
HcmV?d00001

diff --git a/Driver.java b/Driver.java
new file mode 100644
index 0000000..60ae97d
--- /dev/null
+++ b/Driver.java
@@ -0,0 +1,6 @@
+public class Driver {
+	public static void main(String args[]) {
+		VoiceDVR translator = new VoiceDVR(args[0]);
+		translator.Translate(args[1]);
+	}
+}
diff --git a/VoiceDVR.class b/VoiceDVR.class
index c8fc088fa1880c86fdf2983ddca1e6d77625e3c5..971d154843bff59ea961e299d9b12b890826d206 100644
GIT binary patch
literal 4667
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
KIX}+d7yb_}AE2)Q

literal 3537
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

diff --git a/VoiceDVR.java b/VoiceDVR.java
index 9d533a1..0f10e72 100644
--- a/VoiceDVR.java
+++ b/VoiceDVR.java
@@ -3,15 +3,12 @@
 import java.io.*;
 
 public class VoiceDVR {
-	ArrayList<String> searchTerms;		
-	ArrayList<String> output;
-	HashMap<Point, String> pointToString;
-	HashMap<String, Point> stringToPoint;
+	private ArrayList<String> searchTerms = new ArrayList<String>();		
+	private HashMap<Character, Point> charToPoint = new HashMap<Character, Point>();
 
 	public VoiceDVR(String filename){
 		getTerms(filename, searchTerms);
-		makePointToString(pointToString);
-		makeStringToPoint(stringToPoint);
+		makeCharToPoint(charToPoint);
 	}
 
 	private void getTerms(String filename, ArrayList<String> terms){
@@ -27,81 +24,97 @@ private void getTerms(String filename, ArrayList<String> terms){
 		}
 	}
 
-	private void makePointToString(HashMap<Point, String> pts){
-		pts.put(new Point(0,0), "A");
-		pts.put(new Point(1,0), "B");
-		pts.put(new Point(2,0), "C");
-		pts.put(new Point(3,0), "D");
-		pts.put(new Point(4,0), "E");
-		pts.put(new Point(5,0), "R");
-		pts.put(new Point(0,1), "G");
-		pts.put(new Point(1,1), "H");
-		pts.put(new Point(2,1), "I");
-		pts.put(new Point(3,1), "J");
-		pts.put(new Point(4,1), "K");
-		pts.put(new Point(5,1), "L");
-		pts.put(new Point(0,2), "M");
-		pts.put(new Point(1,2), "N");
-		pts.put(new Point(2,2), "O");
-		pts.put(new Point(3,2), "P");
-		pts.put(new Point(4,2), "Q");
-		pts.put(new Point(5,2), "R");
-		pts.put(new Point(0,3), "S");
-		pts.put(new Point(1,3), "T");
-		pts.put(new Point(2,3), "U");
-		pts.put(new Point(3,3), "V");
-		pts.put(new Point(4,3), "W");
-		pts.put(new Point(5,3), "X");
-		pts.put(new Point(0,4), "Y");
-		pts.put(new Point(1,4), "Z");
-		pts.put(new Point(2,4), "1");
-		pts.put(new Point(3,4), "2");
-		pts.put(new Point(4,4), "3");
-		pts.put(new Point(5,4), "4");
-		pts.put(new Point(0,5), "5");
-		pts.put(new Point(1,5), "6");
-		pts.put(new Point(2,5), "7");
-		pts.put(new Point(3,5), "8");
-		pts.put(new Point(4,5), "9");
-		pts.put(new Point(5,5), "0");
+	public void Translate(String OutputFilename){
+		try{
+			BufferedWriter bw = new BufferedWriter(new FileWriter(new File(OutputFilename)));;
+			for( String s: searchTerms){
+				ArrayList<String> output = translateLine(s, charToPoint);
+				StringJoiner outputJoiner = new StringJoiner(",");
+				for(String x: output)
+					outputJoiner.add(x);
+				bw.write(outputJoiner.toString() + "\n");
+			}
+			bw.close();
+		}catch( Exception e) {
+			System.out.println(e);
+		}
+	}
+
+	private ArrayList<String> translateLine(String term, HashMap<Character, Point> ctp){
+		Point pointAt = new Point(0,0);
+		char charAt = 'A';
+		ArrayList<String> output = new ArrayList<String>();
+		for(int i = 0; i < term.length(); i++){
+			char c = Character.toUpperCase(term.charAt(i));
+			if(c == ' '){
+				output.add("S");
+				charAt = c;	
+				continue;
+			}
+			Point newPoint = ctp.get(c);
+			int diffx =(int)(newPoint.getX() - pointAt.getX());
+			int diffy =(int)(newPoint.getY() - pointAt.getY());
+			while( diffy != 0){
+				if( diffy < 0){
+					output.add("U");
+					diffy++;
+				}else{
+					output.add("D");
+					diffy--;	
+				}				
+			}
+			while( diffx != 0){
+				if( diffx < 0){
+					output.add("L");
+					diffx++;
+				}else{
+					output.add("R");
+					diffx--;	
+				}				
+			}
+			output.add("#");
+			pointAt.setLocation(newPoint);
+			charAt = c;	
+		}
+		return output;
 	}
 	
-	private void makeStringToPoint(HashMap<String, Point> stp){
-		stp.put("A", new Point(0,0));
-		stp.put("B", new Point(1,0));
-		stp.put("C", new Point(2,0));
-		stp.put("D", new Point(3,0));
-		stp.put("E", new Point(4,0));
-		stp.put("R", new Point(5,0));
-		stp.put("G", new Point(0,1));
-		stp.put("H", new Point(1,1));
-		stp.put("I", new Point(2,1));
-		stp.put("J", new Point(3,1));
-		stp.put("K", new Point(4,1));
-		stp.put("L", new Point(5,1));
-		stp.put("M", new Point(0,2));
-		stp.put("N", new Point(1,2));
-		stp.put("O", new Point(2,2));
-		stp.put("P", new Point(3,2));
-		stp.put("Q", new Point(4,2));
-		stp.put("R", new Point(5,2));
-		stp.put("S", new Point(0,3));
-		stp.put("T", new Point(1,3));
-		stp.put("U", new Point(2,3));
-		stp.put("V", new Point(3,3));
-		stp.put("W", new Point(4,3));
-		stp.put("X", new Point(5,3));
-		stp.put("Y", new Point(0,4));
-		stp.put("X", new Point(1,4));
-		stp.put("1", new Point(2,4));
-		stp.put("2", new Point(3,4));
-		stp.put("3", new Point(4,4));
-		stp.put("4", new Point(5,4));
-		stp.put("5", new Point(0,5));
-		stp.put("6", new Point(1,5));
-		stp.put("7", new Point(2,5));
-		stp.put("8", new Point(3,5));
-		stp.put("9", new Point(4,5));
-		stp.put("0", new Point(5,5));
+	private void makeCharToPoint(HashMap<Character, Point> ctp){
+		ctp.put('A', new Point(0,0));
+		ctp.put('B', new Point(1,0));
+		ctp.put('C', new Point(2,0));
+		ctp.put('D', new Point(3,0));
+		ctp.put('E', new Point(4,0));
+		ctp.put('R', new Point(5,0));
+		ctp.put('G', new Point(0,1));
+		ctp.put('H', new Point(1,1));
+		ctp.put('I', new Point(2,1));
+		ctp.put('J', new Point(3,1));
+		ctp.put('K', new Point(4,1));
+		ctp.put('L', new Point(5,1));
+		ctp.put('M', new Point(0,2));
+		ctp.put('N', new Point(1,2));
+		ctp.put('O', new Point(2,2));
+		ctp.put('P', new Point(3,2));
+		ctp.put('Q', new Point(4,2));
+		ctp.put('R', new Point(5,2));
+		ctp.put('S', new Point(0,3));
+		ctp.put('T', new Point(1,3));
+		ctp.put('U', new Point(2,3));
+		ctp.put('V', new Point(3,3));
+		ctp.put('W', new Point(4,3));
+		ctp.put('X', new Point(5,3));
+		ctp.put('Y', new Point(0,4));
+		ctp.put('X', new Point(1,4));
+		ctp.put('1', new Point(2,4));
+		ctp.put('2', new Point(3,4));
+		ctp.put('3', new Point(4,4));
+		ctp.put('4', new Point(5,4));
+		ctp.put('5', new Point(0,5));
+		ctp.put('6', new Point(1,5));
+		ctp.put('7', new Point(2,5));
+		ctp.put('8', new Point(3,5));
+		ctp.put('9', new Point(4,5));
+		ctp.put('0', new Point(5,5));
 	}
 }
diff --git a/output b/output
new file mode 100644
index 0000000..e2f1e8e
--- /dev/null
+++ b/output
@@ -0,0 +1,2 @@
+D,R,R,#,D,D,L,#,S,U,U,U,R,#,D,D,R,R,R,#,L,L,L,#,D,R,R,#,U,U,U,L,#
+D,R,R,#,D,D,L,#,S,U,U,U,R,#,D,D,R,R,R,#,L,L,L,#,D,R,R,#,U,U,U,L,#
diff --git a/test b/test
new file mode 100644
index 0000000..e9012f9
--- /dev/null
+++ b/test
@@ -0,0 +1,2 @@
+IT Crowd
+IT Crowd

From 4b5ea74fd3e3d239e0f3f32d9a0396801d48c2ae Mon Sep 17 00:00:00 2001
From: bricktsre <gwoodward21@gmail.com>
Date: Thu, 24 Oct 2019 13:03:11 -0400
Subject: [PATCH 03/11] Added comments

---
 .VoiceDVR.java.swp | Bin 20480 -> 20480 bytes
 VoiceDVR.java      |  44 +++++++++++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/.VoiceDVR.java.swp b/.VoiceDVR.java.swp
index 55ab8aca40083e318f5a51920c4dcb3223fe3408..f72a9227e80f97c4e96684bcdb24d09f72c5686d 100644
GIT binary patch
delta 2262
zcmZvdU1(fI6vrpxM{jLx3sy}(%rsRKn`|3ttEQ2X(9jP|OxvW5sg^RicQ$*?{bFV|
z$y!SK?1M!|#JtoNeN-`Bs0PvcAczp?OBI43_+as+f<7pDDgMvg-EAx`{Pye4oH_HK
z|D1E-a?^#&O?;yJ)X^dS;;wFn*9OKmFE5<gy72?{+BU`}m7IL%%2NviOY56<+Kn4p
zn+o<hymwZQZ>X+sE_jUn31}J~^Y*zPA7Sh&xCl}Zfhq7fxYf+qHDEvlwt;5w>pI4k
z!1v%wa2W`22Al@tU>msgFk@eU&%tT1AN;(Qv5&!9pl2<6i2dzSs(!=wcn^4<cb?h)
zorO)_?%jM$g+}tUY`95zF^r@=*SYxxjKQ=1AmCE?B_1Y0I2{IM5piu)m`w6ws<@xV
zvEYG>!Z=KX3Dd+r+I4X|r>Tb}0xFT{$USi5Yg4uTsO!@?8k7koVm@3pS=k)I(us(r
z=g~V)i!K>TYGzf2jHZp&;!4d$6!A=@$V~>^NEPF+B*>>|Zb~wy2*Sl;4Ev_NV{;?b
z*9*s+Rwd!)dfs5D>q10)CNw3=QP*R;)$^oDDVJ_NTddW{SV<A^qDo^o;RJqZuBA|Z
zDNiv96Uiqke4qP511Z(J8=>HCAJC<?i!gEfp#1D7yQca{hl42;E&B#XQ7k7u9Y7b>
z!IW~wOG1}ok-0FGkH#U^k{BhO>|?wCm|KD^-h)TTshwnWyzZ=L>??2%jDZ%g0-r8}
zMKBL4U>x*-7O(=pE`vod4=P|B^nezy0-r8}MKBL4V0;}r#Cq_h1+2id%U}`Ag9;c2
zJ)i}wAjxI02<E~2fD(Tf*y<16*S&S;@4i^IxA(jI=Nb<4P3Donbxm@oN1o@-XT-pw
zKI92aD5CI9skjakU%E3n0vU%OW9ZI-Yx1U?ma4){7)v*QNKC<r_4r0i;PA@u%>MjF
z!H({5QyiftU+2^P63p+z56ojCU@Tk1SYNGZ6zs;n*0~JA4}z`W21F*&_kueR^d^YG
zCcwa7(C{|+43MVxfveE%5*Pr_gHCV*dVLG7fdz0DybSh%cCZyZ2>$U{JG+f^eg~Jp
zt6&ry1eE4)7<3a{Ut9gD?~OI~`qNu%I{0LQyG7PKnFRu6Wu_!muA^U88a{=L!q5do
z!GXDVi6H1`+tK!HFU_Ng{RU-4De2Q^ssbu3P*<n$Zbbi*mJRLfmBF_gQ%6vSBB9)c
zpGc=^b-G7Unr2+i`Z6=F3e6Vo2FCmrdt_+Kp?vY9MP8v4vsA+i)3S@V#R$}vFPiTl
zNM{mvsgOD!pv5Sod^`5oGn?$}(B^^vhD+om9QOa=a8s#ZQLvNu1Z!^Z>>*W1mU?C|
zr&}=Ll~vntvPN{vD|Pkk*F(txn&}ELG7Q3E5r;v(Mj@DWt5#f*;*mhn%gCRUK_X}J
zANH4a-dbD#n0p$feqPPtVmbrv+dJ(~So6yE!!FTUrlD~Oah(aQMq5MJTp_oto(i*k
zrCF074_c6Nk!{qmXRq7wVI?Mz3q~|fo5x~`dXFx{RQV$1ER)I?TG|ggeA_qNx+8Z{
zG$Sf-jS<SgaJ;*#o7_O1O!Izwc6iK{ekDy=CA?oLQK8EE(uiwr2fT>d05+L-EKR;a
zi<@*uok(A5El>dlPMzT7551}{pww{Bqe7Dx0_+^MfFxhl4KaSQ-u<W}cwVhFlAG$y
l%>`|=ItYg#_jX|#kF#wg0>Px~gehr7BH7_WtGzkg^)EQ&jwS#A

delta 917
zcmaLVO-K}B7{KvoYNf`HcGbeP#IX!_a$2{dFqdi|DL48OB8-$)-BtX+m1P&b$j+rh
zmm*%MphH^-o-CH>(8(6+kWo<-BAvE6M?{|xME?<qF7?81=9!u2o%ea487HSXInC$~
zpNSqf+CpJr1Vo;^%J*jEx}2*Q8A>IFuH0(McRclLO{y}`pjm1s$DrF4aQzjV%S0Z-
zo5o|KIs0Xu$V=pL2Xh$30M^5Yr3#UUn8#gQLpM&N3#ZVCIy@>DnZY1hu>n6>@!87C
zH#kR8h3BQRMsAjhq)Od+W4G?lq>Xga7#to;^o(yYBPwRq=m|3-x;{P7r@onu*x}<+
zCkUzUrnO4Eu%(t;djDi-GBun|1e2NcL?(SSIXs?7sZZvv5^sj?MaFWZ|D6!(i^qdg
z%ZupxAW24rm;GmW)9U^`O<ml6S?z0?bI)46ni>s_sG8Of*({riutTrULGLp$e)&ZT
z$iYDjHVg=gbh>~X9K>M5fS^cs3&_Di3^oi1igdbwT)7+;had(U1_VV4Dj)|3G1%A-
zuh=$h#1D#J!hLrk{6JTo?e>bjD$-u>-fN%nRY_l5WQybt@8#^$Qk8Z?*4xtonD|W1
z3%H64n80~-;TSA@rEc%9nuWqNl8EC34q^|&s6`1rvf^7TqJTVRal2fa<r2XddeDs{
z@Jc*{tyqosW$vOqvQ`y4WB=phpAcn7H@R=Nz0lOV<`H)ySfVMjwOY-Z0Ts8Z)$5bi
EZwN=g4*&oF

diff --git a/VoiceDVR.java b/VoiceDVR.java
index 0f10e72..6b1f18f 100644
--- a/VoiceDVR.java
+++ b/VoiceDVR.java
@@ -6,11 +6,15 @@ public class VoiceDVR {
 	private ArrayList<String> searchTerms = new ArrayList<String>();		
 	private HashMap<Character, Point> charToPoint = new HashMap<Character, Point>();
 
+	// Costructor function, sets up hashmap and reads in searchTerms
 	public VoiceDVR(String filename){
 		getTerms(filename, searchTerms);
 		makeCharToPoint(charToPoint);
 	}
 
+	// Reads searchterms line by line from the provided file and puts them into a List
+	// param filename	name of the file to read from
+	// param terms		List to fill with parsed terms
 	private void getTerms(String filename, ArrayList<String> terms){
 		try {
 			BufferedReader br = new BufferedReader(new FileReader(new File(filename)));
@@ -24,15 +28,17 @@ private void getTerms(String filename, ArrayList<String> terms){
 		}
 	}
 
+	// Translates all provided terms and writes them to a file
+	// param OutputFilename		name of file to write out to
 	public void Translate(String OutputFilename){
 		try{
 			BufferedWriter bw = new BufferedWriter(new FileWriter(new File(OutputFilename)));;
 			for( String s: searchTerms){
-				ArrayList<String> output = translateLine(s, charToPoint);
+				ArrayList<String> output = translateLine(s, charToPoint); 	// Get translation for string s
 				StringJoiner outputJoiner = new StringJoiner(",");
 				for(String x: output)
-					outputJoiner.add(x);
-				bw.write(outputJoiner.toString() + "\n");
+					outputJoiner.add(x);			// Add each individual string for comma delimination
+				bw.write(outputJoiner.toString() + "\n");	// Write out to file
 			}
 			bw.close();
 		}catch( Exception e) {
@@ -40,30 +46,32 @@ public void Translate(String OutputFilename){
 		}
 	}
 
+	// Translate an individual string to the DVR moves needed to make it
+	// param term		string to translate
+	// param ctp 		hashtable to use in translation
+	// return ArrayList<String>	list of strings forming the necessary DVR moves
 	private ArrayList<String> translateLine(String term, HashMap<Character, Point> ctp){
-		Point pointAt = new Point(0,0);
-		char charAt = 'A';
+		Point pointAt = new Point(0,0);		// Always start at 0,0 which is A
 		ArrayList<String> output = new ArrayList<String>();
 		for(int i = 0; i < term.length(); i++){
-			char c = Character.toUpperCase(term.charAt(i));
-			if(c == ' '){
+			char c = Character.toUpperCase(term.charAt(i));		// Grab next character making sure it is uppercase
+			if(c == ' '){						// If it is a space add to output and skip to next loop iteration
 				output.add("S");
-				charAt = c;	
 				continue;
 			}
-			Point newPoint = ctp.get(c);
-			int diffx =(int)(newPoint.getX() - pointAt.getX());
+			Point newPoint = ctp.get(c);				// Point location of char c
+			int diffx =(int)(newPoint.getX() - pointAt.getX());	// Get the difference in x and y from last point to new point
 			int diffy =(int)(newPoint.getY() - pointAt.getY());
-			while( diffy != 0){
+			while( diffy != 0){					// If y is zero then y-coordinate is already correct
 				if( diffy < 0){
-					output.add("U");
+					output.add("U");			// If y is negative, "move" the cursor up and add U to the output
 					diffy++;
 				}else{
-					output.add("D");
+					output.add("D");			// If y is positive, "move" the cursor down and add D to the output
 					diffy--;	
 				}				
 			}
-			while( diffx != 0){
+			while( diffx != 0){					// Similar to above while loop except for x-coordinate
 				if( diffx < 0){
 					output.add("L");
 					diffx++;
@@ -72,13 +80,15 @@ private ArrayList<String> translateLine(String term, HashMap<Character, Point> c
 					diffx--;	
 				}				
 			}
-			output.add("#");
-			pointAt.setLocation(newPoint);
-			charAt = c;	
+			output.add("#");					// At correct coordinates so select the character
+			pointAt.setLocation(newPoint);				// Update where the cursor is at
 		}
 		return output;
 	}
 	
+	// Makes the hashtable used to find the points of every character
+	// Static initializer since the HashMap is the same every time
+	// param ctp	the hashmap to fill		
 	private void makeCharToPoint(HashMap<Character, Point> ctp){
 		ctp.put('A', new Point(0,0));
 		ctp.put('B', new Point(1,0));

From 26e45ee0019d62fdaebce23e91cc8fc1b0238158 Mon Sep 17 00:00:00 2001
From: bricktsre <gwoodward21@gmail.com>
Date: Sun, 27 Oct 2019 16:53:37 -0400
Subject: [PATCH 04/11] Still working on tests

---
 .VoiceDVR.java.swp      | Bin 20480 -> 16384 bytes
 VoiceDVR.java           |   8 ++++----
 VoiceDVRTestRunner.java |  12 ++++++++++++
 VoiceDVRTests.java      |  22 ++++++++++++++++++++++
 test                    |   2 --
 test1                   |   1 +
 test2                   |   2 ++
 7 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 VoiceDVRTestRunner.java
 create mode 100644 VoiceDVRTests.java
 delete mode 100644 test
 create mode 100644 test1
 create mode 100644 test2

diff --git a/.VoiceDVR.java.swp b/.VoiceDVR.java.swp
index f72a9227e80f97c4e96684bcdb24d09f72c5686d..1b160e0ea3fa769d852c04d6e667bb537bd10259 100644
GIT binary patch
delta 634
zcmX}pO-LI-6u|K}NsKi{H-X|ugD`>@QG!YjR;27f#q=X6ZN(f4n@G@rA2g(;rAW4T
z5WMMvcwF%yg+eW3?V%t-u{|ioi}xG~-UNHM_zzYe{B~z|-n^N8>-x%dmCp4{q@L>j
zWRDOrk-z`GzMP0}$lJWgbTL1@y4mq%Xy38|QYIl#%_6d1Jk}f!UO!0t|9j44V%yg0
zj$YHDh9ob4D=rizT`!mS>P0>yg9kW^i0oh;!wBHAPUIY?_>OPbg~1$BXvOgz)?pk8
zT-1uJpbu@Z5W$bINE*#y&i|{1Ldf7TZ2Sqa8IJH1B{+D5LG&VlC<3_TqYdUzz$9Ma
z8Dco0MV~N_G?Hk<xw?DZkB`-!+=lmRw8?WvYpcw=hs(;?sik0KCR=>IFt$*bFPXz9
zd#dJjZniMxeMonk<Me%HE;?J3*VMHYE*9QoOL?>3H4-Ynr=^J~m1+3RAE{U(2k_y-
zfej5orIC5~aN)p)hM>~GJbbutU_(PtVZQ_TQAvo)z<~{oHdGIEFKSe1vEJ(+&}Mhw
GFn9%C&1-T1

delta 2858
zcmbu>ZERCj9LMofx`7=J1LBmj5f3Y@oh@72bwb%Ro0|#(0y1C&jVoO<ilc4n9XJVT
z6Jm(IFo8=9dqZYs!V4d=Q3DQ>vB)cokr$HaVj@K1Lrh4-7wQs4zvrH164HyPH~FNu
z_xHc|Jlx)Un$J7(Lk_toxMTe$xuz~C*cJ-0baM3hszoQo?qx#sW)r=~-dZu*K3-n#
z6gdiJsVcUI%|#0z43+3FV$~g=j_L2t=}-Uk=PQNi!qer)Wy$<iE+KA0waB&P(cHPY
zLX2P+*5a!&A>PL8h~k&&Gg{e~h@cV<d_XpW_wX)OqXGh-+$Y2k_G3NPz=Opo!Jl)4
zxH^Zyon|M4D5|jlzs(lnM_k1voW}^>!3pHC56@vMnh-!WmcfPZONICXpW|a(z&P^g
zMhj%Anp}3SF{Kk2LLS{{frP*{rgQ>B$fFxAkPx`W4Vu6Z^5{kjB!t4|a%GHoU8djg
zr4k3_mUJ>@_!@G7NNqrR!`|Aaq6J}{hwSo@&Ue}6L7jKm<+;W{gX%!1T|q?WJMHoY
zo$s*A!#dw?ljnRPUC?1u;0x+}n_b=*2&(}+YnMlKzO{Is;~waOEyW8AUs&gx?edV$
zpRvn>I^R?@&+#K@420AOHWn=)kLY}ZUEZMcr|t5v&es>qbLv+Z(go{^6{tL@^QY|c
z#z62NZh@6QQRMubehl;l+KUued06Ldc6mtWkK5%zowr(fCYwAEGZOMZI@u#T_s3pL
zSkGcdx@~VP>suFlY44_3rrA0ckm^`0ZX~jgNuJ)?Lp;WZc~G+nqd%LH>3)OfSv|Sx
zpes&st05ni@g|qq=c&G59n>{-v7R1ZwWqqa$^6~(2HfV?D=N+4iVCx1<x=y^O27F)
zP0H*JEa|aYUMs7mU-F``zSSA&ZALbk>h;xH?+KT6bS73U8kxG@gyD<p-0F@io=zFb
zRDVKs@Q&V9d23W-^VIm(s-`&6e9hZn{^X4>Qsa;_gYmX{&CNcKnXIoeM|^G>kawM<
zfGO*%78{wFxw86FUvKsVY8D^do9s)-gV`kg>b0h?@JH<u$NYfRTu0g(ms#N-F74mb
zmy8$2{ZE$UK4m#M!E&P(Ex+|D72;O85Fg<XcEXLR1wu?>41*Xz7ou=uYCbu}Fo*$k
zAqqF9=8<CzgBU>9Jh59u*>Piv^>Gqo7{ma&5QQ64baE177{r@U9X}2eC-E{mu?DNl
z3XYOpF0-;(DwWKXnk;oM)iU8d{P$K^+Weif@Y(XCj$EvV1(OxDMXj_<$*SooxyclK
ziE*6AIh;iX8&QSJOoN)12yQXtE7*?;2>i?_Z{U5XQP08|Ms^DAcw{aswx6BLbbkV8
zF^U(k0gdpY3bXMmoxFh`a0;F1KpWHmzNO|0F5n{99mWyF(FPBkxUO;xmu;bdojBUy
zffLuc*hLKE2;yji2TojP#xCMj)S(Qe_;3#QVBhRq(bf6CF3#4)?&XRzHTAduDY%Db
z&C%r#{m(wnwEZudZn(W`&BgxE++J|Eys+JK#5v2z6uzlB>oEK3-Rj-quwEYO=p|po
F@fQn-jGq7i

diff --git a/VoiceDVR.java b/VoiceDVR.java
index 6b1f18f..77b383c 100644
--- a/VoiceDVR.java
+++ b/VoiceDVR.java
@@ -30,11 +30,11 @@ private void getTerms(String filename, ArrayList<String> terms){
 
 	// Translates all provided terms and writes them to a file
 	// param OutputFilename		name of file to write out to
-	public void Translate(String OutputFilename){
+	private void Translate(String OutputFilename){
 		try{
 			BufferedWriter bw = new BufferedWriter(new FileWriter(new File(OutputFilename)));;
 			for( String s: searchTerms){
-				ArrayList<String> output = translateLine(s, charToPoint); 	// Get translation for string s
+				ArrayList<String> output = translateLine(s); 	// Get translation for string s
 				StringJoiner outputJoiner = new StringJoiner(",");
 				for(String x: output)
 					outputJoiner.add(x);			// Add each individual string for comma delimination
@@ -50,7 +50,7 @@ public void Translate(String OutputFilename){
 	// param term		string to translate
 	// param ctp 		hashtable to use in translation
 	// return ArrayList<String>	list of strings forming the necessary DVR moves
-	private ArrayList<String> translateLine(String term, HashMap<Character, Point> ctp){
+	public ArrayList<String> translateLine(String term){
 		Point pointAt = new Point(0,0);		// Always start at 0,0 which is A
 		ArrayList<String> output = new ArrayList<String>();
 		for(int i = 0; i < term.length(); i++){
@@ -59,7 +59,7 @@ private ArrayList<String> translateLine(String term, HashMap<Character, Point> c
 				output.add("S");
 				continue;
 			}
-			Point newPoint = ctp.get(c);				// Point location of char c
+			Point newPoint = charToPoint.get(c);				// Point location of char c
 			int diffx =(int)(newPoint.getX() - pointAt.getX());	// Get the difference in x and y from last point to new point
 			int diffy =(int)(newPoint.getY() - pointAt.getY());
 			while( diffy != 0){					// If y is zero then y-coordinate is already correct
diff --git a/VoiceDVRTestRunner.java b/VoiceDVRTestRunner.java
new file mode 100644
index 0000000..0a35b46
--- /dev/null
+++ b/VoiceDVRTestRunner.java
@@ -0,0 +1,12 @@
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+
+public class VoiceDVRTestRunner {
+  public static void main(String[] args) {
+    Result result = JUnitCore.runClasses(VoiceDVRTest.class);
+    for (Failure failure : result.getFailures()) {
+      System.out.println(failure.toString());
+    }
+  }
+}
diff --git a/VoiceDVRTests.java b/VoiceDVRTests.java
new file mode 100644
index 0000000..9fde5e3
--- /dev/null
+++ b/VoiceDVRTests.java
@@ -0,0 +1,22 @@
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import java.util.*;
+import java.lang.reflect.*;
+
+public class VoiceDVRTests {
+	
+	@BeforeClass
+	public static void beforeClass() {
+		voicedvr = new VoiceDVR("test1");
+	}
+
+	// Testing is the string is only "a"
+	@Test
+	public void lookForA(){
+		Method method = voicedvr.class.getDeclaredMethod("translate", String.class);
+		method.setAccessible(true);
+		List<String> result = (List<String>) method.invoke(voicedvr, "a");
+		assertEquals(result[0],"#");
+		assertEquals(1, result.size());
+	}
+}
diff --git a/test b/test
deleted file mode 100644
index e9012f9..0000000
--- a/test
+++ /dev/null
@@ -1,2 +0,0 @@
-IT Crowd
-IT Crowd
diff --git a/test1 b/test1
new file mode 100644
index 0000000..1cd1ef2
--- /dev/null
+++ b/test1
@@ -0,0 +1 @@
+IT
diff --git a/test2 b/test2
new file mode 100644
index 0000000..df4fe3c
--- /dev/null
+++ b/test2
@@ -0,0 +1,2 @@
+IT
+IT

From d92e32c08311d370e01b3258952bb1826ee43e46 Mon Sep 17 00:00:00 2001
From: Gregory Woodward <gwoodward21@gmail.com>
Date: Sun, 27 Oct 2019 18:01:08 -0400
Subject: [PATCH 05/11] Delete Driver.class

---
 Driver.class | Bin 353 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Driver.class

diff --git a/Driver.class b/Driver.class
deleted file mode 100644
index f0acfe5965547eba60434aea1736405f49928787..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 353
zcmZvXK}*9x5QX0)Y0{>#t*xmi58h$~3-#bZ@nZ256l@8Ir%hbSmUIhi+W+Onf`UK5
zA0^J}p%?csGjI6bzTL0y_fG&9I1J&V8=x1$!M-j10D}Mr1pi8DRbLa_<Rm9}H>+n!
z=w?dGyY;e=W+sY?H{MbxO&BIm*+Oi@s1kZUn$||?`K2|6)79FP@>W^6Juzw{&6y=5
z1ZWbP`AU^?l0R4-M;IdJ@IQ{w+ueCzEM!>|;^hCJ*31a~Qi)pP7!CfHJr2mmaBZ<V
z;!fNf=@#_L13!<e|GTtE8xhYIJ%`6;VDJIwF?GjVxY=pyjo;wyj2*a)xNP&#=S;#L
HYX_YlZy-K+


From a81400aa6e9dac3d73e8f1f0bea6831ff8b46570 Mon Sep 17 00:00:00 2001
From: Gregory Woodward <gwoodward21@gmail.com>
Date: Sun, 27 Oct 2019 18:01:17 -0400
Subject: [PATCH 06/11] Delete VoiceDVR.class

---
 VoiceDVR.class | Bin 4667 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 VoiceDVR.class

diff --git a/VoiceDVR.class b/VoiceDVR.class
deleted file mode 100644
index 971d154843bff59ea961e299d9b12b890826d206..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4667
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
KIX}+d7yb_}AE2)Q


From 7593d9edc9bd3be9aba06058e169bdb5ffb9b244 Mon Sep 17 00:00:00 2001
From: Gregory Woodward <gwoodward21@gmail.com>
Date: Sun, 27 Oct 2019 18:01:26 -0400
Subject: [PATCH 07/11] Delete output

---
 output | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 output

diff --git a/output b/output
deleted file mode 100644
index e2f1e8e..0000000
--- a/output
+++ /dev/null
@@ -1,2 +0,0 @@
-D,R,R,#,D,D,L,#,S,U,U,U,R,#,D,D,R,R,R,#,L,L,L,#,D,R,R,#,U,U,U,L,#
-D,R,R,#,D,D,L,#,S,U,U,U,R,#,D,D,R,R,R,#,L,L,L,#,D,R,R,#,U,U,U,L,#

From d4acbf4f630a07b1e7c96c672dfc991da685ae7e Mon Sep 17 00:00:00 2001
From: Gregory Woodward <gwoodward21@gmail.com>
Date: Sun, 27 Oct 2019 19:17:13 -0400
Subject: [PATCH 08/11] Add files via upload

---
 VoiceDVR.java           |  5 ++-
 VoiceDVRTestRunner.java |  2 +-
 VoiceDVRTests.java      | 95 ++++++++++++++++++++++++++++++++++++-----
 3 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/VoiceDVR.java b/VoiceDVR.java
index 77b383c..9f29b51 100644
--- a/VoiceDVR.java
+++ b/VoiceDVR.java
@@ -1,4 +1,5 @@
 import java.util.*;
+
 import java.awt.*;
 import java.io.*;
 
@@ -30,7 +31,7 @@ private void getTerms(String filename, ArrayList<String> terms){
 
 	// Translates all provided terms and writes them to a file
 	// param OutputFilename		name of file to write out to
-	private void Translate(String OutputFilename){
+	public void Translate(String OutputFilename){
 		try{
 			BufferedWriter bw = new BufferedWriter(new FileWriter(new File(OutputFilename)));;
 			for( String s: searchTerms){
@@ -50,7 +51,7 @@ private void Translate(String OutputFilename){
 	// param term		string to translate
 	// param ctp 		hashtable to use in translation
 	// return ArrayList<String>	list of strings forming the necessary DVR moves
-	public ArrayList<String> translateLine(String term){
+	private ArrayList<String> translateLine(String term){
 		Point pointAt = new Point(0,0);		// Always start at 0,0 which is A
 		ArrayList<String> output = new ArrayList<String>();
 		for(int i = 0; i < term.length(); i++){
diff --git a/VoiceDVRTestRunner.java b/VoiceDVRTestRunner.java
index 0a35b46..703e16b 100644
--- a/VoiceDVRTestRunner.java
+++ b/VoiceDVRTestRunner.java
@@ -4,7 +4,7 @@
 
 public class VoiceDVRTestRunner {
   public static void main(String[] args) {
-    Result result = JUnitCore.runClasses(VoiceDVRTest.class);
+    Result result = JUnitCore.runClasses(VoiceDVRTests.class);
     for (Failure failure : result.getFailures()) {
       System.out.println(failure.toString());
     }
diff --git a/VoiceDVRTests.java b/VoiceDVRTests.java
index 9fde5e3..5a519de 100644
--- a/VoiceDVRTests.java
+++ b/VoiceDVRTests.java
@@ -1,22 +1,97 @@
-import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.*;
 import java.util.*;
+import java.util.List;
 import java.lang.reflect.*;
+import java.awt.*;
 
 public class VoiceDVRTests {
-	
-	@BeforeClass
+	public static VoiceDVR voicedvr;
+
+	@org.junit.BeforeClass
 	public static void beforeClass() {
 		voicedvr = new VoiceDVR("test1");
 	}
 
-	// Testing is the string is only "a"
-	@Test
-	public void lookForA(){
-		Method method = voicedvr.class.getDeclaredMethod("translate", String.class);
+	// Testing is the string is only "A"
+	@org.junit.Test
+	public void lookForA() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+			IllegalArgumentException, InvocationTargetException {
+		Method method = VoiceDVR.class.getDeclaredMethod("translateLine", String.class);
+		method.setAccessible(true);
+		String input = "A";
+		@SuppressWarnings("unchecked")
+		List<String> result = (List<String>) method.invoke(voicedvr, input);
+		assertEquals(result.get(0), "#");
+		assertEquals(1, result.size());
+	}
+
+	// Testing is the string is only "B"
+	@org.junit.Test
+	public void lookForB() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+			IllegalArgumentException, InvocationTargetException {
+		Method method = VoiceDVR.class.getDeclaredMethod("translateLine", String.class);
+		method.setAccessible(true);
+		String input = "B";
+		@SuppressWarnings("unchecked")
+		List<String> result = (List<String>) method.invoke(voicedvr, input);
+		assertEquals(result.get(0), "R");
+		assertEquals(result.get(1), "#");
+		assertEquals(2, result.size());
+	}
+
+	// Testing is the string is only " "
+	@org.junit.Test
+	public void lookForSpace() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+			IllegalArgumentException, InvocationTargetException {
+		Method method = VoiceDVR.class.getDeclaredMethod("translateLine", String.class);
 		method.setAccessible(true);
-		List<String> result = (List<String>) method.invoke(voicedvr, "a");
-		assertEquals(result[0],"#");
+		String input = " ";
+		@SuppressWarnings("unchecked")
+		List<String> result = (List<String>) method.invoke(voicedvr, input);
+		assertEquals(result.get(0), "S");
 		assertEquals(1, result.size());
 	}
+
+	// Testing is the string is only "AB"
+	@org.junit.Test
+	public void lookForAB() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+			IllegalArgumentException, InvocationTargetException {
+		Method method = VoiceDVR.class.getDeclaredMethod("translateLine", String.class);
+		method.setAccessible(true);
+		String input = "AB";
+		@SuppressWarnings("unchecked")
+		List<String> result = (List<String>) method.invoke(voicedvr, input);
+		assertEquals(result.get(0), "#");
+		assertEquals(result.get(1), "R");
+		assertEquals(result.get(2), "#");
+		assertEquals(3, result.size());
+	}
+
+	// Testing is the string is only "0"
+	@org.junit.Test
+	public void lookForZero() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+			IllegalArgumentException, InvocationTargetException {
+		Method method = VoiceDVR.class.getDeclaredMethod("translateLine", String.class);
+		method.setAccessible(true);
+		String input = "0";
+		@SuppressWarnings("unchecked")
+		List<String> result = (List<String>) method.invoke(voicedvr, input);
+		assertEquals(result.get(0), "D");
+		assertEquals(result.get(9), "R");
+		assertEquals(result.get(10), "#");
+		assertEquals(11, result.size());
+	}
+	
+	// Testing the char to point hash generation
+		@org.junit.Test
+		public void generateCharToPointHash() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+				IllegalArgumentException, InvocationTargetException {
+			Method method = VoiceDVR.class.getDeclaredMethod("makeCharToPoint", HashMap.class);
+			method.setAccessible(true);
+			HashMap<Character, Point> input = new HashMap<Character, Point>();
+			method.invoke(voicedvr, input);
+			assertTrue(input.containsKey('A'));
+			assertFalse(input.containsKey('a'));
+			assertEquals(new Point(0,0), input.get('A'));
+		}
 }

From f9012e6af524fff6b1384c3efb235f563e169846 Mon Sep 17 00:00:00 2001
From: Gregory Woodward <gwoodward21@gmail.com>
Date: Sun, 27 Oct 2019 19:17:26 -0400
Subject: [PATCH 09/11] Delete .VoiceDVR.java.swp

---
 .VoiceDVR.java.swp | Bin 16384 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .VoiceDVR.java.swp

diff --git a/.VoiceDVR.java.swp b/.VoiceDVR.java.swp
deleted file mode 100644
index 1b160e0ea3fa769d852c04d6e667bb537bd10259..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
zcmeHNO>7)j9UsEyl%_3k2oObjaSxfT*X#YTX;RyjT|2Z%?4*rjH%3(Q?Ce|bG_y0K
znYUgqRUl_B+z`iHkq{tC0f|c_q~<_Xap{3ukWjgxN^mdY_kZur+HYqG^nyToEB!Q{
z_j@1z_xpdmnO(Q*yH~c@#ai9L=NZTO`#;`!WA{rxa*nv;9Ax}}n*ZI0`ps=^&pp4k
zc<FI{ze^qGH<Dn`=dsA=Z^YX{#(8{=kJ^c!b>?@IFyI@zH*0VDhyLScvYb`GD)5OE
z7>MrN#nVo!*^sIJ?96%gl`rpnqA6@=tAJI&Dqt0`3RnfK0#*U5fK}lCTLF=ta=wQx
zoYLDUUb{b~?~CiF_5FE$ZBOv})?TavRspMkRlq7>6|f3e1*`&A0jq#jz$#!B_#afj
z?>J5kcD+w8`uP3d*Eat3X~+2^@DO+x_$lxv@KxXp@WE4#^9$eyKmtU-9pDV`;c3VD
z6(E2JI0u{t{`92dyazl4egoVGeBce>TfiQ04*2kk7!Ujm*aI#Be|f@jeh&N)xD1>E
zK6V}FBj5wzx4^G~UjlCfec%f4HQ>E3U>xuoa2EL6=N;$!Kod9zJPkYn{O)s(a~(JX
zJp3%?0rr4vz$)<P&tNU!_rSY=0QP~az%tMP&H_&Yr+|;~rODes9|(clzz(ntJOlgz
zU%LDRh=J=s4R{Lp2)-bH{Fr<){<#0qClF~Z9SHBj<qK67^C5dR31i_cRO^+>lH<B#
ze#78fC4SxDn<f4wgKw1hHG{8fKFz{IUvPGqgdNuR@9_1WpWRB7k+1l9Z_7`Ysm%`r
z&#KD$7a6Rsyydv_^DG6`r+ZiQIO}0V-%puHST~F!*Oh&?g)hQ@g>fiCKMKFYGnR*O
zz!?qEi?A@4x4GZvj34rB#6;NVa{LzTQY_6c{C33IAm<&mOpGh$NlDk7C0#u_D2#Ss
z#9b(zaWTkZmJ9^^LDEyBD~GL#TF%9062Q(R_TVNdKxK(sj7{#O9TI8S<C!u#7-V^p
zk<GrKS=6L8ztiz%o}E$SXyBS)L6T)WplgzK!Wi@9EKgX@BWfkfPgtsra_`c@G_mV;
z!fy9yZf;56o?PiBR+63W@+jx<$GHFOtRf7<HjD0I*JE;8w#@3}N7o(p!iX2G=U1p%
z&W1f~hy5_}GZNcxCx;{h`m!iVQpS%0o(k557Dsc(JER$<x|16jP2b3dk_?Mo>9P^Y
znkG4d<&am|Odo5`D4~?<on#m@A8v=-Y=i6~6_qek<rqzsW2dxe%nuL%(-$42<0W^d
zELli8nkwmtnUWT}L?%e%V>UXWo(!uf<9=sUL=SBX;Vr#3Vk;j0u8hO9cEH7+S7CE1
z2N2AvK?O%K>}cAs+mpl4farxIUgjz|DNYdel&xXRj-&`9*3FVWi~L-uB}ovfZ8Dk2
zR+&E3r2bfuF|NxBS?2}g+)_OvoqLqOln*R8j-eolMHmmb3h9#xu&pB+>IZCPg<W75
zbllPwpmHdrm@H3yY=GhgmZ}-#PVzgUELJf;5-OrYlsQ=iXnkb~TVd-(F{z1UCrx>_
z?&sV?*M5!qtO+k9-K21t-^R`{A2G6QQeh3_1C|d^K9orVnk2v^SO(cc4rL)0sxRTP
z%;d}wj}Ju8tDtFiR;KA%mieR2Fc-_)BEyU?7JFHd@|S3g#r#U)l<Fhuk?JbjJURuG
z)oanvAE7V_KNF~F3=HLY&?EiU95)@bBb4yc3QS~voJXi?n_<j7WtKEwpAWj~mIk^J
zwn5&`<xX;{A$<~wayjM!&vPGV0RH)qQ31%!!-l!;@lgPm;xwS}EQ~=BKhdAWbX~QM
zOx?m{+2>Yqhk(Ewo$xU14E#vjRiygZ4%o&!>gb{467F==@gnQp_9z#;Uqgh|aI(fC
ziajoUa2H2Q(DT@3SukNA;}s?=Z+ln^q6E>T(p8mBG!8R_qNif@DtyN?#GcX@NjuAC
zz8zBmL!7@(Jt-2%SRA_)Q}`G|>0~;RIfnsj$OG<^Z%f;yN**NrzRx;5LgB}GCB?*i
z6sFq0M=$8WtH`BPt1?m(`bGuYN#2{O>ZEl`F>xHtg(Fo|<w${XP15cn3CY-8h7Uu0
zC<~c3F@FI^te*wFTkw9a4!M^GvX*tEU>R!<buyUkR9D$IA*1RxzV&X%CkJ9;Jfu{R
z@RVI58^MppbJRGb3cV&qqCdQ#o}5g|b!lo!3-TlRQ-*<dt{Ja*_J|^uW(fk80+RMA
zi<%rFpO^YHgRf%Z@liT+9GFRfryER22T+laWQ~kBY*>f#@qlq8XHz0snk65MBE+zY
zarFS<dDH?Iw6hwmB@0NULPuphh$5XH+MU#u)OHJB-NXnyN4B#GAFB4T(<W{`+DPF&
z<vhwl!+SWMWXu%KD~433Rlg#*#{QK1bzLgbIvpc63`LLJEgxBF#0mcwvyUB5^^Y29
zG|3{*S~-CBf)XvGT6tRv*d8%?m1i=I9*2aSh8~pgz^mf{HHjjE%+qyi@}ZwjEqzi;
zZ;j<BEUg-e1*hn<q4;O<N!|28u$~}Q2Z2D&b_a1lWrb#fVR*DE-W$kR+H_9U{6zl3
z*1|{nePP;5$+6`+DE?(%S!|0L%XR3)%6g_!AIyL!biMTek3u;s1VBVNVLwf9lG6Xp
z*TSUs+>+7a55;8DK!g#s(fj{fc)vc2_ilRsKd;|6AK@MU0dOC<2kZl@00SK05#IA3
z0QZ4=z&@}FFu(yG;eG!Ba38n_>;tO+103KH)_VZZcL4W*eP9(}0DT8Q_Iw?%AFF^>
zz$#!BunJfOtO8a6tAJJDzoG!X8lrE9#=jWVjbC&YtBVuAC|xr6g%W?!;9DjBd4q43
z_-`0|qr@*7e7(dk82n;&VZ#2F!7r5frop#Le8b?ICH}U-H%k1T!PiT?IexL)ny~+M
zWBfvi-!=GFiQh5!W{JOL@Qo6`ZSeIHf79R>tIY}fUo-fH691~fw@UmCgKw7j>jvK_
x@mmI8FY%iOzgTTd*niF77fSq9gKw4iD+b>z@vj(sqr|^#@bwZuslWV1_@9sq_lW=i


From dc44d42e3f30d78ceb9a31934315e82ad8f63c56 Mon Sep 17 00:00:00 2001
From: Gregory Woodward <gwoodward21@gmail.com>
Date: Sun, 27 Oct 2019 19:17:38 -0400
Subject: [PATCH 10/11] Delete test2

---
 test2 | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 test2

diff --git a/test2 b/test2
deleted file mode 100644
index df4fe3c..0000000
--- a/test2
+++ /dev/null
@@ -1,2 +0,0 @@
-IT
-IT

From 170395956c369cafcd878fdd7f838c4917b1f58a Mon Sep 17 00:00:00 2001
From: Gregory Woodward <gwoodward21@gmail.com>
Date: Sun, 27 Oct 2019 19:23:34 -0400
Subject: [PATCH 11/11] Create AboutMe

---
 AboutMe | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 AboutMe

diff --git a/AboutMe b/AboutMe
new file mode 100644
index 0000000..a985c19
--- /dev/null
+++ b/AboutMe
@@ -0,0 +1,9 @@
+Written by Gregory Woodward
+
+My solution to this project is written in java. First compile Driver.java and VoiceDVR.java with javac. VoiceDVR is a class that actually translates strings into DVR moves, while Driver calls this class with command line arguments. 
+
+To run: java Driver <input file name> <output file name>
+
+All input strings in the input file are written out on the same line in the output file
+
+I wrote unit tests for VoiceDVR.java using junit4, those tests can be found in VoiceDVRTests. To run the tests use VoiceDVRTestRunner. I am not an expert with junit so I think you can just compile VoiceDVRTests and VoiceDVRTestRunner with the right dependencies installed and you should be good.