SCM

SCM Repository

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

Diff of /pkg/R/ddenseMatrix.R

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

revision 1575, Mon Sep 18 14:47:40 2006 UTC revision 1747, Mon Jan 29 20:17:33 2007 UTC
# Line 4  Line 4 
4  ## >> but << needs all sub(sub(sub)) classes of "ddenseMatrix" listed  ## >> but << needs all sub(sub(sub)) classes of "ddenseMatrix" listed
5  ##   -----  in  ../src/Mutils.c  ##   -----  in  ../src/Mutils.c
6    
 ## Should this method return 'from' without duplication when it has  
 ## class dgeMatrix?  
7  setAs("ddenseMatrix", "dgeMatrix",  setAs("ddenseMatrix", "dgeMatrix",
8        function(from) {        function(from) {
9            if (class(from) != "dgeMatrix")            if (class(from) != "dgeMatrix")
10                from <- .Call(dup_mMatrix_as_dgeMatrix, from)                .Call(dup_mMatrix_as_dgeMatrix, from)
11            from            else from
12        })        })
13    
14  ## d(ouble) to l(ogical):  ## d(ouble) to l(ogical):
15  setAs("dgeMatrix", "lgeMatrix", d2l_Matrix)  setAs("dgeMatrix", "lgeMatrix", function(from) d2l_Matrix(from, "dgeMatrix"))
16  setAs("dtrMatrix", "ltrMatrix", d2l_Matrix)  setAs("dsyMatrix", "lsyMatrix", function(from) d2l_Matrix(from, "dsyMatrix"))
17  setAs("dtpMatrix", "ltpMatrix", d2l_Matrix)  setAs("dspMatrix", "lspMatrix", function(from) d2l_Matrix(from, "dspMatrix"))
18  setAs("dsyMatrix", "lsyMatrix", d2l_Matrix)  setAs("dtrMatrix", "ltrMatrix", function(from) d2l_Matrix(from, "dtrMatrix"))
19  setAs("dspMatrix", "lspMatrix", d2l_Matrix)  setAs("dtpMatrix", "ltpMatrix", function(from) d2l_Matrix(from, "dtpMatrix"))
20    
21  setAs("ddenseMatrix", "CsparseMatrix",  setAs("ddenseMatrix", "CsparseMatrix",
22        function(from) {        function(from) {
# Line 32  Line 30 
30        function(from) .Call(dense_to_Csparse, from))        function(from) .Call(dense_to_Csparse, from))
31    
32  setAs("matrix", "CsparseMatrix",  setAs("matrix", "CsparseMatrix",
33        function(from)        function(from) {
34        .Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from)))              if(is.numeric(from))
35                    .Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from))
36                else if(is.logical(from)) ## FIXME: this works, but maybe wastefully
37                    as(Matrix(from, sparse=TRUE), "CsparseMatrix")
38                else stop('not-yet-implemented coercion to "CsparseMatrix"')
39          })
40    
41    
42  ## special case needed in the Matrix function  ## special case needed in the Matrix function
43  setAs("matrix", "dgCMatrix",  setAs("matrix", "dgCMatrix",
# Line 78  Line 82 
82            function(x, y = NULL) callGeneric(as(x, "dgeMatrix")))            function(x, y = NULL) callGeneric(as(x, "dgeMatrix")))
83    
84  setMethod("diag", signature(x = "ddenseMatrix"),  setMethod("diag", signature(x = "ddenseMatrix"),
85            function(x = 1, nrow, ncol = n) callGeneric(as(x, "dgeMatrix")))            function(x, nrow, ncol = n) callGeneric(as(x, "dgeMatrix")))
86    
87  ## These methods cause an infinite loop in pre-2.4.0  ## These methods cause an infinite loop in pre-2.4.0
88  ## setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),  ## setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),
# Line 97  Line 101 
101  setMethod("lu", signature(x = "ddenseMatrix"),  setMethod("lu", signature(x = "ddenseMatrix"),
102            function(x, ...) callGeneric(as(x, "dgeMatrix")))            function(x, ...) callGeneric(as(x, "dgeMatrix")))
103    
104    setMethod("chol", signature(x = "ddenseMatrix", pivot = "ANY"), cholMat)
105    
106  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "missing"),  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "missing"),
107            function(x, logarithm, ...) callGeneric(as(x, "dgeMatrix")))            function(x, logarithm, ...) callGeneric(as(x, "dgeMatrix")))
108    
# Line 115  Line 121 
121            function(x, vectors, ...) callGeneric(as(x, "dgeMatrix"), vectors))            function(x, vectors, ...) callGeneric(as(x, "dgeMatrix"), vectors))
122    
123    
 ## Cheap version: work via "dgeMatrix" and use the group methods there:  
 ## FIXME(?): try to preserve "symmetric", "triangular", ...  
 setMethod("Arith", ##  "+", "-", "*", "^", "%%", "%/%", "/"  
           signature(e1 = "ddenseMatrix", e2 = "ddenseMatrix"),  
           function(e1, e2) callGeneric(as(e1, "dgeMatrix"),  
                                        as(e2, "dgeMatrix")))  
 setMethod("Arith",  
           signature(e1 = "ddenseMatrix", e2 = "numeric"),  
           function(e1, e2) callGeneric(as(e1, "dgeMatrix"), e2))  
 setMethod("Arith",  
           signature(e1 = "numeric", e2 = "ddenseMatrix"),  
           function(e1, e2) callGeneric(e1, as(e2, "dgeMatrix")))  
   
