first commit

Author: michalstepniewski

Diff for: cachematrix.R

@@ -1,15 +1,39 @@
 ## Put comments here that give an overall description of what your
 ## functions do
-
+# 1. getmatrix - gets the matrix
+# 2. setmatrix - sets the matrix
+# 3. setinverse - sets the inverse
+# 4. getinverse - gets the inverse
 ## Write a short comment describing this function
+## makeCacheMatrix - returns a list of functions 1,2,3,4
+
 
 makeCacheMatrix <- function(x = matrix()) {
 
+  inv = NULL
+  setmatrix = function(y) {
+    x <<- y
+    inv <<- NULL
+  }
+  getmatrix = function() x
+  setinverse = function(inverse) inv <<- inverse 
+  getinverse = function() inv
+  list(setmatrix=setmatrix, getmatrix=getmatrix, setinverse=setinverse, getinverse=getinverse)
 }
 
-
-## Write a short comment describing this function
-
 cacheSolve <- function(x, ...) {
-        ## Return a matrix that is the inverse of 'x'
+  
+  inv = x$getinverse()
+  
+  if (!is.null(inv)){
+    message("getting cached data")
+    return(inv)
+  }
+  
+  mat.data = x$get()
+  inv = solve(mat.data, ...)
+  
+  x$setinverse(inv)
+  
+  return(inv)
 }

Diff for: cachematrix.R~

@@ -0,0 +1,37 @@
+## Put comments here that give an overall description of what your
+## functions do
+# 1. getmatrix - gets the matrix
+# 2. setmatrix - sets the matrix
+# 3. setinverse - sets the inverse
+# 4. getinverse - gets the inverse
+## Write a short comment describing this function
+
+makeCacheMatrix <- function(x = matrix()) {
+
+  inv = NULL
+  setmatrix = function(y) {
+    x <<- y
+    inv <<- NULL
+  }
+  getmatrix = function() x
+  setinverse = function(inverse) inv <<- inverse 
+  getinverse = function() inv
+  list(setmatrix=setmatrix, getmatrix=getmatrix, setinverse=setinverse, getinverse=getinverse)
+}
+
+cacheSolve <- function(x, ...) {
+  
+  inv = x$getinverse()
+  
+  if (!is.null(inv)){
+    message("getting cached data")
+    return(inv)
+  }
+  
+  mat.data = x$get()
+  inv = solve(mat.data, ...)
+  
+  x$setinverse(inv)
+  
+  return(inv)
+}