SCM

SCM Repository

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

Diff of /pkg/Matrix/R/diagMatrix.R

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

revision 1331, Sat Jul 22 17:59:53 2006 UTC revision 2096, Fri Dec 7 17:44:44 2007 UTC
# Line 1  Line 1 
1    #### All methods for "diagonalMatrix" and its subclasses,
2    ####  currently "ddiMatrix", "ldiMatrix"
3    
4  ## Purpose: Constructor of diagonal matrices -- ~= diag() ,  ## Purpose: Constructor of diagonal matrices -- ~= diag() ,
5  ##          but *not* diag() extractor!  ##          but *not* diag() extractor!
6  Diagonal <- function(n, x = NULL)  Diagonal <- function(n, x = NULL)
# Line 10  Line 13 
13          n <- as.integer(n)          n <- as.integer(n)
14      }      }
15    
16      if(missing(x)) # unit diagonal matrix      if(missing(x)) ## unit diagonal matrix
17          new("ddiMatrix", Dim = c(n,n), diag = "U")          new("ddiMatrix", Dim = c(n,n), diag = "U")
18      else {      else {
19          stopifnot(length(x) == n)          stopifnot(length(x) == n)
20          if(is.logical(x))          if(is.logical(x))
21              cl <- "ldiMatrix"              cl <- "ldiMatrix"
22          else {          else if(is.numeric(x)) {
23              cl <- "ddiMatrix"              cl <- "ddiMatrix"
24              x <- as.numeric(x)              x <- as.numeric(x)
25          }          }
26            else if(is.complex(x)) {
27                cl <- "zdiMatrix"  # will not yet work
28            } else stop("'x' has invalid data type")
29          new(cl, Dim = c(n,n), diag = "N", x = x)          new(cl, Dim = c(n,n), diag = "N", x = x)
30      }      }
31  }  }
32    
33  setAs("diagonalMatrix", "triangularMatrix",  ### This is modified from a post of Bert Gunter to R-help on  1 Sep 2005.
34        function(from) {  ### Bert's code built on a post by Andy Liaw who most probably was influenced
35            n <- from@Dim[1]  ### by earlier posts, notably one by Scott Chasalow on S-news, 16 Jan 2002
36            i <- seq(length = n)  ### who posted his bdiag() function written in December 1995.
37            x <- from@x  
38            new(if(is.numeric(x)) "dtTMatrix" else "ltTMatrix",  bdiag <- function(...) {
39        if(nargs() == 0) return(new("dgCMatrix"))
40        ## else :
41        mlist <- if (nargs() == 1) as.list(...) else list(...)
42        dims <- sapply(mlist, dim)
43        ## make sure we had all matrices:
44        if(!(is.matrix(dims) && nrow(dims) == 2))
45            stop("some arguments are not matrices")
46        csdim <- rbind(rep.int(0L, 2),
47                       apply(sapply(mlist, dim), 1, cumsum))
48        ret <- new("dgTMatrix", Dim = as.integer(csdim[nrow(csdim),]))
49        add1 <- matrix(1:0, 2,2)
50        for(i in seq_along(mlist)) {
51            indx <- apply(csdim[i:(i+1),] + add1, 2, function(n) n[1]:n[2])
52            if(is.null(dim(indx))) ## non-square matrix
53                ret[indx[[1]],indx[[2]]] <- mlist[[i]]
54            else ## square matrix
55                ret[indx[,1],indx[,2]] <- mlist[[i]]
56        }
57        ## slightly debatable if we really should return Csparse.. :
58        as(ret, "CsparseMatrix")
59    }
60    
61    diag2tT <- function(from) {
62        i <- if(from@diag == "U") integer(0) else seq_len(from@Dim[1]) - 1L
63        new(paste(.M.kind(from), "tTMatrix", sep=''),
64                diag = from@diag, Dim = from@Dim, Dimnames = from@Dimnames,                diag = from@diag, Dim = from@Dim, Dimnames = from@Dimnames,
65                x = x, i = i, j = i)          x = from@x, # <- ok for diag = "U" and "N" (!)
66            })          i = i, j = i)
67    }
68    
69    diag2sT <- function(from) { # to symmetric Tsparse
70        i <- if(from@diag == "U") integer(0) else seq_len(from@Dim[1]) - 1L
71        new(paste(.M.kind(from), "sTMatrix", sep=''),
72            Dim = from@Dim, Dimnames = from@Dimnames,
73            x = from@x, i = i, j = i)
74    }
75    
76    setAs("diagonalMatrix", "triangularMatrix", diag2tT)
77    setAs("diagonalMatrix", "sparseMatrix", diag2tT)
78    ## needed too (otherwise <dense> -> Tsparse is taken):
79    setAs("diagonalMatrix", "TsparseMatrix", diag2tT)
80    ## is better than this:
81    ## setAs("diagonalMatrix", "sparseMatrix",
82    ##       function(from)
83    ##        as(from, if(is(from, "dMatrix")) "dgCMatrix" else "lgCMatrix"))
84    setAs("diagonalMatrix", "CsparseMatrix",
85          function(from) as(diag2tT(from), "CsparseMatrix"))
86    
87    setAs("diagonalMatrix", "symmetricMatrix", diag2sT)
88    
89  setAs("diagonalMatrix", "matrix",  setAs("diagonalMatrix", "matrix",
90        function(from) {        function(from) {
# Line 42  Line 94 
94                 nrow = n, ncol = n)                 nrow = n, ncol = n)
95        })        })
96    
97  setAs("diagonalMatrix", "generalMatrix",  setAs("diagonalMatrix", "generalMatrix", # prefer sparse:
98        function(from) {        function(from) as(from, paste(.M.kind(from), "gCMatrix", sep='')))
99            x <- as(from, "matrix")  
100            as(x,  .diag.x <- function(m) {
101               if(is.logical(x)) "lgeMatrix"      if(m@diag == "U")
102  ## Not yet:          rep.int(if(is.numeric(m@x)) 1. else TRUE,
103  ##              else if(is.complex(x)) "zgeMatrix"                  m@Dim[1])
104  ##              else if(is.integer(x)) "igeMatrix"      else m@x
105               else "dgeMatrix")  }
       })  
