From 9ff21560f55f171bc87eb9fdb8c532b9707d422b Mon Sep 17 00:00:00 2001 From: oelj Date: Thu, 24 Apr 2014 15:18:37 -0400 Subject: [PATCH 1/2] commiting code v1 --- cachematrix.R | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/cachematrix.R b/cachematrix.R index a50be65aa44..371721514dd 100644 --- a/cachematrix.R +++ b/cachematrix.R @@ -4,7 +4,17 @@ ## Write a short comment describing this function makeCacheMatrix <- function(x = matrix()) { - + i <- NULL + set <- function(y) { + x <<- y + i <<- NULL + } + get <- function() x + setinverse <- function(inverse) i <<- inverse + getinverse <- function() i + list(set = set, get = get, + setinverse = setinverse, + getinverse = getinverse) } @@ -12,4 +22,13 @@ makeCacheMatrix <- function(x = matrix()) { cacheSolve <- function(x, ...) { ## Return a matrix that is the inverse of 'x' + i <- x$getinverse() + if(!is.null(i)) { + message("getting cached data") + return(i) + } + data <- x$get() + i <- solve(data, ...) + x$setinverse(i) + i } From 2d4351bb8eae48f36435a7bca0deb4ca5eadc455 Mon Sep 17 00:00:00 2001 From: oelj Date: Thu, 24 Apr 2014 15:31:08 -0400 Subject: [PATCH 2/2] commiting code v2 with comments --- cachematrix.R | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cachematrix.R b/cachematrix.R index 371721514dd..de642b6ad43 100644 --- a/cachematrix.R +++ b/cachematrix.R @@ -1,7 +1,9 @@ -## Put comments here that give an overall description of what your -## functions do +## This R program contains two functions that compute and store the inverse matrix +## of an orginal input matrix. -## Write a short comment describing this function +## The first function (makeCacheMatrix) accepts a matrix as an input and returns +## an object with additional functionality to be called from outside of the +## function's environment. makeCacheMatrix <- function(x = matrix()) { i <- NULL @@ -18,7 +20,10 @@ makeCacheMatrix <- function(x = matrix()) { } -## Write a short comment describing this function +## This function (cacheSolve) takes the output +## from the first function and either computes the inverse matrix of the original +## or it looks up the already-computed inverse matrix from memory; either of which +## it returns. cacheSolve <- function(x, ...) { ## Return a matrix that is the inverse of 'x'