SCM

SCM Repository

[matrix] Diff of /pkg/R/Matrix.R
ViewVC logotype

Diff of /pkg/R/Matrix.R

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1673, Mon Nov 6 20:54:26 2006 UTC revision 2056, Thu Aug 16 16:42:10 2007 UTC
# Line 3  Line 3 
3    
4  ### Virtual coercions -- via smart "helpers" (-> ./Auxiliaries.R)  ### Virtual coercions -- via smart "helpers" (-> ./Auxiliaries.R)
5    
6  setAs("Matrix", "sparseMatrix", function(from) as_Csparse(from))  setAs("Matrix", "sparseMatrix", function(from) as(from, "CsparseMatrix"))
7    setAs("Matrix", "CsparseMatrix", function(from) as_Csparse(from))
8  setAs("Matrix", "denseMatrix",  function(from) as_dense(from))  setAs("Matrix", "denseMatrix",  function(from) as_dense(from))
9    
10    ## Maybe TODO:
11    ## setAs("Matrix", "nMatrix", function(from) ....)
12    
13  ## Most of these work; this is a last resort:  ## Most of these work; this is a last resort:
14  setAs(from = "Matrix", to = "matrix", # do *not* call base::as.matrix() here:  setAs(from = "Matrix", to = "matrix", # do *not* call base::as.matrix() here:
15        function(from) .bail.out.2("coerce", class(from), class(to)))        function(from) .bail.out.2("coerce", class(from), class(to)))
# Line 27  Line 31 
31  setMethod("head", signature(x = "Matrix"), utils::head.matrix)  setMethod("head", signature(x = "Matrix"), utils::head.matrix)
32  setMethod("tail", signature(x = "Matrix"), utils::tail.matrix)  setMethod("tail", signature(x = "Matrix"), utils::tail.matrix)
33    
34    setMethod("drop", signature(x = "Matrix"),
35              function(x) if(all(dim(x) != 1)) x else drop(as(x, "matrix")))
36    
37  ## slow "fall back" method {subclasses should have faster ones}:  ## slow "fall back" method {subclasses should have faster ones}:
38  setMethod("as.vector", signature(x = "Matrix", mode = "missing"),  setMethod("as.vector", signature(x = "Matrix", mode = "missing"),
39            function(x) as.vector(as(x, "matrix")))            function(x) as.vector(as(x, "matrix")))
# Line 56  Line 63 
63    
64  setMethod("dim", signature(x = "Matrix"),  setMethod("dim", signature(x = "Matrix"),
65            function(x) x@Dim, valueClass = "integer")            function(x) x@Dim, valueClass = "integer")
66    
67    setMethod("length", "Matrix", function(x) prod(dim(x)))
68    
69  setMethod("dimnames", signature(x = "Matrix"), function(x) x@Dimnames)  setMethod("dimnames", signature(x = "Matrix"), function(x) x@Dimnames)
70    
71    
72  ## not exported but used more than once for "dimnames<-" method :  ## not exported but used more than once for "dimnames<-" method :
73  ## -- or do only once for all "Matrix" classes ??  ## -- or do only once for all "Matrix" classes ??
74  dimnamesGets <- function (x, value) {  dimnamesGets <- function (x, value) {
# Line 75  Line 87 
87  setMethod("unname", signature("Matrix", force="missing"),  setMethod("unname", signature("Matrix", force="missing"),
88            function(obj) { obj@Dimnames <- list(NULL,NULL); obj})            function(obj) { obj@Dimnames <- list(NULL,NULL); obj})
89    
90    setMethod("all", signature(x = "Matrix"),
91              function(x, ..., na.rm)
92              callGeneric(as(x, "lMatrix"), ..., na.rm=na.rm))
93    
94    setMethod("any", signature(x = "Matrix"),
95              function(x, ..., na.rm)
96              callGeneric(as(x, "lMatrix"), ..., na.rm=na.rm))
97    
98    ## NOTE:  "&" and "|"  are now in group "Logic" c "Ops" --> ./Ops.R
99    ##        "!" is in ./not.R
100    
101    
102  Matrix <-  Matrix <-
103      function (data = NA, nrow = 1, ncol = 1, byrow = FALSE, dimnames = NULL,      function (data = NA, nrow = 1, ncol = 1, byrow = FALSE, dimnames = NULL,
104                sparse = NULL, forceCheck = FALSE)                sparse = NULL, forceCheck = FALSE)
# Line 82  Line 106 
106      sparseDefault <- function(m) prod(dim(m)) > 2*sum(isN0(as(m, "matrix")))      sparseDefault <- function(m) prod(dim(m)) > 2*sum(isN0(as(m, "matrix")))
107    
108      i.M <- is(data, "Matrix")      i.M <- is(data, "Matrix")
109        if(!i.M && inherits(data, "table")) # special treatment
110            class(data) <- "matrix" # "matrix" first for S4 dispatch
111      if(is.null(sparse1 <- sparse) && (i.M || is(data, "matrix")))      if(is.null(sparse1 <- sparse) && (i.M || is(data, "matrix")))
112          sparse <- sparseDefault(data)          sparse <- sparseDefault(data)
113    
114      doDN <- TRUE      doDN <- TRUE
115      if (i.M) {      if (i.M) {
116            if(!missing(nrow) || !missing(ncol)|| !missing(byrow))
117                warning("'nrow', 'ncol', etc, are disregarded when 'data' is \"Matrix\" already")
118          sM <- is(data,"sparseMatrix")          sM <- is(data,"sparseMatrix")
119          if(!forceCheck && ((sparse && sM) || (!sparse && !sM)))          if(!forceCheck && ((sparse && sM) || (!sparse && !sM)))
120              return(data)              return(data)
# Line 101  Line 128 
128          if(length(data) == 1 && is0(data) && !identical(sparse, FALSE)) {          if(length(data) == 1 && is0(data) && !identical(sparse, FALSE)) {
129              ## Matrix(0, ...) : always sparse unless "sparse = FALSE":              ## Matrix(0, ...) : always sparse unless "sparse = FALSE":
130              if(is.null(sparse)) sparse1 <- sparse <- TRUE              if(is.null(sparse)) sparse1 <- sparse <- TRUE
131                i.M <- sM <- TRUE
132              ## will be sparse: do NOT construct full matrix!              ## will be sparse: do NOT construct full matrix!
133              data <- new(if(is.numeric(data)) "dgTMatrix" else              data <- new(if(is.numeric(data)) "dgTMatrix" else
134                          if(is.logical(data)) "lgTMatrix" else                          if(is.logical(data)) "lgTMatrix" else
# Line 115  Line 143 
143              dimnames(data) <- dimnames              dimnames(data) <- dimnames
144          }          }
145          doDN <- FALSE          doDN <- FALSE
146      }      } else if(!missing(nrow) || !missing(ncol)|| !missing(byrow))
147            warning("'nrow', 'ncol', etc, are disregarded for matrix 'data'")
148    
149      ## 'data' is now a "matrix" or "Matrix"      ## 'data' is now a "matrix" or "Matrix"
150      if (doDN && !is.null(dimnames))      if (doDN && !is.null(dimnames))
151          dimnames(data) <- dimnames          dimnames(data) <- dimnames
# Line 158  Line 188 
188                    }, sep="")                    }, sep="")
189          }          }
190    
191      ## Now coerce and return      ## Can we coerce and be done?
192        if(!canCoerce(data,cl)) { ## try to coerce ``via'' virtual classes
193            if(sparse && !sM)
194                data <- as(data, "sparseMatrix")
195            else if(!sparse && !is(data, "denseMatrix"))
196                data <- as(data, "denseMatrix")
197            if(isTri && !is(data, "triangularMatrix"))
198                data <- as(data, "triangularMatrix")
199            else if(isSym && !is(data, "symmetricMatrix"))
200                data <- as(data, "symmetricMatrix")
201        }
202        ## now coerce in any case .. maybe producing sensible error message:
203      as(data, cl)      as(data, cl)
204  }  }
205    
# Line 169  Line 210 
210    
211  setMethod("%*%", signature(x = "Matrix", y = "numeric"),  setMethod("%*%", signature(x = "Matrix", y = "numeric"),
212            function(x, y) callGeneric(x, as.matrix(y)))            function(x, y) callGeneric(x, as.matrix(y)))
   
