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 1447, Fri Aug 25 20:38:36 2006 UTC revision 1618, Fri Oct 6 15:44:01 2006 UTC
# Line 3  Line 3 
3  ## This replaces many "d..Matrix" -> "dgeMatrix" ones  ## This replaces many "d..Matrix" -> "dgeMatrix" ones
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    
7    ## Should this method return 'from' without duplication when it has
8    ## class dgeMatrix?
9  setAs("ddenseMatrix", "dgeMatrix",  setAs("ddenseMatrix", "dgeMatrix",
10        function(from) .Call(dup_mMatrix_as_dgeMatrix, from))        function(from) {
11              if (class(from) != "dgeMatrix")
12                  from <- .Call(dup_mMatrix_as_dgeMatrix, from)
13              from
14          })
15    
16  ## d(ouble) to l(ogical):  ## d(ouble) to l(ogical):
17  setAs("dgeMatrix", "lgeMatrix", d2l_Matrix)  setAs("dgeMatrix", "lgeMatrix", d2l_Matrix)
# Line 13  Line 20 
20  setAs("dsyMatrix", "lsyMatrix", d2l_Matrix)  setAs("dsyMatrix", "lsyMatrix", d2l_Matrix)
21  setAs("dspMatrix", "lspMatrix", d2l_Matrix)  setAs("dspMatrix", "lspMatrix", d2l_Matrix)
22    
23    setAs("ddenseMatrix", "CsparseMatrix",
24          function(from) {
25              if (class(from) != "dgeMatrix")
26                  from <- .Call(dup_mMatrix_as_dgeMatrix, from)
27              .Call(dense_to_Csparse, from)
28          })
29    
30    ## special case
31    setAs("dgeMatrix", "dgCMatrix",
32          function(from) .Call(dense_to_Csparse, from))
33    
34    setAs("matrix", "CsparseMatrix",
35          function(from) {
36                if(is.numeric(from))
37                    .Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from))
38                else if(is.logical(from)) ## FIXME: this works, but maybe wastefully
39                    as(Matrix(from, sparse=TRUE), "CsparseMatrix")
40                else stop('not-yet-implemented coercion to "CsparseMatrix"')
41          })
42    
43    
44    ## special case needed in the Matrix function
45    setAs("matrix", "dgCMatrix",
46          function(from) {
47              storage.mode(from) <- "double"
48              .Call(dense_to_Csparse, from)
49          })
50    
51    setAs("numeric", "CsparseMatrix",
52          function(from)
53          .Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from)))
54    
55  setMethod("as.numeric", signature(x = "ddenseMatrix"),  setMethod("as.numeric", signature(x = "ddenseMatrix"),
56            function(x, ...) as(x, "dgeMatrix")@x)            function(x, ...) as(x, "dgeMatrix")@x)
57    
# Line 47  Line 86 
86  setMethod("diag", signature(x = "ddenseMatrix"),  setMethod("diag", signature(x = "ddenseMatrix"),
87            function(x = 1, nrow, ncol = n) callGeneric(as(x, "dgeMatrix")))            function(x = 1, nrow, ncol = n) callGeneric(as(x, "dgeMatrix")))
88    
89  setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),  ## These methods cause an infinite loop in pre-2.4.0
90            function(a, b, ...) callGeneric(as(a, "dgeMatrix")))  ## setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),
91    ##           function(a, b, ...) callGeneric(as(a, "dgeMatrix")))
92  setMethod("solve", signature(a = "ddenseMatrix", b = "ANY"),  
93            function(a, b, ...) callGeneric(as(a, "dgeMatrix"), b))  ## setMethod("solve", signature(a = "ddenseMatrix", b = "ANY"),
94    ##           function(a, b, ...) callGeneric(as(a, "dgeMatrix"), b))
95    
96    ## General method for dense matrix multiplication in case specific methods
97    ## have not been defined.
98    setMethod("%*%", signature(x = "ddenseMatrix", y = "ddenseMatrix"),
99              function(x, y) .Call(dgeMatrix_matrix_mm,
100                                   .Call(dup_mMatrix_as_dgeMatrix, x), y, FALSE),
101              valueClass = "dgeMatrix")
102    
103  setMethod("lu", signature(x = "ddenseMatrix"),  setMethod("lu", signature(x = "ddenseMatrix"),
104            function(x, ...) callGeneric(as(x, "dgeMatrix")))            function(x, ...) callGeneric(as(x, "dgeMatrix")))
# Line 195  Line 242 
242                new("dgeMatrix", Dim = c(nrx + nry, nc), Dimnames = dn,                new("dgeMatrix", Dim = c(nrx + nry, nc), Dimnames = dn,
243                    x = c(rbind2(as(x,"matrix"), as(y,"matrix"))))                    x = c(rbind2(as(x,"matrix"), as(y,"matrix"))))
244            })            })
245    
246    ### FIXME: band() et al should be extended from "ddense" to "dense" !
247    ###        However, needs much work to generalize dup_mMatrix_as_dgeMatrix()
248    
249    ## NB: have extra tril(), triu() methods for symmetric ["dsy" and "dsp"] and
250    ##     for triangular ["dtr" and "dtp"]
251    setMethod("tril", "ddenseMatrix",
252              function(x, k = 0, ...) {
253                  k <- as.integer(k[1])
254                  dd <- dim(x); sqr <- dd[1] == dd[2]
255                  stopifnot(-dd[1] <= k, k <= dd[1]) # had k <= 0
256                  ## returns "lower triangular" if k <= 0 && sqr
257                  .Call(ddense_band, x, -dd[1], k)
258              })
259    
260    setMethod("triu", "ddenseMatrix",
261              function(x, k = 0, ...) {
262                  k <- as.integer(k[1])
263                  dd <- dim(x); sqr <- dd[1] == dd[2]
264                  stopifnot(-dd[1] <= k, k <= dd[1]) # had k >= 0
265                  ## returns "upper triangular" if k >= 0
266                  .Call(ddense_band, x, k, dd[2])
267              })
268    
269    setMethod("band", "ddenseMatrix",
270              function(x, k1, k2, ...) {
271                  k1 <- as.integer(k1[1])
272                  k2 <- as.integer(k2[1])
273                  dd <- dim(x); sqr <- dd[1] == dd[2]
274                  stopifnot(-dd[1] <= k1, k1 <= k2, k2 <= dd[1])
275                  r <- .Call(ddense_band, x, k1, k2)
276                  if (k1 < 0  &&  k1 == -k2  && isSymmetric(x)) ## symmetric
277                      as(r, paste(.M.kind(x), "syMatrix", sep=''))
278                  else
279                      r
280              })

Legend:
Removed from v.1447  
changed lines
  Added in v.1618

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