106    
107    .diag.2N <- function(m) {
108        if(m@diag == "U") m@diag <- "N"
109        m
110    }
111    
112    ## given the above, the following  4  coercions should be all unneeded;
113    ## we prefer triangular to general:
114  setAs("ddiMatrix", "dgTMatrix",  setAs("ddiMatrix", "dgTMatrix",
115        function(from) {        function(from) {
116              .Deprecated("as(, \"sparseMatrix\")")
117            n <- from@Dim[1]            n <- from@Dim[1]
118            i <- seq(length = n) - 1:1            i <- seq_len(n) - 1L
119            new("dgTMatrix", i = i, j = i,            new("dgTMatrix", i = i, j = i, x = .diag.x(from),
               x = if(from@diag == "U") rep(1,n) else from@x,  
120                Dim = c(n,n), Dimnames = from@Dimnames) })                Dim = c(n,n), Dimnames = from@Dimnames) })
121    
122  setAs("ddiMatrix", "dgCMatrix",  setAs("ddiMatrix", "dgCMatrix",
123        function(from) as(as(from, "dgTMatrix"), "dgCMatrix"))        function(from) as(as(from, "sparseMatrix"), "dgCMatrix"))
124    
125  setAs("ldiMatrix", "lgTMatrix",  setAs("ldiMatrix", "lgTMatrix",
126        function(from) {        function(from) {
127              .Deprecated("as(, \"sparseMatrix\")")
128            n <- from@Dim[1]            n <- from@Dim[1]
129            i <- (if(from@diag == "U") seq(length = n) else which(from@x)) - 1:1            if(from@diag == "U") { # unit-diagonal
130            new("lgTMatrix", i = i, j = i,                x <- rep.int(TRUE, n)
131                  i <- seq_len(n) - 1L
132              } else { # "normal"
133                  nz <- nz.NA(from@x, na. = TRUE)
134                  x <- from@x[nz]
135                  i <- which(nz) - 1L
136              }
137              new("lgTMatrix", i = i, j = i, x = x,
138                Dim = c(n,n), Dimnames = from@Dimnames) })                Dim = c(n,n), Dimnames = from@Dimnames) })
139    
140  setAs("ldiMatrix", "lgCMatrix",  setAs("ldiMatrix", "lgCMatrix",
141        function(from) as(as(from, "lgTMatrix"), "lgCMatrix"))        function(from) as(as(from, "lgTMatrix"), "lgCMatrix"))
142    
 setAs("diagonalMatrix", "sparseMatrix",  
       function(from)  
           as(from, if(is(from, "dMatrix")) "dgCMatrix" else "lgCMatrix"))  
