From 118a8040362b89ddbab0140fa045a956aaf778a7 Mon Sep 17 00:00:00 2001 From: GLuft3 Date: Wed, 18 Mar 2015 22:42:37 -0400 Subject: [PATCH 1/2] Added general comments as directed. --- cachematrix.R | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cachematrix.R b/cachematrix.R index a50be65aa44..adc0a486978 100644 --- a/cachematrix.R +++ b/cachematrix.R @@ -1,14 +1,18 @@ -## Put comments here that give an overall description of what your -## functions do +## This assignment is to write a pair of functions that +## cache the inverse of a matrix. -## Write a short comment describing this function +## This function creates a special "matrix" object +## that can cache its inverse. makeCacheMatrix <- function(x = matrix()) { } -## Write a short comment describing this function +## This function computes the inverse of the special +## "matrix" returned by `makeCacheMatrix` above. If the inverse has +## already been calculated (and the matrix has not changed), then +## `cacheSolve` should retrieve the inverse from the cache. cacheSolve <- function(x, ...) { ## Return a matrix that is the inverse of 'x' From df0257abb6bd14051bd5a7d88d6b755e1d313014 Mon Sep 17 00:00:00 2001 From: GLuft3 Date: Wed, 18 Mar 2015 22:54:30 -0400 Subject: [PATCH 2/2] Added in both functions. Tested them and they work! --- cachematrix.R | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/cachematrix.R b/cachematrix.R index adc0a486978..f91288725c8 100644 --- a/cachematrix.R +++ b/cachematrix.R @@ -5,7 +5,17 @@ ## that can cache its inverse. makeCacheMatrix <- function(x = matrix()) { - + m <- NULL + set <- function(y) { + x <<- y + m <<- NULL + } + get <- function() x + setsolve <- function(solve) m <<- solve + getsolve <- function() m + list(set = set, get = get, + setsolve = setsolve, + getsolve = getsolve) } @@ -16,4 +26,13 @@ makeCacheMatrix <- function(x = matrix()) { cacheSolve <- function(x, ...) { ## Return a matrix that is the inverse of 'x' + m <- x$getsolve() + if(!is.null(m)) { + message("getting cached data") + return(m) + } + data <- x$get() + m <- solve(data, ...) + x$setsolve(m) + m }