minor refactor

RaneClowd · RaneClowd · commit ceee71bbc836 · 2015-02-21T18:33:44.000-06:00
diff --git a/cachematrix.R b/cachematrix.R
@@ -27,23 +27,21 @@ makeCacheMatrix <- function(dataMatrix = matrix()) {
 ##  within a wrapper list created by the makeCacheMatrix function.
 
 cacheSolve <- function(matrixWrapper, ...) {
-  
   #Retrieve the inverse stored in the wrapper object
   inverse = matrixWrapper$getInverse()
   
   if (!is.null(inverse)) {
     #Return the pre-calculated inverse
     message("getting cached data")
-    return(inverse)
+  } else {
+    # No inverse was found, so calculate it
+    message("calculating data")
+    dataMatrix = matrixWrapper$get()
+    inverse = solve(dataMatrix)
+    
+    # Store the caluclated inverse for future use
+    matrixWrapper$setInverse(inverse)
   }
   
-  # No inverse was found, so calculate it
-  message("calculating data")
-  dataMatrix = matrixWrapper$get()
-  inverse = solve(dataMatrix)
-  
-  # Store the caluclated inverse for future use
-  matrixWrapper$setInverse(inverse)
-  
   inverse
 }