143    
144    if(FALSE) # now have faster  "ddense" -> "dge"
145  setAs("ddiMatrix", "dgeMatrix",  setAs("ddiMatrix", "dgeMatrix",
146        function(from) as(as(from, "matrix"), "dgeMatrix"))        function(from) as(as(from, "matrix"), "dgeMatrix"))
147    
# Line 95  Line 159 
159                cl <- "ddiMatrix"                cl <- "ddiMatrix"
160                uni <- all(x == 1)                uni <- all(x == 1)
161                storage.mode(x) <- "double"                storage.mode(x) <- "double"
162            }            } ## TODO: complex
163            new(cl, Dim = c(n,n), diag = if(uni) "U" else "N",            new(cl, Dim = c(n,n), diag = if(uni) "U" else "N",
164                x = if(uni) x[FALSE] else x)                x = if(uni) x[FALSE] else x)
165        })        })
# Line 120  Line 184 
184                x = if(uni) x[FALSE] else x)                x = if(uni) x[FALSE] else x)
185        })        })
186    
187    
188    setMethod("diag", signature(x = "diagonalMatrix"),
189              function(x = 1, nrow, ncol) .diag.x(x))
190    
191    
192    subDiag <- function(x, i, j, drop) {
193        x <- as(x, "sparseMatrix")
194        x <- if(missing(i))
195            x[, j, drop=drop]
196        else if(missing(j))
197            x[i, , drop=drop]
198        else
199            x[i,j, drop=drop]
200        if(isDiagonal(x)) as(x, "diagonalMatrix") else x
201    }
202    
203    setMethod("[", signature(x = "diagonalMatrix", i = "index",
204                             j = "index", drop = "logical"), subDiag)
205    setMethod("[", signature(x = "diagonalMatrix", i = "index",
206                            j = "missing", drop = "logical"),
207              function(x, i, drop) subDiag(x, i=i, drop=drop))
208    setMethod("[", signature(x = "diagonalMatrix", i = "missing",
209                             j = "index", drop = "logical"),
210              function(x, j, drop) subDiag(x, j=j, drop=drop))
211    
212    ## When you assign to a diagonalMatrix, the result should be
213    ## diagonal or sparse ---
214    ## FIXME: this now fails because the "denseMatrix" methods come first in dispatch
215    replDiag <- function(x, i, j, value) {
216        x <- as(x, "sparseMatrix")
217        message(sprintf("diagnosing replDiag() -- nargs() = %d\n", nargs()))
218        if(missing(i))
219            x[, j] <- value
220        else if(missing(j))
221            x[i, ] <- value
222        else
223            x[i,j] <- value
224        if(isDiagonal(x)) as(x, "diagonalMatrix") else x
225    }
226    
227    setReplaceMethod("[", signature(x = "diagonalMatrix", i = "index",
228                                    j = "index", value = "replValue"), replDiag)
229    setReplaceMethod("[", signature(x = "diagonalMatrix", i = "index",
230                                    j = "missing", value = "replValue"),
231                     function(x, i, value) replDiag(x, i=i, value=value))
232    setReplaceMethod("[", signature(x = "diagonalMatrix", i = "matrix", # 2-col.matrix
233                                    j = "missing", value = "replValue"),
234                     function(x, i, value) {
235                         if(ncol(i) == 2) {
236                             if(all((ii <- i[,1]) == i[,2])) { # replace in diagonal only
237                                 x@x[ii] <- value
238                                 x
239                             } else { ## no longer diagonal, but remain sparse:
240                                 x <- as(x, "sparseMatrix")
241                                 x[i] <- value
242                                 x
243                             }
244                         }
245                         else { # behave as "base R": use as if vector
246                             x <- as(x, "matrix")
247                             x[i] <- value
248                             Matrix(x)
249                         }
250                     })
251    
252    setReplaceMethod("[", signature(x = "diagonalMatrix", i = "missing",
253                                    j = "index", value = "replValue"),
254                     function(x, j, value) replDiag(x, j=j, value=value))
255    
256    
257  setMethod("t", signature(x = "diagonalMatrix"),  setMethod("t", signature(x = "diagonalMatrix"),
258            function(x) { x@Dimnames <- x@Dimnames[2:1] ; x })            function(x) { x@Dimnames <- x@Dimnames[2:1] ; x })
259    
# Line 130  Line 264 
264  setMethod("isSymmetric", signature(object = "diagonalMatrix"),  setMethod("isSymmetric", signature(object = "diagonalMatrix"),
265            function(object) TRUE)            function(object) TRUE)
266    
267  setMethod("diag", signature(x = "diagonalMatrix"),  setMethod("chol", signature(x = "ddiMatrix"),# pivot = "ANY"
268            function(x = 1, nrow, ncol = n) {            function(x, pivot) {
269               if(x@diag == "U")                if(any(x@x < 0)) stop("chol() is undefined for diagonal matrix with negative entries")
270                   rep.int(if(is.logical(x@x)) TRUE else 1, x@Dim[1])                x@x <- sqrt(x@x)
              else x@x  
           })  
   
 setMethod("!", "ldiMatrix", function(e1) {  
     if(e1@diag == "N")  
         e1@x <- !e1@x  
     else { ## "U"  
         e1@diag <- "N"  
         e1@x <- rep.int(FALSE, e1@Dim[1])  
     }  
271      x      x
272  })  })
273    ## chol(L) is L for logical diagonal:
274    setMethod("chol", signature(x = "ldiMatrix"), function(x, pivot) x)
275    
276  ## Basic Matrix Multiplication {many more to add}  ## Basic Matrix Multiplication {many more to add}
277    ##       ---------------------
278  ## FIXME: extend this for 'ldi', i.e. do "diagonalMatrix"  ## Note that "ldi" logical are treated as numeric
279  diagdiagprod <- function(x, y) {  diagdiagprod <- function(x, y) {
280      if(any(dim(x) != dim(y))) stop("non-matching dimensions")      if(any(dim(x) != dim(y))) stop("non-matching dimensions")
281      if(x@diag != "U") {      if(x@diag != "U") {
282          if(y@diag != "U") x@x <- x@x * y@x          if(y@diag != "U") {
283                nx <- x@x * y@x
284                if(is.numeric(nx) && !is.numeric(x@x))
285                    x <- as(x, "dMatrix")
286                x@x <- as.numeric(nx)
287            }
288          return(x)          return(x)
289      } else ## x is unit diagonal      } else ## x is unit diagonal
290      return(y)      return(y)
291  }  }
292    
293  setMethod("%*%", signature(x = "ddiMatrix", y = "ddiMatrix"),  setMethod("%*%", signature(x = "diagonalMatrix", y = "diagonalMatrix"),
294            diagdiagprod, valueClass = "ddiMatrix")            diagdiagprod, valueClass = "ddiMatrix")
295    
296  formals(diagdiagprod) <- alist(x=, y=NULL)  formals(diagdiagprod) <- alist(x=, y=x)
297  setMethod("crossprod", signature(x = "ddiMatrix", y = "ddiMatrix"),  setMethod("crossprod", signature(x = "diagonalMatrix", y = "diagonalMatrix"),
298              diagdiagprod, valueClass = "ddiMatrix")
299    setMethod("tcrossprod", signature(x = "diagonalMatrix", y = "diagonalMatrix"),
300              diagdiagprod, valueClass = "ddiMatrix")
301    setMethod("crossprod", signature(x = "diagonalMatrix", y = "missing"),
302            diagdiagprod, valueClass = "ddiMatrix")            diagdiagprod, valueClass = "ddiMatrix")
303  setMethod("tcrossprod", signature(x = "ddiMatrix", y = "ddiMatrix"),  setMethod("tcrossprod", signature(x = "diagonalMatrix", y = "missing"),
304            diagdiagprod, valueClass = "ddiMatrix")            diagdiagprod, valueClass = "ddiMatrix")
305    
306    
# Line 182  Line 317 
317  formals(diagmatprod) <- alist(x=, y=NULL)  formals(diagmatprod) <- alist(x=, y=NULL)
318  setMethod("crossprod", signature(x = "diagonalMatrix", y = "matrix"),  setMethod("crossprod", signature(x = "diagonalMatrix", y = "matrix"),
319            diagmatprod)            diagmatprod)
320    setMethod("tcrossprod", signature(x = "diagonalMatrix", y = "matrix"),
321              diagmatprod)
322    
323  diagdgeprod <- function(x, y) {  diagdgeprod <- function(x, y) {
324      dx <- dim(x)      dx <- dim(x)
# Line 202  Line 339 
339                dx <- dim(x)                dx <- dim(x)
340                dy <- dim(y)                dy <- dim(y)
341                if(dx[2] != dy[1]) stop("non-matching dimensions")                if(dx[2] != dy[1]) stop("non-matching dimensions")
342                as(if(y@diag == "U") x else x * rep.int(y@x, dx[1]), "Matrix")                as(if(y@diag == "U") x else x * rep(y@x, each = dx[1]), "Matrix")
343            })            })
344    
345  setMethod("%*%", signature(x = "dgeMatrix", y = "diagonalMatrix"),  setMethod("%*%", signature(x = "dgeMatrix", y = "diagonalMatrix"),
# Line 211  Line 348 
348                dy <- dim(y)                dy <- dim(y)
349                if(dx[2] != dy[1]) stop("non-matching dimensions")                if(dx[2] != dy[1]) stop("non-matching dimensions")
350                if(y@diag == "N")                if(y@diag == "N")
351                    x@x <- x@x * rep.int(y@x, dx[1])                    x@x <- x@x * rep(y@x, each = dx[1])
352                x                x
353            })            })
354    
# Line 228  Line 365 
365  ##        function(x, y = NULL) {  ##        function(x, y = NULL) {
366  ##           })  ##           })
367    
368    setMethod("crossprod", signature(x = "diagonalMatrix", y = "sparseMatrix"),
369              function(x, y = NULL) { x <- as(x, "sparseMatrix"); callGeneric() })
370    
371  ### ---------------- diagonal  o   sparse  -----------------------------  setMethod("crossprod", signature(x = "sparseMatrix", y = "diagonalMatrix"),
372              function(x, y = NULL) { y <- as(y, "sparseMatrix"); callGeneric() })
373    
374  ## These are cheap implementations via coercion  setMethod("tcrossprod", signature(x = "diagonalMatrix", y = "sparseMatrix"),
375              function(x, y = NULL) { x <- as(x, "sparseMatrix"); callGeneric() })
376    
377    setMethod("tcrossprod", signature(x = "sparseMatrix", y = "diagonalMatrix"),
378              function(x, y = NULL) { y <- as(y, "sparseMatrix"); callGeneric() })
379    
 ## FIXME?: In theory, this can be done *FASTER*, in some cases, via tapply1()  
