SCM

SCM Repository

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

Diff of /pkg/Matrix/R/ddenseMatrix.R

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

revision 1738, Tue Jan 23 17:17:15 2007 UTC revision 2551, Sat Jun 19 20:45:45 2010 UTC
# Line 5  Line 5 
5  ##   -----  in  ../src/Mutils.c  ##   -----  in  ../src/Mutils.c
6    
7  setAs("ddenseMatrix", "dgeMatrix",  setAs("ddenseMatrix", "dgeMatrix",
8        function(from) {        function(from) .Call(dup_mMatrix_as_dgeMatrix, from))
9            if (class(from) != "dgeMatrix")  
10                .Call(dup_mMatrix_as_dgeMatrix, from)  setAs("ddenseMatrix", "matrix",
11            else from        function(from) as(as(from, "dgeMatrix"), "matrix"))
       })  
12    
13  ## d(ouble) to l(ogical):  ## d(ouble) to l(ogical):
14  setAs("dgeMatrix", "lgeMatrix", d2l_Matrix)  setAs("dgeMatrix", "lgeMatrix", function(from) d2l_Matrix(from, "dgeMatrix"))
15  setAs("dtrMatrix", "ltrMatrix", d2l_Matrix)  setAs("dsyMatrix", "lsyMatrix", function(from) d2l_Matrix(from, "dsyMatrix"))
16  setAs("dtpMatrix", "ltpMatrix", d2l_Matrix)  setAs("dspMatrix", "lspMatrix", function(from) d2l_Matrix(from, "dspMatrix"))
17  setAs("dsyMatrix", "lsyMatrix", d2l_Matrix)  setAs("dtrMatrix", "ltrMatrix", function(from) d2l_Matrix(from, "dtrMatrix"))
18  setAs("dspMatrix", "lspMatrix", d2l_Matrix)  setAs("dtpMatrix", "ltpMatrix", function(from) d2l_Matrix(from, "dtpMatrix"))
19    
20    if(FALSE) ## FIXME, this fails for ("dtpMatrix" -> "CsparseMatrix") where .dense2C() works
21  setAs("ddenseMatrix", "CsparseMatrix",  setAs("ddenseMatrix", "CsparseMatrix",
22        function(from) {        function(from) {
23            if (class(from) != "dgeMatrix")            if (class(from) != "dgeMatrix") # don't lose symmetry/triangularity/...
24                from <- .Call(dup_mMatrix_as_dgeMatrix, from)                as_Csparse(from)
25            .Call(dense_to_Csparse, from)            else .Call(dense_to_Csparse, from)
26        })        })
27    
28  ## special case  ## special case
# Line 30  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) .Call(dense_to_Csparse, from))
34              if(is.numeric(from))  ##       function(from) {
35                  .Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from))  ##          if(is.numeric(from))
36              else if(is.logical(from)) ## FIXME: this works, but maybe wastefully  ##              .Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from))
37                  as(Matrix(from, sparse=TRUE), "CsparseMatrix")  ##          else if(is.logical(from)) ## FIXME: this works, but maybe wastefully
38              else stop('not-yet-implemented coercion to "CsparseMatrix"')  ##                 as(Matrix(from, sparse=TRUE), "CsparseMatrix")
39        })  ##          else stop('not-yet-implemented coercion to "CsparseMatrix"')
40    ##       })
41    
42    
43  ## special case needed in the Matrix function  ## special case needed in the Matrix function
# Line 60  Line 61 
61  ## dgeMatrix. Methods for special forms override these.  ## dgeMatrix. Methods for special forms override these.
62    
63  setMethod("norm", signature(x = "ddenseMatrix", type = "missing"),  setMethod("norm", signature(x = "ddenseMatrix", type = "missing"),
64            function(x, type, ...) callGeneric(as(x, "dgeMatrix")))            function(x, type, ...) norm(as(x, "dgeMatrix")))
65    
66  setMethod("norm", signature(x = "ddenseMatrix", type = "character"),  setMethod("norm", signature(x = "ddenseMatrix", type = "character"),
67            function(x, type, ...) callGeneric(as(x, "dgeMatrix"), type))            function(x, type, ...) norm(as(x, "dgeMatrix"), type))
68    
69  setMethod("rcond", signature(x = "ddenseMatrix", type = "missing"),  setMethod("rcond", signature(x = "ddenseMatrix", norm = "missing"),
70            function(x, type, ...) callGeneric(as(x, "dgeMatrix")))            function(x, norm, ...) rcond(as(x, "dgeMatrix"), ...))
71    
72  setMethod("rcond", signature(x = "ddenseMatrix", type = "character"),  setMethod("rcond", signature(x = "ddenseMatrix", norm = "character"),
73            function(x, type, ...) callGeneric(as(x, "dgeMatrix"), type))            function(x, norm, ...) rcond(as(x, "dgeMatrix"), norm, ...))
74    
75  ## Not really useful; now require *identical* class for result:  ## Not really useful; now require *identical* class for result:
76  ## setMethod("t", signature(x = "ddenseMatrix"),  ## setMethod("t", signature(x = "ddenseMatrix"),
77  ##        function(x) callGeneric(as(x, "dgeMatrix")))  ##        function(x) callGeneric(as(x, "dgeMatrix")))
78    
 setMethod("tcrossprod", signature(x = "ddenseMatrix", y = "missing"),  
           function(x, y = NULL) callGeneric(as(x, "dgeMatrix")))  
   
 setMethod("crossprod", signature(x = "ddenseMatrix", y = "missing"),  
           function(x, y = NULL) callGeneric(as(x, "dgeMatrix")))  
   
