Make use of any function with variable parameter list

Odomontois · Odomontois · commit b165aaac0e09 · 2014-09-22T00:09:45.000+04:00
diff --git a/cachematrix.R b/cachematrix.R
@@ -1,38 +1,47 @@
-## Creating a special object for calculating properties of matrix
-## e.g. inverse with caching options
-
-## Class for creating matrices with 
-## ability to cache results of operations
-
-CachedOpsMatrix <- setRefClass("CachedOpsMatrix",
-	fields = list(value = "matrix" ),
+## Creating a special object for caching calculations
+# example:
+# m <- matrix(1:4,c(2,2))
+# mci <- makeCacheMatrix(m, func = function(m){message("calculating");solve(m)})
+# cacheSolve(mci)
+# cacheSolve(mci) # should not print message again, should insted inform about cache use 
+# mcs <- makeCacheMatrix(m, c(1,1))
+# cacheSolve(mcs)
+
+# Class for creating matrices with 
+# ability to cache results of operations
+CachedOps <- setRefClass("CachedOps",
+	fields = list(func = "function", cache = "ANY"),
 
 	methods = list(
-		initialize = function(...){
-			my.inverse <<- NULL
-			callSuper(...)
+		initialize = function(...,func){
+			cache <<- NULL
+      func <<- function(){
+        func(...)
+      }
+			callSuper()
 		},
 
-		getInverse = function(){
-			"Calculating inverse of matrix. Once it was calculated result is cached and returned in any consecutive call"
-			if(is.null(my.inverse)) 
-				my.inverse <<- solve(value)
+		getResult = function(){
+			"Calculating result of operation on matrix. 
+Once it was calculated result is cached and returned in any consecutive call"
+			if(is.null(cache)) 
+				cache <<- func()
 			else message("getting cached data")
-			my.inverse
+			cache
 		})
 	)
 
-## Creating new caching object
-
-makeCacheMatrix <- function(x = matrix()) {
-	CachedOpsMatrix$new(value = x)
+makeCacheMatrix <- function(..., func = solve) {
+  # Creating new caching object
+  # Args:
+  #   func - function, result of calculation is need to cache
+  #   ... - parameters for function calling
+	CachedOps$new(..., func = func)
 }
 
-
-## Calculating inverse of matrix
-## once it was calculated result is cached
-## and returned in any consecutive call
-
 cacheSolve <- function(x, ...) {
-	x$getInverse()
+  # Calculating result of function on matrix
+  # once it was calculated result is cached
+  # and returned in any consecutive call
+	x$getResult()
 }