124  setMethod("Math",  setMethod("Math",
125            signature(x = "ddenseMatrix"),            signature(x = "ddenseMatrix"),
126            function(x) callGeneric(as(x, "dgeMatrix")))            function(x) callGeneric(as(x, "dgeMatrix")))
127    
128    
   
 ### for R 2.2.x (and later): -- -- -- -- -- -- -- -- -- -- -- -- -- -- --  
   
 ### cbind2  
 setMethod("cbind2", signature(x = "ddenseMatrix", y = "numeric"),  
           function(x, y) {  
               d <- dim(x); nr <- d[1]; nc <- d[2]  
               y <- rep(y, length.out = nr) # 'silent procrustes'  
               ## beware of (packed) triangular, symmetric, ...  
               x <- as(x, "dgeMatrix")  
               x@x <- c(x@x, as.double(y))  
               x@Dim[2] <- nc + 1:1  
               if(is.character(dn <- x@Dimnames[[2]]))  
                   x@Dimnames[[2]] <- c(dn, "")  
               x  
           })  
 ## the same, (x,y) <-> (y,x):  
 setMethod("cbind2", signature(x = "numeric", y = "ddenseMatrix"),  
           function(x, y) {  
               d <- dim(y); nr <- d[1]; nc <- d[2]  
               x <- rep(x, length.out = nr)  
               y <- as(y, "dgeMatrix")  
               y@x <- c(as.double(x), y@x)  
               y@Dim[2] <- nc + 1:1  
               if(is.character(dn <- y@Dimnames[[2]]))  
                   y@Dimnames[[2]] <- c("", dn)  
               y  
           })  
   
 setMethod("cbind2", signature(x = "ddenseMatrix", y = "matrix"),  
           function(x, y) callGeneric(x, as(y, "dgeMatrix")))  
 setMethod("cbind2", signature(x = "matrix", y = "ddenseMatrix"),  
           function(x, y) callGeneric(as(x, "dgeMatrix"), y))  
   
 setMethod("cbind2", signature(x = "ddenseMatrix", y = "ddenseMatrix"),  
           function(x, y) {  
               nr <- rowCheck(x,y)  
               ncx <- x@Dim[2]  
               ncy <- y@Dim[2]  
               ## beware of (packed) triangular, symmetric, ...  
               hasDN <- !is.null(dnx <- dimnames(x)) |  
               !is.null(dny <- dimnames(y))  
               x <- as(x, "dgeMatrix")  
               y <- as(y, "dgeMatrix")  
               x@x <- c(x@x, y@x)  
               x@Dim[2] <- ncx + ncy  
               if(hasDN) {  
                   ## R and S+ are different in which names they take  
                   ## if they differ -- but there's no warning in any case  
                   rn <- if(!is.null(dnx[[1]])) dnx[[1]] else dny[[1]]  
                   cx <- dnx[[2]] ; cy <- dny[[2]]  
                   cn <- if(is.null(cx) && is.null(cy)) NULL  
                   else c(if(!is.null(cx)) cx else rep.int("", ncx),  
                          if(!is.null(cy)) cy else rep.int("", ncy))  
                   x@Dimnames <- list(rn, cn)  
               }  
               x  
           })  
   
 ### rbind2 -- analogous to cbind2 --- more to do for @x though:  
   
 setMethod("rbind2", signature(x = "ddenseMatrix", y = "numeric"),  
           function(x, y) {  
               if(is.character(dn <- x@Dimnames[[1]])) dn <- c(dn, "")  
               new("dgeMatrix", Dim = x@Dim + 1:0,  
                   Dimnames = list(dn, x@Dimnames[[2]]),  
                   x = c(rbind2(as(x,"matrix"), y)))  
           })  
 ## the same, (x,y) <-> (y,x):  
 setMethod("rbind2", signature(x = "numeric", y = "ddenseMatrix"),  
           function(x, y) {  
               if(is.character(dn <- y@Dimnames[[1]])) dn <- c("", dn)  
               new("dgeMatrix", Dim = y@Dim + 1:0,  
                   Dimnames = list(dn, y@Dimnames[[2]]),  
                   x = c(rbind2(x, as(y,"matrix"))))  
           })  
   
 setMethod("rbind2", signature(x = "ddenseMatrix", y = "matrix"),  
           function(x, y) callGeneric(x, as(y, "dgeMatrix")))  
 setMethod("rbind2", signature(x = "matrix", y = "ddenseMatrix"),  
           function(x, y) callGeneric(as(x, "dgeMatrix"), y))  
   
 setMethod("rbind2", signature(x = "ddenseMatrix", y = "ddenseMatrix"),  
           function(x, y) {  
               nc <- colCheck(x,y)  
               nrx <- x@Dim[1]  
               nry <- y@Dim[1]  
               dn <-  
                   if(!is.null(dnx <- dimnames(x)) |  
                      !is.null(dny <- dimnames(y))) {  
                       ## R and S+ are different in which names they take  
                       ## if they differ -- but there's no warning in any case  
                       list(if(is.null(rx <- dnx[[1]]) && is.null(ry <- dny[[1]]))  
                            NULL else  
                            c(if(!is.null(rx)) rx else rep.int("", nrx),  
                              if(!is.null(ry)) ry else rep.int("", nry)),  
                            if(!is.null(dnx[[2]])) dnx[[2]] else dny[[2]])  
   
                   } else list(NULL, NULL)  
               ## beware of (packed) triangular, symmetric, ...  
               new("dgeMatrix", Dim = c(nrx + nry, nc), Dimnames = dn,  
                   x = c(rbind2(as(x,"matrix"), as(y,"matrix"))))  
           })  
   
129  ### FIXME: band() et al should be extended from "ddense" to "dense" !  ### FIXME: band() et al should be extended from "ddense" to "dense" !
130  ###        However, needs much work to generalize dup_mMatrix_as_dgeMatrix()  ###        However, needs much work to generalize dup_mMatrix_as_dgeMatrix()
131    

Legend:
Removed from v.1575  
changed lines
  Added in v.1747

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