79  setMethod("diag", signature(x = "ddenseMatrix"),  setMethod("diag", signature(x = "ddenseMatrix"),
80            function(x = 1, nrow, ncol = n) callGeneric(as(x, "dgeMatrix")))            function(x, nrow, ncol) diag(as(x, "dgeMatrix")))
81    
82  ## These methods cause an infinite loop in pre-2.4.0  setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),
83  ## setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),            function(a, b, ...) solve(as(a, "dgeMatrix")))
84  ##           function(a, b, ...) callGeneric(as(a, "dgeMatrix")))  
85    for(.b in c("Matrix","ANY")) ## << against ambiguity notes
86  ## setMethod("solve", signature(a = "ddenseMatrix", b = "ANY"),  setMethod("solve", signature(a = "ddenseMatrix", b = .b),
87  ##           function(a, b, ...) callGeneric(as(a, "dgeMatrix"), b))            function(a, b, ...) solve(as(a, "dgeMatrix"), b))
88    for(.b in c("matrix","numeric")) ## << against ambiguity notes
89  ## General method for dense matrix multiplication in case specific methods  setMethod("solve", signature(a = "ddenseMatrix", b = .b),
90  ## have not been defined.            function(a, b, ...) solve(as(a, "dgeMatrix"), Matrix(b)))
 setMethod("%*%", signature(x = "ddenseMatrix", y = "ddenseMatrix"),  
           function(x, y) .Call(dgeMatrix_matrix_mm,  
                                .Call(dup_mMatrix_as_dgeMatrix, x), y, FALSE),  
           valueClass = "dgeMatrix")  
91    
92  setMethod("lu", signature(x = "ddenseMatrix"),  setMethod("lu", signature(x = "ddenseMatrix"),
93            function(x, ...) callGeneric(as(x, "dgeMatrix")))            function(x, ...) lu(as(x, "dgeMatrix"), ...))
94    
95  setMethod("chol", signature(x = "ddenseMatrix", pivot = "ANY"), cholMat)  setMethod("chol", signature(x = "ddenseMatrix"), cholMat)
96    
97  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "missing"),  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "missing"),
98            function(x, logarithm, ...) callGeneric(as(x, "dgeMatrix")))            function(x, logarithm, ...) determinant(as(x, "dgeMatrix")))
99    
100  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "logical"),  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "logical"),
101            function(x, logarithm, ...)            function(x, logarithm, ...)
102            callGeneric(as(x, "dgeMatrix"), logarithm))            determinant(as(x, "dgeMatrix"), logarithm))
103    
104  ## now done for "dMatrix":  ## now done for "dMatrix":
105  ## setMethod("expm", signature(x = "ddenseMatrix"),  ## setMethod("expm", signature(x = "ddenseMatrix"),
106  ##           function(x) callGeneric(as(x, "dgeMatrix")))  ##           function(x) callGeneric(as(x, "dgeMatrix")))
107    
 setMethod("Schur", signature(x = "ddenseMatrix", vectors = "missing"),  
           function(x, vectors, ...) callGeneric(as(x, "dgeMatrix")))  
   
 setMethod("Schur", signature(x = "ddenseMatrix", vectors = "logical"),  
           function(x, vectors, ...) callGeneric(as(x, "dgeMatrix"), vectors))  
   
   
