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 1945, Wed Jul 4 18:07:07 2007 UTC revision 2123, Wed Mar 5 08:44:52 2008 UTC
# Line 11  Line 11 
11            else from            else from
12        })        })
13    
14    
15  ## d(ouble) to l(ogical):  ## d(ouble) to l(ogical):
16  setAs("dgeMatrix", "lgeMatrix", function(from) d2l_Matrix(from, "dgeMatrix"))  setAs("dgeMatrix", "lgeMatrix", function(from) d2l_Matrix(from, "dgeMatrix"))
17  setAs("dsyMatrix", "lsyMatrix", function(from) d2l_Matrix(from, "dsyMatrix"))  setAs("dsyMatrix", "lsyMatrix", function(from) d2l_Matrix(from, "dsyMatrix"))
# Line 30  Line 31 
31        function(from) .Call(dense_to_Csparse, from))        function(from) .Call(dense_to_Csparse, from))
32    
33  setAs("matrix", "CsparseMatrix",  setAs("matrix", "CsparseMatrix",
34        function(from) {        function(from) .Call(dense_to_Csparse, from))
35              if(is.numeric(from))  ##       function(from) {
36                  .Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from))  ##          if(is.numeric(from))
37              else if(is.logical(from)) ## FIXME: this works, but maybe wastefully  ##              .Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from))
38                  as(Matrix(from, sparse=TRUE), "CsparseMatrix")  ##          else if(is.logical(from)) ## FIXME: this works, but maybe wastefully
39              else stop('not-yet-implemented coercion to "CsparseMatrix"')  ##                 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  ## special case needed in the Matrix function
# Line 60  Line 62 
62  ## dgeMatrix. Methods for special forms override these.  ## dgeMatrix. Methods for special forms override these.
63    
64  setMethod("norm", signature(x = "ddenseMatrix", type = "missing"),  setMethod("norm", signature(x = "ddenseMatrix", type = "missing"),
65            function(x, type, ...) callGeneric(as(x, "dgeMatrix")))            function(x, type, ...) norm(as(x, "dgeMatrix")))
66    
67  setMethod("norm", signature(x = "ddenseMatrix", type = "character"),  setMethod("norm", signature(x = "ddenseMatrix", type = "character"),
68            function(x, type, ...) callGeneric(as(x, "dgeMatrix"), type))            function(x, type, ...) norm(as(x, "dgeMatrix"), type))
69    
70  setMethod("rcond", signature(x = "ddenseMatrix", type = "missing"),  setMethod("rcond", signature(x = "ddenseMatrix", type = "missing"),
71            function(x, type, ...) callGeneric(as(x, "dgeMatrix")))            function(x, type, ...) rcond(as(x, "dgeMatrix")))
72    
73  setMethod("rcond", signature(x = "ddenseMatrix", type = "character"),  setMethod("rcond", signature(x = "ddenseMatrix", type = "character"),
74            function(x, type, ...) callGeneric(as(x, "dgeMatrix"), type))            function(x, type, ...) rcond(as(x, "dgeMatrix"), type))
75    
76  ## Not really useful; now require *identical* class for result:  ## Not really useful; now require *identical* class for result:
77  ## setMethod("t", signature(x = "ddenseMatrix"),  ## setMethod("t", signature(x = "ddenseMatrix"),
78  ##        function(x) callGeneric(as(x, "dgeMatrix")))  ##        function(x) callGeneric(as(x, "dgeMatrix")))
79    
80  setMethod("tcrossprod", signature(x = "ddenseMatrix", y = "missing"),  setMethod("tcrossprod", signature(x = "ddenseMatrix", y = "missing"),
81            function(x, y = NULL) callGeneric(as(x, "dgeMatrix")))            function(x, y = NULL) tcrossprod(as(x, "dgeMatrix")))
82    
83  setMethod("crossprod", signature(x = "ddenseMatrix", y = "missing"),  setMethod("crossprod", signature(x = "ddenseMatrix", y = "missing"),
84            function(x, y = NULL) callGeneric(as(x, "dgeMatrix")))            function(x, y = NULL) crossprod(as(x, "dgeMatrix")))
85    
86  setMethod("diag", signature(x = "ddenseMatrix"),  setMethod("diag", signature(x = "ddenseMatrix"),
87            function(x, nrow, ncol = n) callGeneric(as(x, "dgeMatrix")))            function(x, nrow, ncol) diag(as(x, "dgeMatrix")))
88    
89  setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),  setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),
90            function(a, b, ...) callGeneric(as(a, "dgeMatrix")))            function(a, b, ...) solve(as(a, "dgeMatrix")))
91    
92  setMethod("solve", signature(a = "ddenseMatrix", b = "ANY"),  setMethod("solve", signature(a = "ddenseMatrix", b = "ANY"),
93            function(a, b, ...) callGeneric(as(a, "dgeMatrix"), b))            function(a, b, ...) solve(as(a, "dgeMatrix"), b))
94    
95  ## General method for dense matrix multiplication in case specific methods  ## General method for dense matrix multiplication in case specific methods
96  ## have not been defined.  ## have not been defined.
# Line 98  Line 100 
100            valueClass = "dgeMatrix")            valueClass = "dgeMatrix")
101    
102  setMethod("lu", signature(x = "ddenseMatrix"),  setMethod("lu", signature(x = "ddenseMatrix"),
103            function(x, ...) callGeneric(as(x, "dgeMatrix")))            function(x, ...) lu(as(x, "dgeMatrix")))
104    
105  setMethod("chol", signature(x = "ddenseMatrix", pivot = "ANY"), cholMat)  setMethod("chol", signature(x = "ddenseMatrix", pivot = "ANY"), cholMat)
106    
107  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "missing"),  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "missing"),
108            function(x, logarithm, ...) callGeneric(as(x, "dgeMatrix")))            function(x, logarithm, ...) determinant(as(x, "dgeMatrix")))
109    
110  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "logical"),  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "logical"),
111            function(x, logarithm, ...)            function(x, logarithm, ...)
112            callGeneric(as(x, "dgeMatrix"), logarithm))            determinant(as(x, "dgeMatrix"), logarithm))
113    
114  ## now done for "dMatrix":  ## now done for "dMatrix":
115  ## setMethod("expm", signature(x = "ddenseMatrix"),  ## setMethod("expm", signature(x = "ddenseMatrix"),
116  ##           function(x) callGeneric(as(x, "dgeMatrix")))  ##           function(x) callGeneric(as(x, "dgeMatrix")))
117    
 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))  
   
   