213  setMethod("%*%", signature(x = "numeric", y = "Matrix"),  setMethod("%*%", signature(x = "numeric", y = "Matrix"),
214            function(x, y) callGeneric(matrix(x, nrow = 1, byrow=TRUE), y))            function(x, y) callGeneric(matrix(x, nrow = 1, byrow=TRUE), y))
215    
216    setMethod("%*%", signature(x = "Matrix", y = "matrix"),
217              function(x, y) callGeneric(x, Matrix(y)))
218    setMethod("%*%", signature(x = "matrix", y = "Matrix"),
219              function(x, y) callGeneric(Matrix(x), y))
220    
221    
222  setMethod("crossprod", signature(x = "Matrix", y = "numeric"),  setMethod("crossprod", signature(x = "Matrix", y = "numeric"),
223            function(x, y = NULL) callGeneric(x, as.matrix(y)))            function(x, y = NULL) callGeneric(x, as.matrix(y)))
224  setMethod("crossprod", signature(x = "numeric", y = "Matrix"),  setMethod("crossprod", signature(x = "numeric", y = "Matrix"),
225            function(x, y = NULL)  callGeneric(as.matrix(x), y))            function(x, y = NULL)  callGeneric(as.matrix(x), y))
226    
227    setMethod("crossprod", signature(x = "Matrix", y = "matrix"),
228              function(x, y = NULL) callGeneric(x, Matrix(y)))
229    setMethod("crossprod", signature(x = "matrix", y = "Matrix"),
230              function(x, y = NULL) callGeneric(Matrix(x), y))
231    
232  ## The as.matrix() promotion seems illogical to MM,  ## The as.matrix() promotion seems illogical to MM,
233  ## but is according to help(tcrossprod, package = "base") :  ## but is according to help(tcrossprod, package = "base") :
234  setMethod("tcrossprod", signature(x = "Matrix", y = "numeric"),  setMethod("tcrossprod", signature(x = "Matrix", y = "numeric"),
235            function(x, y = NULL) callGeneric(x, as.matrix(y)))            function(x, y = NULL) callGeneric(x, as.matrix(y)))
236  setMethod("tcrossprod", signature(x = "numeric", y = "Matrix"),  setMethod("tcrossprod", signature(x = "numeric", y = "Matrix"),
237            function(x, y = NULL)  callGeneric(as.matrix(x), y))            function(x, y = NULL)  callGeneric(as.matrix(x), y))
238    setMethod("tcrossprod", signature(x = "Matrix", y = "matrix"),
239              function(x, y = NULL) callGeneric(x, Matrix(y)))
240    setMethod("tcrossprod", signature(x = "matrix", y = "Matrix"),
241              function(x, y = NULL) callGeneric(Matrix(x), y))
242    
243  ## maybe not optimal  ## maybe not 100% optimal, but elegant:
244  setMethod("solve", signature(a = "Matrix", b = "missing"),  setMethod("solve", signature(a = "Matrix", b = "missing"),
245            function(a, b, ...) solve(a, Diagonal(nrow(a))))            function(a, b, ...) solve(a, Diagonal(nrow(a))))
246    
247  setMethod("solve", signature(a = "Matrix", b = "numeric"),  setMethod("solve", signature(a = "Matrix", b = "numeric"),
248            function(a, b, ...) callGeneric(a, as.matrix(b)))            function(a, b, ...) callGeneric(a, Matrix(b)))
 ## when no sub-class method is found, bail out  
