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 2123, Wed Mar 5 08:44:52 2008 UTC revision 2472, Sat Sep 19 06:10:48 2009 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))
           if (class(from) != "dgeMatrix")  
               .Call(dup_mMatrix_as_dgeMatrix, from)  
           else from  
       })  
9    
10    setAs("ddenseMatrix", "matrix",
11          function(from) as(as(from, "dgeMatrix"), "matrix"))
12    
13  ## d(ouble) to l(ogical):  ## d(ouble) to l(ogical):
14  setAs("dgeMatrix", "lgeMatrix", function(from) d2l_Matrix(from, "dgeMatrix"))  setAs("dgeMatrix", "lgeMatrix", function(from) d2l_Matrix(from, "dgeMatrix"))
# Line 67  Line 65 
65  setMethod("norm", signature(x = "ddenseMatrix", type = "character"),  setMethod("norm", signature(x = "ddenseMatrix", type = "character"),
66            function(x, type, ...) norm(as(x, "dgeMatrix"), type))            function(x, type, ...) norm(as(x, "dgeMatrix"), type))
67    
68  setMethod("rcond", signature(x = "ddenseMatrix", type = "missing"),  setMethod("rcond", signature(x = "ddenseMatrix", norm = "missing"),
69            function(x, type, ...) rcond(as(x, "dgeMatrix")))            function(x, norm, ...) rcond(as(x, "dgeMatrix"), ...))
70    
71  setMethod("rcond", signature(x = "ddenseMatrix", type = "character"),  setMethod("rcond", signature(x = "ddenseMatrix", norm = "character"),
72            function(x, type, ...) rcond(as(x, "dgeMatrix"), type))            function(x, norm, ...) rcond(as(x, "dgeMatrix"), norm, ...))
73    
74  ## Not really useful; now require *identical* class for result:  ## Not really useful; now require *identical* class for result:
75  ## setMethod("t", signature(x = "ddenseMatrix"),  ## setMethod("t", signature(x = "ddenseMatrix"),
76  ##        function(x) callGeneric(as(x, "dgeMatrix")))  ##        function(x) callGeneric(as(x, "dgeMatrix")))
77    
 setMethod("tcrossprod", signature(x = "ddenseMatrix", y = "missing"),  
           function(x, y = NULL) tcrossprod(as(x, "dgeMatrix")))  
   
 setMethod("crossprod", signature(x = "ddenseMatrix", y = "missing"),  
           function(x, y = NULL) crossprod(as(x, "dgeMatrix")))  
   
78  setMethod("diag", signature(x = "ddenseMatrix"),  setMethod("diag", signature(x = "ddenseMatrix"),
79            function(x, nrow, ncol) diag(as(x, "dgeMatrix")))            function(x, nrow, ncol) diag(as(x, "dgeMatrix")))
80    
81  setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),  setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),
82            function(a, b, ...) solve(as(a, "dgeMatrix")))            function(a, b, ...) solve(as(a, "dgeMatrix")))
83    
84  setMethod("solve", signature(a = "ddenseMatrix", b = "ANY"),  for(.b in c("Matrix","ANY")) ## << against ambiguity notes
85    setMethod("solve", signature(a = "ddenseMatrix", b = .b),
86            function(a, b, ...) solve(as(a, "dgeMatrix"), b))            function(a, b, ...) solve(as(a, "dgeMatrix"), b))
87    for(.b in c("matrix","numeric")) ## << against ambiguity notes
88  ## General method for dense matrix multiplication in case specific methods  setMethod("solve", signature(a = "ddenseMatrix", b = .b),
89  ## 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")  
90    
91  setMethod("lu", signature(x = "ddenseMatrix"),  setMethod("lu", signature(x = "ddenseMatrix"),
92            function(x, ...) lu(as(x, "dgeMatrix")))            function(x, ...) lu(as(x, "dgeMatrix")))
93    
94  setMethod("chol", signature(x = "ddenseMatrix", pivot = "ANY"), cholMat)  setMethod("chol", signature(x = "ddenseMatrix"), cholMat)
95    
96  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "missing"),  setMethod("determinant", signature(x = "ddenseMatrix", logarithm = "missing"),
97            function(x, logarithm, ...) determinant(as(x, "dgeMatrix")))            function(x, logarithm, ...) determinant(as(x, "dgeMatrix")))
# Line 146  Line 135 
135  .bandDense <- function(x, k1, k2, ...) {  .bandDense <- function(x, k1, k2, ...) {
136      k1 <- as.integer(k1[1])      k1 <- as.integer(k1[1])
137      k2 <- as.integer(k2[1])      k2 <- as.integer(k2[1])
138      dd <- dim(x); sqr <- dd[1] == dd[2]      dd <- dim(x)
139      stopifnot(-dd[1] <= k1, k1 <= k2, k2 <= dd[1])      sqr <- dd[1] == dd[2]
140        stopifnot(-dd[1] <= k1, k1 <= k2, k2 <= dd[2])
141      r <- .Call(dense_band, x, k1, k2)      r <- .Call(dense_band, x, k1, k2)
142      if (sqr &&  k1 < 0 &&  k1 == -k2  && isSymmetric(x)) ## symmetric      if (sqr &&  k1 < 0 &&  k1 == -k2  && isSymmetric(x)) ## symmetric
143          forceSymmetric(r)          forceSymmetric(r)

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

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