initial import

simoneb · simoneb · commit 9afdd026e755 · 2015-02-20T23:03:46.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.Rproj.user
+.Rhistory
+.RData
diff --git a/ProgrammingAssignment2.Rproj b/ProgrammingAssignment2.Rproj
@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
diff --git a/cachematrix.R b/cachematrix.R
@@ -1,15 +1,35 @@
-## Put comments here that give an overall description of what your
-## functions do
-
-## Write a short comment describing this function
-
 makeCacheMatrix <- function(x = matrix()) {
-
+  inverse <- NULL
+  
+  get <- function() x
+  
+  set <- function(y) {
+    x <<- y
+    inverse <<- NULL
+  }
+  
+  getInverse <- function() inverse
+  
+  setInverse <- function(inv) inverse <<- inv
+    
+  list(get = get, 
+       set = set, 
+       getInverse = getInverse, 
+       setInverse = setInverse)  
 }
 
-
-## Write a short comment describing this function
-
 cacheSolve <- function(x, ...) {
-        ## Return a matrix that is the inverse of 'x'
-}
+  inverse <- x$getInverse()
+  
+  if(!is.null(inverse)) {
+    message("reading from cache")
+    return (inverse)
+  }
+  
+  message("computing inverse")
+  
+  inverse <- solve(x$get())
+  x$setInverse(inverse)
+  
+  inverse
+}
