SCM

SCM Repository

[matrix] Diff of /pkg/Matrix/src/dtCMatrix.c
ViewVC logotype

Diff of /pkg/Matrix/src/dtCMatrix.c

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

revision 890, Thu Sep 1 17:18:08 2005 UTC revision 945, Wed Sep 28 08:54:28 2005 UTC
# Line 4  Line 4 
4  SEXP tsc_validate(SEXP x)  SEXP tsc_validate(SEXP x)
5  {  {
6      return triangularMatrix_validate(x);      return triangularMatrix_validate(x);
7      /* see ./dtpMatrix.c as example to do more testing here */      /* see ./dsCMatrix.c or ./dtpMatrix.c  on how to do more testing here */
8  }  }
9    
10  SEXP tsc_transpose(SEXP x)  SEXP tsc_transpose(SEXP x)
11  {  {
12      SEXP      SEXP ans = PROTECT(NEW_OBJECT(MAKE_CLASS("dtCMatrix"))),
         ans = PROTECT(NEW_OBJECT(MAKE_CLASS("dtCMatrix"))),  
13          islot = GET_SLOT(x, Matrix_iSym);          islot = GET_SLOT(x, Matrix_iSym);
14      int nnz = length(islot),      int nnz = length(islot),
15          *adims, *xdims = INTEGER(GET_SLOT(x, Matrix_DimSym));          *adims, *xdims = INTEGER(GET_SLOT(x, Matrix_DimSym));
# Line 18  Line 17 
17    
18      adims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));      adims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));
19      adims[0] = xdims[1]; adims[1] = xdims[0];      adims[0] = xdims[1]; adims[1] = xdims[0];
20    
21        if(diag_value(x) == 'U')
22            SET_SLOT(ans, Matrix_diagSym, duplicate(GET_SLOT(x, Matrix_diagSym)));
23      SET_SLOT(ans, Matrix_uploSym, mkString(up ? "L" : "U"));      SET_SLOT(ans, Matrix_uploSym, mkString(up ? "L" : "U"));
24    
25      csc_compTr(xdims[0], xdims[1], nnz,      csc_compTr(xdims[0], xdims[1], nnz,
26                 INTEGER(GET_SLOT(x, Matrix_pSym)), INTEGER(islot),                 INTEGER(GET_SLOT(x, Matrix_pSym)), INTEGER(islot),
27                 REAL(GET_SLOT(x, Matrix_xSym)),                 REAL(GET_SLOT(x, Matrix_xSym)),

Legend:
Removed from v.890  
changed lines
  Added in v.945

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