118  setMethod("Math",  setMethod("Math",
119            signature(x = "ddenseMatrix"),            signature(x = "ddenseMatrix"),
120            function(x) callGeneric(as(x, "dgeMatrix")))            function(x) callGeneric(as(x, "dgeMatrix")))
121    
122    
 ### FIXME: band() et al should be extended from "ddense" to "dense" !  
 ###        However, needs much work to generalize dup_mMatrix_as_dgeMatrix()  
123    
124  ## 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, ...) {  
125                k <- as.integer(k[1])                k <- as.integer(k[1])
126                dd <- dim(x); sqr <- dd[1] == dd[2]      d <- dim(x)
127                stopifnot(-dd[1] <= k, k <= dd[1]) # had k <= 0      stopifnot(-d[1] <= k, k <= d[1]) # had k <= 0
128                ## returns "lower triangular" if k <= 0 && sqr                ## returns "lower triangular" if k <= 0 && sqr
129                .Call(ddense_band, x, -dd[1], k)      .Call(dense_band, x, -d[1], k)
130            })  }
131    ## NB: have extra tril(), triu() methods for symmetric ["dsy" and "dsp"] and
132    ##     for triangular ["dtr" and "dtp"]
133    setMethod("tril", "denseMatrix", .trilDense)
134    setMethod("tril",      "matrix", .trilDense)
135    
136  setMethod("triu", "ddenseMatrix",  .triuDense <- function(x, k = 0, ...) {
           function(x, k = 0, ...) {  
137                k <- as.integer(k[1])                k <- as.integer(k[1])
138                dd <- dim(x); sqr <- dd[1] == dd[2]      d <- dim(x)
139                stopifnot(-dd[1] <= k, k <= dd[1]) # had k >= 0      stopifnot(-d[1] <= k, k <= d[1]) # had k >= 0
140                ## returns "upper triangular" if k >= 0                ## returns "upper triangular" if k >= 0
141                .Call(ddense_band, x, k, dd[2])      .Call(dense_band, x, k, d[2])
142            })  }
143    setMethod("triu", "denseMatrix", .triuDense)
144    setMethod("triu",      "matrix", .triuDense)
145    
146  setMethod("band", "ddenseMatrix",  .bandDense <- function(x, k1, k2, ...) {
           function(x, k1, k2, ...) {  
147                k1 <- as.integer(k1[1])                k1 <- as.integer(k1[1])
148                k2 <- as.integer(k2[1])                k2 <- as.integer(k2[1])
149                dd <- dim(x); sqr <- dd[1] == dd[2]                dd <- dim(x); sqr <- dd[1] == dd[2]
150                stopifnot(-dd[1] <= k1, k1 <= k2, k2 <= dd[1])                stopifnot(-dd[1] <= k1, k1 <= k2, k2 <= dd[1])
151                r <- .Call(ddense_band, x, k1, k2)      r <- .Call(dense_band, x, k1, k2)
152                if (k1 < 0  &&  k1 == -k2  && isSymmetric(x)) ## symmetric      if (sqr &&  k1 < 0 &&  k1 == -k2  && isSymmetric(x)) ## symmetric
153                    as(r, paste(.M.kind(x), "syMatrix", sep=''))          forceSymmetric(r)
154                else                else
155                    r                    r
156            })  }
157    setMethod("band", "denseMatrix", .bandDense)
158    setMethod("band",      "matrix", .bandDense)
159    
160    
161    setMethod("symmpart", signature(x = "ddenseMatrix"),
162              function(x) .Call(ddense_symmpart, x))
163    setMethod("skewpart", signature(x = "ddenseMatrix"),
164              function(x) .Call(ddense_skewpart, x))
165    

Legend:
Removed from v.1945  
changed lines
  Added in v.2123

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