380    
381    ## FIXME?: In theory, this can be done *FASTER*, in some cases, via tapply1()
382  setMethod("%*%", signature(x = "diagonalMatrix", y = "sparseMatrix"),  setMethod("%*%", signature(x = "diagonalMatrix", y = "sparseMatrix"),
383            function(x, y) as(x, "sparseMatrix") %*% y)            function(x, y) as(x, "sparseMatrix") %*% y)
384    ## NB: The previous is *not* triggering for  "ddi" o "dgC" (= distance 3)
385    ##     since there's a "ddense" o "Csparse" at dist. 2 => triggers first.
386    ## ==> do this:
387    setMethod("%*%", signature(x = "diagonalMatrix", y = "CsparseMatrix"),
388              function(x, y) as(x, "CsparseMatrix") %*% y)
389    setMethod("%*%", signature(x = "CsparseMatrix", y = "diagonalMatrix"),
390              function(x, y) x %*% as(y, "CsparseMatrix"))
391    ## NB: this is *not* needed for Tsparse & Rsparse
392    ## TODO: Write tests in ./tests/ which ensure that many "ops" with diagonal*
393    ##       do indeed work by going through sparse (and *not* ddense)!
394    
395  setMethod("%*%", signature(x = "sparseMatrix", y = "diagonalMatrix"),  setMethod("%*%", signature(x = "sparseMatrix", y = "diagonalMatrix"),
396            function(x, y) x %*% as(y, "sparseMatrix"))            function(x, y) x %*% as(y, "sparseMatrix"))
397    
 setMethod("crossprod", signature(x = "diagonalMatrix", y = "sparseMatrix"),  
           function(x, y = NULL) { x <- as(x, "sparseMatrix"); callGeneric() })  