249  setMethod("solve", signature(a = "Matrix", b = "matrix"),  setMethod("solve", signature(a = "Matrix", b = "matrix"),
250            function(a, b, ...) .bail.out.2("solve", class(a), "matrix"))            function(a, b, ...) callGeneric(a, Matrix(b)))
251    setMethod("solve", signature(a = "matrix", b = "Matrix"),
252              function(a, b, ...) callGeneric(Matrix(a), b))
253    
254    ## when no sub-class method is found, bail out
255    setMethod("solve", signature(a = "Matrix", b = "Matrix"),
256              function(a, b, ...) .bail.out.2("solve", class(a), class(b)))
257    
258  ## bail-out methods in order to get better error messages  ## bail-out methods in order to get better error messages
259  setMethod("%*%", signature(x = "Matrix", y = "Matrix"),  setMethod("%*%", signature(x = "Matrix", y = "Matrix"),
# Line 220  Line 280 
280  setMethod("kronecker", signature(X = "Matrix", Y = "ANY",  setMethod("kronecker", signature(X = "Matrix", Y = "ANY",
281                                   FUN = "ANY", make.dimnames = "ANY"),                                   FUN = "ANY", make.dimnames = "ANY"),
282            function(X, Y, FUN, make.dimnames, ...) {            function(X, Y, FUN, make.dimnames, ...) {
283                  if(is(X, "sparseMatrix"))
284                      warning("using slow kronecker() method")
285                X <- as(X, "matrix") ; Matrix(callGeneric()) })                X <- as(X, "matrix") ; Matrix(callGeneric()) })
286    
287  setMethod("kronecker", signature(X = "ANY", Y = "Matrix",  setMethod("kronecker", signature(X = "ANY", Y = "Matrix",
288                                   FUN = "ANY", make.dimnames = "ANY"),                                   FUN = "ANY", make.dimnames = "ANY"),
289            function(X, Y, FUN, make.dimnames, ...) {            function(X, Y, FUN, make.dimnames, ...) {
290                  if(is(Y, "sparseMatrix"))
291                      warning("using slow kronecker() method")
292                Y <- as(Y, "matrix") ; Matrix(callGeneric()) })                Y <- as(Y, "matrix") ; Matrix(callGeneric()) })
293    
294    
# Line 238  Line 303 
303  setMethod("t", signature(x = "Matrix"),  setMethod("t", signature(x = "Matrix"),
304            function(x) .bail.out.1(.Generic, class(x)))            function(x) .bail.out.1(.Generic, class(x)))
305    
306  ## Group Methods  setMethod("norm", signature(x = "Matrix", type = "character"),
307  setMethod("+", signature(e1 = "Matrix", e2 = "missing"), function(e1) e1)            function(x, type, ...) .bail.out.1(.Generic, class(x)))
308  ## "fallback":  setMethod("rcond", signature(x = "Matrix", type = "character"),
309  setMethod("-", signature(e1 = "Matrix", e2 = "missing"),            function(x, type, ...) .bail.out.1(.Generic, class(x)))
310            function(e1) {  
311                warning("inefficient method used for \"- e1\"")  
312                0-e1  ## for all :
313    setMethod("norm", signature(x = "ANY", type = "missing"),
314              function(x, type, ...) norm(x, type = "O", ...))
315    setMethod("rcond", signature(x = "ANY", type = "missing"),
316              function(x, type, ...) rcond(x, type = "O", ...))
317    
318    
319    
320    
321    
322    ## MM: More or less "Cut & paste" from
323    ## --- diff.default() from  R/src/library/base/R/diff.R :
324    setMethod("diff", signature(x = "Matrix"),
325              function(x, lag = 1, differences = 1, ...) {
326                  if (length(lag) > 1 || length(differences) > 1 ||
327                      lag < 1 || differences < 1)
328                      stop("'lag' and 'differences' must be integers >= 1")
329                  xlen <- nrow(x)
330                  if (lag * differences >= xlen)
331                      return(x[,FALSE][0])  # empty of proper mode
332    
333                  i1 <- -1:-lag
334                  for (i in 1:differences)
335                      x <- x[i1, , drop = FALSE] -
336                          x[-nrow(x):-(nrow(x)-lag+1), , drop = FALSE]
337                  x
338            })            })
339    
340  ## old-style matrices are made into new ones  setMethod("image", "Matrix",
341  setMethod("Ops", signature(e1 = "Matrix", e2 = "matrix"),            function(x, ...) { # coercing to sparse is not inefficient,
342            function(e1, e2) callGeneric(e1, Matrix(e2)))                ##               since we need 'i' and 'j' for levelplot()
343  ##          callGeneric(e1, Matrix(e2, sparse=is(e1,"sparseMatrix"))))                x <- as(as(x, "sparseMatrix"), "dMatrix")
344  setMethod("Ops", signature(e1 = "matrix", e2 = "Matrix"),                callGeneric()
           function(e1, e2) callGeneric(Matrix(e1), e2))  
   
 ## bail-outs -- on highest possible level, hence "Ops", not "Compare"/"Arith" :  
 setMethod("Ops", signature(e1 = "Matrix", e2 = "Matrix"),  
           function(e1, e2) {  
               d <- dimCheck(e1,e2)  
               .bail.out.2(.Generic, class(e1), class(e2))  
345            })            })
 setMethod("Ops", signature(e1 = "Matrix", e2 = "ANY"),  
           function(e1, e2) .bail.out.2(.Generic, class(e1), class(e2)))  
 setMethod("Ops", signature(e1 = "ANY", e2 = "Matrix"),  
           function(e1, e2) .bail.out.2(.Generic, class(e1), class(e2)))  
