Tested successfully

sshikari · sshikari · commit 55c071d88e5d · 2016-06-12T22:21:48.000-04:00
diff --git a/cachematrix.R b/cachematrix.R
@@ -1,15 +1,43 @@
-## Put comments here that give an overall description of what your
-## functions do
+## The following functions are used in tandom to create a matrix along with calculating and
+## caching its inverse (a time consuming operation).
+##
+## Example usage
+## a<-makeCacheMatrix()
+## a$set(matrix(1:4,2,2))
+## cacheSolve(a)
 
-## Write a short comment describing this function
+## makeCacheMatrix takes a matrix as an argument, calls cacheSolve() to calculate and 
+## store the inverse of the matrix in cache.  The method also contains functions to get the matrix and
+## to get and set the inverse of the matrix.
 
 makeCacheMatrix <- function(x = matrix()) {
-
+    inverseMatrix <- NULL
+    set <- function(y) {
+        x <<- y
+        inverseMatrix <<- NULL
+    }
+    get <- function() x
+    setInverseMatrix <- function(solve) inverseMatrix <<- solve
+    getInverseMatrix <- function() inverseMatrix
+    list(set = set, get = get,
+         setInverseMatrix = setInverseMatrix,
+         getInverseMatrix = getInverseMatrix)
 }
 
 
-## Write a short comment describing this function
+## cacheSolve takes in a matrix as an argument and returns the cached inverse if it exists,
+## otherwise it calculates the inverse, stores it in cache and then returns it.
 
-cacheSolve <- function(x, ...) {
+cacheSolve <- function(x =, ...) {
         ## Return a matrix that is the inverse of 'x'
+    
+    inverseMatrix <- x$getInverseMatrix()
+    if(!is.null(inverseMatrix)) {
+        message("getting cached data")
+        return(inverseMatrix)
+    }
+    data <- x$get()
+    inverseMatrix <- solve(data, ...)
+    x$setInverseMatrix(inverseMatrix)
+    inverseMatrix
 }
