From 7dc6b2538d22af679155acbe73cbd1366d7483af Mon Sep 17 00:00:00 2001
From: John Douma <john.douma@verizon.net>
Date: Sun, 7 Jun 2015 23:08:27 -0400
Subject: [PATCH 1/3] Assignment 2 submission

---
 .cachematrix.R.swp | Bin 0 -> 12288 bytes
 cachematrix.R      |  53 ++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 .cachematrix.R.swp

diff --git a/.cachematrix.R.swp b/.cachematrix.R.swp
new file mode 100644
index 0000000000000000000000000000000000000000..4ab6507231a43d137a9c49e22921a1575ca0f063
GIT binary patch
literal 12288
zcmeI2zi%8x6vrnB0_KN75E_us3y$!e<lBoKBqYm7L~bC;56i?LQDtv$?rvdk<}$PE
zTMN-+M8O{cNEB35ln4cc2pug26%x=RD)_#c-Sgfh*u9yRzPCHOGjHB}-g{Hn)4TZA
z8`tQSXhYz7N{9!~7JK}7_gNvX=#k>*lddZ_UccVi**>Y8*xu~!S!ryS4R?2p9-4SO
zPStR?*|=<NI#gq+@{Mj1CnGtIbCZ_Q?uqt8hd>|@IF7)wxU{i;aplGH^vu()%#Z6F
zz6An-Kp+qZ1OkCTAP@)y0)fCOBalzdh<~uA2cS*pOeNgH6$k_Zfj}S-2m}IwKp+qZ
z1OkCTAP@)y0;hyP+!x}`!$N%X2o{9@|MTAfetuGj&!NwtThI&8AIn1g4t)Vlpmk^!
zdI|dT2_e3OhR_!D_v1o*4IM%sLOakB^vh#H`~=;FzJfl5K7l@h4x!u71loe0hn|Ce
zcvOh*q3@tO&>?gKItQJF9)f;b!u-(3&^yp;&?<BeT85UOzp%bvp&y}dA-CRB62q{J
zKp+qZ1OkCT;D1Np13|b_weRlb1uJtjaLQ1&aBtUNX{$q4XZx~+<AnY#9_UpnFAQbg
z@^4&cZxA+(%nPF$RtD5MpV~+jS?1oh>HVg8XQ`gs8(dkTU1x=2^2Zn{A7R?m;x5^1
zc9ishR?Ai4PCLHIPO`UyLM3^sRjXX1D2jM8nDb8A&BgI-uA0Gjk$vhN%vOhyshSiy
z29`W~Oxt|4@|rtZDcG=v1v5>pjJTB!D9vdUqi1Gh+&`e6l!}r#ONuPcVLVoSnx<KH
z^bR9<=*<!A*UtMc1=h$8+FTn9-H)@vExN&gM|xEEpqZhohNo)Y{RlblgO;T>Zy^B?
zR{X9JB8x}-u5r7j?LJlw*XQU1x>k+0aG^bVF&C2dEa4h<n=z}ca6j6@m+HmL>Vmn_
zf0*T7J?#44)vL}C<YVa!9k?bhvN_)Yr-%FEMs~;z9LMj;Mx5tHlpy01rqy1|t(v2w
z(`47g)h1*|U)sc^J<f-o-mh|JKGBREB4rHi(&XsGFJ-YB7V)r7T9<-Y<2@Irpwjtb
z`ne<}dO70gR%}~s>Tq*Dfu^H08DXWI!NjHObDQ&x=u*^346bP|M>Ye#^JeC9)^qbF
zHk=D??y5FjswagpIKo^Z_FdQAY%Rp9LpefYkrhZ~C8u@ia#0!SCQso&<q+lCdCpdD
zqKuj$MXjadNhbNcG)I9;o5RO@%0L%pR*80#hc9MCg5u8M$lQKF1Ea@yRqZDw3JgP0
z`<eBd16&)V29v-+oy5FLx&5H7^Mv=7S)D7gMbFCH1zco9@T|5S!794?J#S$*X>1Op
z6%Tw{(j>MOwI&4cY1rYG9%Hlfn@$DMt)W0rHRni|3y5c^)(CD>iQK@w0sg+kw6eJ=
z5-|8L(lCrY9=P<ha@%7*mNGVLCXCbYi$U`E;kVoWX6)G4`}iCY&v|(<Nn%C1_pVHM
K)wOd}Sn)3=h@K??

literal 0
HcmV?d00001

diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..9a2d36288da 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -1,15 +1,58 @@
-## Put comments here that give an overall description of what your
-## functions do
+## A CacheMatrix is an object that allow us
+## to store a matrix as well as its inverse. 
 
-## Write a short comment describing this function
+## We create a CacheMatrix from a matrix by calling makeCacheMatrix.
+## makeCacheMatrix constructs a list of four functions that allow
+## us to get/set the matrix as well as its inverse
 
+## We pass in a CacheMatrix to cacheSolve to compute the inverse
+## of a matrix. cacheSolve will calculate the inverse on
+## its first invocation and use the cached value on subsequent
+## calls.
+
+## makeCacheMatrix creates a CacheMatrix from a matrix x.
+## The CacheMatrix is implemented as a list of four functions:
+##   1. set(y) - takes in a new matrix and resets its inverse to null
+##   2. get() - returns the current matrix
+##   3. setinverse(inverse) - sets the inverse value of the matrix
+##   4. getinverse() - gets the inverse which may be null if it
+##                     has not been calculated.
+
+## inputs: x is a regular R programming language matrix
+## returns: list(set, get, setinverse, getinverse) as described above.
 makeCacheMatrix <- function(x = matrix()) {
+    inv <- NULL
+
+    set <- function(y) {
+       x <<- y
+       inv <<- NULL
+    }
+
+    get <- function() x
+
+    setinverse <- function(inverse) inv <<- inverse
+    getinverse <- function() inv
 
+    list(set = set, get = get, setinverse = setinverse, getinverse = getinverse)
 }
 
 
-## Write a short comment describing this function
+## Returns the inverse of a matrix stored in a CacheMatrix.
+## This function will use the stored value of the inverse
+## if it has already been calculated and will calculate it
+## otherwise.
 
+## inputs: x is a CacheMatrix
+## returns: the inverse of the matrix returned by x$get()
 cacheSolve <- function(x, ...) {
-        ## Return a matrix that is the inverse of 'x'
+    ## Return a matrix that is the inverse of 'x'
+    inv <- x$getinverse()
+    if (!is.null(inv)) {
+       return(inv)
+    }
+    
+    mat = x$get()
+    inv <- solve(mat)
+    x$setinverse(inv)
+    inv
 }

From 816da26173d68bb684a499f4056fa9e06205c936 Mon Sep 17 00:00:00 2001
From: John Douma <jdouma@amazon.com>
Date: Mon, 8 Jun 2015 14:01:27 -0400
Subject: [PATCH 2/3] Removed swap file

---
 .cachematrix.R.swp | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .cachematrix.R.swp

diff --git a/.cachematrix.R.swp b/.cachematrix.R.swp
deleted file mode 100644
index 4ab6507231a43d137a9c49e22921a1575ca0f063..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2zi%8x6vrnB0_KN75E_us3y$!e<lBoKBqYm7L~bC;56i?LQDtv$?rvdk<}$PE
zTMN-+M8O{cNEB35ln4cc2pug26%x=RD)_#c-Sgfh*u9yRzPCHOGjHB}-g{Hn)4TZA
z8`tQSXhYz7N{9!~7JK}7_gNvX=#k>*lddZ_UccVi**>Y8*xu~!S!ryS4R?2p9-4SO
zPStR?*|=<NI#gq+@{Mj1CnGtIbCZ_Q?uqt8hd>|@IF7)wxU{i;aplGH^vu()%#Z6F
zz6An-Kp+qZ1OkCTAP@)y0)fCOBalzdh<~uA2cS*pOeNgH6$k_Zfj}S-2m}IwKp+qZ
z1OkCTAP@)y0;hyP+!x}`!$N%X2o{9@|MTAfetuGj&!NwtThI&8AIn1g4t)Vlpmk^!
zdI|dT2_e3OhR_!D_v1o*4IM%sLOakB^vh#H`~=;FzJfl5K7l@h4x!u71loe0hn|Ce
zcvOh*q3@tO&>?gKItQJF9)f;b!u-(3&^yp;&?<BeT85UOzp%bvp&y}dA-CRB62q{J
zKp+qZ1OkCT;D1Np13|b_weRlb1uJtjaLQ1&aBtUNX{$q4XZx~+<AnY#9_UpnFAQbg
z@^4&cZxA+(%nPF$RtD5MpV~+jS?1oh>HVg8XQ`gs8(dkTU1x=2^2Zn{A7R?m;x5^1
zc9ishR?Ai4PCLHIPO`UyLM3^sRjXX1D2jM8nDb8A&BgI-uA0Gjk$vhN%vOhyshSiy
z29`W~Oxt|4@|rtZDcG=v1v5>pjJTB!D9vdUqi1Gh+&`e6l!}r#ONuPcVLVoSnx<KH
z^bR9<=*<!A*UtMc1=h$8+FTn9-H)@vExN&gM|xEEpqZhohNo)Y{RlblgO;T>Zy^B?
zR{X9JB8x}-u5r7j?LJlw*XQU1x>k+0aG^bVF&C2dEa4h<n=z}ca6j6@m+HmL>Vmn_
zf0*T7J?#44)vL}C<YVa!9k?bhvN_)Yr-%FEMs~;z9LMj;Mx5tHlpy01rqy1|t(v2w
z(`47g)h1*|U)sc^J<f-o-mh|JKGBREB4rHi(&XsGFJ-YB7V)r7T9<-Y<2@Irpwjtb
z`ne<}dO70gR%}~s>Tq*Dfu^H08DXWI!NjHObDQ&x=u*^346bP|M>Ye#^JeC9)^qbF
zHk=D??y5FjswagpIKo^Z_FdQAY%Rp9LpefYkrhZ~C8u@ia#0!SCQso&<q+lCdCpdD
zqKuj$MXjadNhbNcG)I9;o5RO@%0L%pR*80#hc9MCg5u8M$lQKF1Ea@yRqZDw3JgP0
z`<eBd16&)V29v-+oy5FLx&5H7^Mv=7S)D7gMbFCH1zco9@T|5S!794?J#S$*X>1Op
z6%Tw{(j>MOwI&4cY1rYG9%Hlfn@$DMt)W0rHRni|3y5c^)(CD>iQK@w0sg+kw6eJ=
z5-|8L(lCrY9=P<ha@%7*mNGVLCXCbYi$U`E;kVoWX6)G4`}iCY&v|(<Nn%C1_pVHM
K)wOd}Sn)3=h@K??


From 5f7e24042112a7052d016053780e8224ffbebd95 Mon Sep 17 00:00:00 2001
From: John Douma <jdouma@amazon.com>
Date: Mon, 8 Jun 2015 14:03:32 -0400
Subject: [PATCH 3/3] Modified cacheSolve to pass in the additional args
 specified by the ellipsis

---
 cachematrix.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cachematrix.R b/cachematrix.R
index 9a2d36288da..8d6069f750c 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -52,7 +52,7 @@ cacheSolve <- function(x, ...) {
     }
     
     mat = x$get()
-    inv <- solve(mat)
+    inv <- solve(mat, ...)
     x$setinverse(inv)
     inv
 }