346    
347    
348    ## Group Methods
349    
350    ##-> see ./Ops.R
351    ##         ~~~~~
352    ## For all  non-dMatrix objects, and note that  "all" and "any" have their own
353    setMethod("Summary", signature(x = "Matrix", na.rm = "ANY"),
354              function(x, ..., na.rm)
355              callGeneric(as(x,"dMatrix"), ..., na.rm = na.rm))
356    
357    
358  ### --------------------------------------------------------------------------  ### --------------------------------------------------------------------------
359  ###  ###
# Line 278  Line 366 
366  ## "x[]":  ## "x[]":
367  setMethod("[", signature(x = "Matrix",  setMethod("[", signature(x = "Matrix",
368                           i = "missing", j = "missing", drop = "ANY"),                           i = "missing", j = "missing", drop = "ANY"),
369            function (x, i, j, drop) x)            function (x, i, j, ..., drop) x)
370    
371  ## missing 'drop' --> 'drop = TRUE'  ## missing 'drop' --> 'drop = TRUE'
372  ##                     -----------  ##                     -----------
373  ## select rows  ## select rows
374  setMethod("[", signature(x = "Matrix", i = "index", j = "missing",  setMethod("[", signature(x = "Matrix", i = "index", j = "missing",
375                           drop = "missing"),                           drop = "missing"),
376            function(x,i,j, drop) callGeneric(x, i=i, drop= TRUE))            function(x,i,j, ..., drop) {
377                  if(nargs() == 1) { ## e.g. M[0] , M[TRUE],  M[1:2]
378                      if(any(i)) as.vector(x)[i] else as.vector(x[1,1])[FALSE]
379                  } else callGeneric(x, i=i, drop= TRUE)})
380    
381  ## select columns  ## select columns
382  setMethod("[", signature(x = "Matrix", i = "missing", j = "index",  setMethod("[", signature(x = "Matrix", i = "missing", j = "index",
383                           drop = "missing"),                           drop = "missing"),
384            function(x,i,j, drop) callGeneric(x, j=j, drop= TRUE))            function(x,i,j, ..., drop) callGeneric(x, j=j, drop= TRUE))
385  setMethod("[", signature(x = "Matrix", i = "index", j = "index",  setMethod("[", signature(x = "Matrix", i = "index", j = "index",
386                           drop = "missing"),                           drop = "missing"),
387            function(x,i,j, drop) callGeneric(x, i=i, j=j, drop= TRUE))            function(x,i,j, ..., drop) callGeneric(x, i=i, j=j, drop= TRUE))
388    
389  ## bail out if any of (i,j,drop) is "non-sense"  ## bail out if any of (i,j,drop) is "non-sense"
390  setMethod("[", signature(x = "Matrix", i = "ANY", j = "ANY", drop = "ANY"),  setMethod("[", signature(x = "Matrix", i = "ANY", j = "ANY", drop = "ANY"),
391            function(x,i,j, drop)            function(x,i,j, ..., drop)
392            stop("invalid or not-yet-implemented 'Matrix' subsetting"))            stop("invalid or not-yet-implemented 'Matrix' subsetting"))
393    
394  ## logical indexing, such as M[ M >= 7 ] *BUT* also M[ M[,1] >= 3,],  ## logical indexing, such as M[ M >= 7 ] *BUT* also M[ M[,1] >= 3,],
395  ## The following is *both* for    M [ <logical>   ]  ## The following is *both* for    M [ <logical>   ]
396  ##                 and also for   M [ <logical> , ]  ##                 and also for   M [ <logical> , ]
397  .M.sub.i.logical <- function (x, i, j, drop)  .M.sub.i.logical <- function (x, i, j, ..., drop)
398  {  {
399      nA <- nargs()      nA <- nargs()
400      if(nA == 2) { ##  M [ M >= 7 ]      if(nA == 2) { ##  M [ M >= 7 ]
# Line 313  Line 405 
405          stop("not-yet-implemented 'Matrix' subsetting") ## FIXME          stop("not-yet-implemented 'Matrix' subsetting") ## FIXME
406    
407      } else stop("nargs() = ", nA,      } else stop("nargs() = ", nA,
408                  " should never happen; please report.")                  ".  Extraneous illegal arguments inside '[ .. ]' (i.logical)?")
409  }  }
410  setMethod("[", signature(x = "Matrix", i = "lMatrix", j = "missing",  setMethod("[", signature(x = "Matrix", i = "lMatrix", j = "missing",
411                           drop = "ANY"),                           drop = "ANY"),
# Line 324  Line 416 
416    
417    
418  ## A[ ij ]  where ij is (i,j) 2-column matrix :  ## A[ ij ]  where ij is (i,j) 2-column matrix :
419  .M.sub.i.2col <- function (x, i, j, drop)  .M.sub.i.2col <- function (x, i, j, ..., drop)
420  {  {
421      nA <- nargs()      nA <- nargs()
422      if(nA == 2) { ##  M [ cbind(ii,jj) ]      if(nA == 2) { ##  M [ cbind(ii,jj) ]
# Line 343  Line 435 
435          ## potentially inefficient -- FIXME --          ## potentially inefficient -- FIXME --
436          unlist(lapply(seq_len(m), function(j) x[i1[j], i2[j]]))          unlist(lapply(seq_len(m), function(j) x[i1[j], i2[j]]))
437    
438      } else stop("nargs() = ", nA, " should never happen; please report.")      } else stop("nargs() = ", nA,
439                    ".  Extraneous illegal arguments inside '[ .. ]' (i.2col)?")
440  }  }
441  setMethod("[", signature(x = "Matrix", i = "matrix", j = "missing"),# drop="ANY"  setMethod("[", signature(x = "Matrix", i = "matrix", j = "missing"),# drop="ANY"
442            .M.sub.i.2col)            .M.sub.i.2col)
# Line 356  Line 449 
449                                  value = "ANY"),## double/logical/...                                  value = "ANY"),## double/logical/...
450            function (x, value) {            function (x, value) {
451                ## Fails for 'nMatrix' ... FIXME : make sure have method there                ## Fails for 'nMatrix' ... FIXME : make sure have method there
452                x@x <- value                x@x <- rep(value, length = length(x@x))
453                validObject(x)# check if type and lengths above match                validObject(x)# check if type and lengths above match
454                x                x
455            })            })
456    
457  ## A[ ij ] <- value,  where ij is (i,j) 2-column matrix :  ## A[ ij ] <- value,  where ij is (i,j) 2-column matrix :
458  .M.repl.i.2col <- function (x, i, j, value)  ## ----------------
459    ## The cheap general method --- FIXME: provide special ones; done for Tsparse..
460    ## NOTE:  need '...' below such that setMethod() does
461    ##        not use .local() such that nargs() will work correctly:
462    .M.repl.i.2col <- function (x, i, j, ..., value)
463  {  {
464      nA <- nargs()      nA <- nargs()
465      if(nA == 3) { ##  M [ cbind(ii,jj) ] <- value      if(nA == 3) { ##  M [ cbind(ii,jj) ] <- value
466          if(!is.integer(nc <- ncol(i)))          if(!is.integer(nc <- ncol(i)))
467              stop("'i' has no integer column number",              stop("'i' has no integer column number",
468                   " should never happen; please report")                   " should never happen; please report")
469            else if(!is.numeric(i) || nc != 2)
470                stop("such indexing must be by logical or 2-column numeric matrix")
471          if(is.logical(i)) {          if(is.logical(i)) {
472                message(".M.repl.i.2col(): drop 'matrix' case ...")
473              i <- c(i) # drop "matrix"              i <- c(i) # drop "matrix"
474              return( callNextMethod() )              return( callNextMethod() )
475          } else if(!is.numeric(i) || nc != 2)          }
476              stop("such indexing must be by logical or 2-column numeric matrix")          if(!is.integer(i)) storage.mode(i) <- "integer"
477            if(any(i < 0))
478                stop("negative values are not allowed in a matrix subscript")
479            if(any(is.na(i)))
480                stop("NAs are not allowed in subscripted assignments")
481            if(any(i0 <- (i == 0))) # remove them
482                i <- i[ - which(i0, arr.ind = TRUE)[,"row"], ]
483            ## now have integer i >= 1
484          m <- nrow(i)          m <- nrow(i)
485          mod.x <- .type.kind[.M.kind(x)]          ## mod.x <- .type.kind[.M.kind(x)]
486          if(length(value) > 0 && m %% length(value) != 0)          if(length(value) > 0 && m %% length(value) != 0)
487              warning("number of items to replace is not a multiple of replacement length")              warning("number of items to replace is not a multiple of replacement length")
488          ## recycle:          ## recycle:
# Line 385  Line 492 
492          ## inefficient -- FIXME -- (also loses "symmetry" unnecessarily)          ## inefficient -- FIXME -- (also loses "symmetry" unnecessarily)
493          for(k in seq_len(m))          for(k in seq_len(m))
494              x[i1[k], i2[k]] <- value[k]              x[i1[k], i2[k]] <- value[k]
         x  
495    
496      } else stop("nargs() = ", nA, " should never happen; please report.")          x
497        } else stop("nargs() = ", nA,
498                    ".  Extraneous illegal arguments inside '[ .. ]' ?")
499  }  }
500    
501  setReplaceMethod("[", signature(x = "Matrix", i = "matrix", j = "missing",  setReplaceMethod("[", signature(x = "Matrix", i = "matrix", j = "missing",
502                                  value = "replValue"),                                  value = "replValue"),
503            .M.repl.i.2col)            .M.repl.i.2col)
# Line 396  Line 505 
505    
506  setReplaceMethod("[", signature(x = "Matrix", i = "ANY", j = "ANY",  setReplaceMethod("[", signature(x = "Matrix", i = "ANY", j = "ANY",
507                                  value = "Matrix"),                                  value = "Matrix"),
508                     function (x, i, j, value) {
509    ### *TEMPORARY* diagnostic output:
510    ##                  cat("<Matrix1>[i,j] <- <Matrix1>:\n<Matrix1> = x :")
511    ##                  str(x)
512    ##                  cat("<Matrix2> = value :")
513    ##                  str(value)
514    ##                  cat("i :"); if(!missing(i)) str(i) else cat("<missing>\n")
515    ##                  cat("j :"); if(!missing(j)) str(j) else cat("<missing>\n")
516    
517                         callGeneric(x=x, i=i, j=j, value = as.vector(value))
518                     })
519    
520    setReplaceMethod("[", signature(x = "Matrix", i = "ANY", j = "ANY",
521                                    value = "Matrix"),
522                   function (x, i, j, value)                   function (x, i, j, value)
523                   callGeneric(x=x, i=i, j=j, value = as.vector(value)))                   callGeneric(x=x, i=i, j=j, value = as.vector(value)))
524    
525  setReplaceMethod("[", signature(x = "Matrix", i = "ANY", j = "ANY",  setReplaceMethod("[", signature(x = "Matrix", i = "ANY", j = "ANY",
526                                  value = "matrix"),                                  value = "matrix"),
527                   function (x, i, j, value)                   function (x, i, j, value)
# Line 412  Line 536 
536                                 class(value),class(x)))                                 class(value),class(x)))
537                else stop("not-yet-implemented 'Matrix[<-' method")                else stop("not-yet-implemented 'Matrix[<-' method")
538            })            })
   
   
 ## The trivial methods :  
 setMethod("cbind2", signature(x = "Matrix", y = "NULL"),  
           function(x, y) x)  
 setMethod("cbind2", signature(x = "Matrix", y = "missing"),  
           function(x, y) x)  
 setMethod("cbind2", signature(x = "NULL", y="Matrix"),  
           function(x, y) x)  
   
 setMethod("rbind2", signature(x = "Matrix", y = "NULL"),  
           function(x, y) x)  
 setMethod("rbind2", signature(x = "Matrix", y = "missing"),  
           function(x, y) x)  
 setMethod("rbind2", signature(x = "NULL", y="Matrix"),  
           function(x, y) x)  
   
 ## Makes sure one gets x decent error message for the unimplemented cases:  
 setMethod("cbind2", signature(x = "Matrix", y = "Matrix"),  
           function(x, y) {  
               rowCheck(x,y)  
               stop(gettextf("cbind2() method for (%s,%s) not-yet defined",  
                             class(x), class(y)))  
           })  
   
 ## Use a working fall back {particularly useful for sparse}:  
 ## FIXME: implement rbind2 via "cholmod" for C* and Tsparse ones  
 setMethod("rbind2", signature(x = "Matrix", y = "Matrix"),  
           function(x, y) {  
               colCheck(x,y)  
               t(cbind2(t(x), t(y)))  
           })  

Legend:
Removed from v.1673  
changed lines
  Added in v.2056

root@r-forge.r-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business Powered By FusionForge