SCM

SCM Repository

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

Diff of /pkg/src/dsCMatrix.c

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

revision 479, Wed Feb 2 14:52:26 2005 UTC revision 488, Wed Feb 2 19:11:51 2005 UTC
# Line 28  Line 28 
28          lo = toupper(CHAR(asChar(GET_SLOT(x, Matrix_uploSym)))[0]) == 'L',          lo = toupper(CHAR(asChar(GET_SLOT(x, Matrix_uploSym)))[0]) == 'L',
29          n = length(pSlot)-1,          n = length(pSlot)-1,
30          nnz, piv = asLogical(pivot);          nnz, piv = asLogical(pivot);
31      SEXP val = PROTECT(NEW_OBJECT(MAKE_CLASS("sscChol")));      SEXP val = PROTECT(NEW_OBJECT(MAKE_CLASS("dCholCMatrix")));
32      int *P = (int *) NULL, *Pinv = (int *) NULL;      int *P = (int *) NULL, *Pinv = (int *) NULL;
33      double *Ax;      double *Ax;
34    
# Line 59  Line 59 
59          Ai = Calloc(nnz, int);          Ai = Calloc(nnz, int);
60          Ax = Calloc(nnz, double);          Ax = Calloc(nnz, double);
61          Ap = Calloc(n + 1, int);          Ap = Calloc(n + 1, int);
62          dgTMatrix_to_dgCMatrix(n, n, nnz, INTEGER(Ti),          triplet_to_col(n, n, nnz, INTEGER(Ti),
63                         INTEGER(GET_SLOT(trip, Matrix_jSym)),                         INTEGER(GET_SLOT(trip, Matrix_jSym)),
64                         REAL(GET_SLOT(trip, Matrix_xSym)),                         REAL(GET_SLOT(trip, Matrix_xSym)),
65                         Ap, Ai, Ax);                         Ap, Ai, Ax);

Legend:
Removed from v.479  
changed lines
  Added in v.488

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