108  setMethod("Math",  setMethod("Math",
109            signature(x = "ddenseMatrix"),            signature(x = "ddenseMatrix"),
110            function(x) callGeneric(as(x, "dgeMatrix")))            function(x) callGeneric(as(x, "dgeMatrix")))
111    
112    
 ### FIXME: band() et al should be extended from "ddense" to "dense" !  
 ###        However, needs much work to generalize dup_mMatrix_as_dgeMatrix()  
113    
114  ## NB: have extra tril(), triu() methods for symmetric ["dsy" and "dsp"] and  .trilDense <- function(x, k = 0, ...) {
 ##     for triangular ["dtr" and "dtp"]  
 setMethod("tril", "ddenseMatrix",  
           function(x, k = 0, ...) {  
115                k <- as.integer(k[1])                k <- as.integer(k[1])
116                dd <- dim(x); sqr <- dd[1] == dd[2]      d <- dim(x)
117                stopifnot(-dd[1] <= k, k <= dd[1]) # had k <= 0      stopifnot(-d[1] <= k, k <= d[1]) # had k <= 0
118                ## returns "lower triangular" if k <= 0 && sqr                ## returns "lower triangular" if k <= 0 && sqr
119                .Call(ddense_band, x, -dd[1], k)      .Call(dense_band, x, -d[1], k)
120            })  }
121    ## NB: have extra tril(), triu() methods for symmetric ["dsy" and "dsp"] and
122    ##     for triangular ["dtr" and "dtp"]
123    setMethod("tril", "denseMatrix", .trilDense)
124    setMethod("tril",      "matrix", .trilDense)
125    
126  setMethod("triu", "ddenseMatrix",  .triuDense <- function(x, k = 0, ...) {
           function(x, k = 0, ...) {  
127                k <- as.integer(k[1])                k <- as.integer(k[1])
128                dd <- dim(x); sqr <- dd[1] == dd[2]      d <- dim(x)
129                stopifnot(-dd[1] <= k, k <= dd[1]) # had k >= 0      stopifnot(-d[1] <= k, k <= d[1]) # had k >= 0
130                ## returns "upper triangular" if k >= 0                ## returns "upper triangular" if k >= 0
131                .Call(ddense_band, x, k, dd[2])      .Call(dense_band, x, k, d[2])
132            })  }
133    setMethod("triu", "denseMatrix", .triuDense)
134    setMethod("triu",      "matrix", .triuDense)
135    
136  setMethod("band", "ddenseMatrix",  .bandDense <- function(x, k1, k2, ...) {
           function(x, k1, k2, ...) {  
137                k1 <- as.integer(k1[1])                k1 <- as.integer(k1[1])
138                k2 <- as.integer(k2[1])                k2 <- as.integer(k2[1])
139                dd <- dim(x); sqr <- dd[1] == dd[2]      dd <- dim(x)
140                stopifnot(-dd[1] <= k1, k1 <= k2, k2 <= dd[1])      sqr <- dd[1] == dd[2]
141                r <- .Call(ddense_band, x, k1, k2)      stopifnot(-dd[1] <= k1, k1 <= k2, k2 <= dd[2])
142                if (k1 < 0  &&  k1 == -k2  && isSymmetric(x)) ## symmetric      r <- .Call(dense_band, x, k1, k2)
143                    as(r, paste(.M.kind(x), "syMatrix", sep=''))      if (sqr &&  k1 < 0 &&  k1 == -k2  && isSymmetric(x)) ## symmetric
144            forceSymmetric(r)
145                else                else
146                    r                    r
147            })  }
148    setMethod("band", "denseMatrix", .bandDense)
149    setMethod("band",      "matrix", .bandDense)
150    
151    
152    setMethod("symmpart", signature(x = "ddenseMatrix"),
153              function(x) .Call(ddense_symmpart, x))
154    setMethod("skewpart", signature(x = "ddenseMatrix"),
155              function(x) .Call(ddense_skewpart, x))
156    

Legend:
Removed from v.1738  
changed lines
  Added in v.2551

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