398    
399  setMethod("crossprod", signature(x = "sparseMatrix", y = "diagonalMatrix"),  setMethod("solve", signature(a = "diagonalMatrix", b = "missing"),
400            function(x, y = NULL) { y <- as(y, "sparseMatrix"); callGeneric() })            function(a, b, ...) {
401                  a@x <- 1/ a@x
402                  a@Dimnames <- a@Dimnames[2:1]
403                  a
404              })
405    
406    solveDiag <- function(a, b, ...) {
407        if((n <- a@Dim[1]) != nrow(b))
408            stop("incompatible matrix dimensions")
409        ## trivially invert a 'in place' and multiply:
410        a@x <- 1/ a@x
411        a@Dimnames <- a@Dimnames[2:1]
412        a %*% b
413    }
414    setMethod("solve", signature(a = "diagonalMatrix", b = "matrix"),
415              solveDiag)
416    setMethod("solve", signature(a = "diagonalMatrix", b = "Matrix"),
417              solveDiag)
418    
 setMethod("tcrossprod", signature(x = "diagonalMatrix", y = "sparseMatrix"),  
           function(x, y = NULL) { x <- as(x, "sparseMatrix"); callGeneric() })  
419    
 setMethod("tcrossprod", signature(x = "sparseMatrix", y = "diagonalMatrix"),  
           function(x, y = NULL) { y <- as(y, "sparseMatrix"); callGeneric() })  
