Diff of /pkg/R/ddenseMatrix.R

Parent Directory | Revision Log | Patch

	revision 1453, Sun Aug 27 16:16:35 2006 UTC	revision 1575, Mon Sep 18 14:47:40 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		.Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from)))
37
38		## special case needed in the Matrix function
39		setAs("matrix", "dgCMatrix",
40		function(from) {
41		storage.mode(from) <- "double"
42		.Call(dense_to_Csparse, from)
43		})
44
45		setAs("numeric", "CsparseMatrix",
46		function(from)
47		.Call(dense_to_Csparse, .Call(dup_mMatrix_as_dgeMatrix, from)))
48
49	setMethod("as.numeric", signature(x = "ddenseMatrix"),	setMethod("as.numeric", signature(x = "ddenseMatrix"),
50	function(x, ...) as(x, "dgeMatrix")@x)	function(x, ...) as(x, "dgeMatrix")@x)
51
#	Line 47	Line 80
80	setMethod("diag", signature(x = "ddenseMatrix"),	setMethod("diag", signature(x = "ddenseMatrix"),
81	function(x = 1, nrow, ncol = n) callGeneric(as(x, "dgeMatrix")))	function(x = 1, nrow, ncol = n) callGeneric(as(x, "dgeMatrix")))
82
83	setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),	## These methods cause an infinite loop in pre-2.4.0
84	function(a, b, ...) callGeneric(as(a, "dgeMatrix")))	## setMethod("solve", signature(a = "ddenseMatrix", b = "missing"),
85		##           function(a, b, ...) callGeneric(as(a, "dgeMatrix")))
86	setMethod("solve", signature(a = "ddenseMatrix", b = "ANY"),
87	function(a, b, ...) callGeneric(as(a, "dgeMatrix"), b))	## setMethod("solve", signature(a = "ddenseMatrix", b = "ANY"),
88		##           function(a, b, ...) callGeneric(as(a, "dgeMatrix"), b))
89
90		## General method for dense matrix multiplication in case specific methods
91		## have not been defined.
92		setMethod("%*%", signature(x = "ddenseMatrix", y = "ddenseMatrix"),
93		function(x, y) .Call(dgeMatrix_matrix_mm,
94		.Call(dup_mMatrix_as_dgeMatrix, x), y, FALSE),
95		valueClass = "dgeMatrix")
96
97	setMethod("lu", signature(x = "ddenseMatrix"),	setMethod("lu", signature(x = "ddenseMatrix"),
98	function(x, ...) callGeneric(as(x, "dgeMatrix")))	function(x, ...) callGeneric(as(x, "dgeMatrix")))
#	Line 195	Line 236
236	new("dgeMatrix", Dim = c(nrx + nry, nc), Dimnames = dn,	new("dgeMatrix", Dim = c(nrx + nry, nc), Dimnames = dn,
237	x = c(rbind2(as(x,"matrix"), as(y,"matrix"))))	x = c(rbind2(as(x,"matrix"), as(y,"matrix"))))
238	})	})
239
240		### FIXME: band() et al should be extended from "ddense" to "dense" !
241		###        However, needs much work to generalize dup_mMatrix_as_dgeMatrix()
242
243	## NB: have extra tril(), triu() methods for symmetric ["dsy" and "dsp"] and	## NB: have extra tril(), triu() methods for symmetric ["dsy" and "dsp"] and
244	##     for triangular ["dtr" and "dtp"]	##     for triangular ["dtr" and "dtp"]
245	setMethod("tril", "ddenseMatrix",	setMethod("tril", "ddenseMatrix",

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

root@r-forge.r-project.org	ViewVC Help
Powered by ViewVC 1.0.0