420    
421    
422    ### ---------------- diagonal  o  sparse  -----------------------------
423    
424    
425    ## Use function for several signatures, in order to evade
426    ## ambiguous dispatch for "ddi", since there's also Arith(ddense., ddense.)
427    diagOdiag <- function(e1,e2) { # result should also be diagonal
428        r <- callGeneric(.diag.x(e1), .diag.x(e2)) # error if not "compatible"
429        if(is.numeric(r)) {
430            if(is.numeric(e2@x)) {
431                e2@x <- r; return(.diag.2N(e2)) }
432            if(!is.numeric(e1@x))
433                ## e.g. e1, e2 are logical;
434                e1 <- as(e1, "dMatrix")
435        }
436        else if(is.logical(r))
437            e1 <- as(e1, "lMatrix")
438        else stop("intermediate 'r' is of type", typeof(r))
439        e1@x <- r
440        .diag.2N(e1)
441    }
442    
443    setMethod("Ops", signature(e1 = "diagonalMatrix", e2 = "diagonalMatrix"),
444              diagOdiag)
445    ## These two are just for method disambiguation:
446    setMethod("Ops", signature(e1 = "ddiMatrix", e2 = "diagonalMatrix"),
447              diagOdiag)
448    setMethod("Ops", signature(e1 = "diagonalMatrix", e2 = "ddiMatrix"),
449              diagOdiag)
450    
451    ## FIXME:    diagonal  o  triangular  |-->  triangular
452    ## -----     diagonal  o  symmetric   |-->  symmetric
453    ##    {also when other is sparse: do these "here" --
454    ##     before conversion to sparse, since that loses "diagonality"}
455    
456    ## For almost everything else, diag* shall be treated "as sparse" :
457    ## These are cheap implementations via coercion
458    
459    ## for disambiguation
460    setMethod("Ops", signature(e1 = "diagonalMatrix", e2 = "sparseMatrix"),
461              function(e1,e2) callGeneric(as(e1, "sparseMatrix"), e2))
462    setMethod("Ops", signature(e1 = "sparseMatrix", e2 = "diagonalMatrix"),
463              function(e1,e2) callGeneric(e1, as(e2, "sparseMatrix")))
464    ## in general:
465    setMethod("Ops", signature(e1 = "diagonalMatrix", e2 = "ANY"),
466              function(e1,e2) callGeneric(as(e1,"sparseMatrix"), e2))
467    setMethod("Ops", signature(e1 = "ANY", e2 = "diagonalMatrix"),
468              function(e1,e2) callGeneric(e1, as(e2,"sparseMatrix")))
469    
470    
471    
472  ## similar to prTriang() in ./Auxiliaries.R :  ## similar to prTriang() in ./Auxiliaries.R :
# Line 268  Line 481 
481  }  }
482    
483  setMethod("show", signature(object = "diagonalMatrix"),  setMethod("show", signature(object = "diagonalMatrix"),
484            function(object) prDiag(object))            function(object) {
485                  d <- dim(object)
486                  cl <- class(object)
487                  cat(sprintf('%d x %d diagonal matrix of class "%s"\n',
488                              d[1], d[2], cl))
489                  prDiag(object)
490              })

Legend:
Removed from v.1331  
changed lines
  Added in v.2096

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