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 724, Tue May 10 01:42:58 2005 UTC revision 725, Tue May 10 14:50:39 2005 UTC
# Line 96  Line 96 
96          bdP = cl ? GET_SLOT(b, Matrix_DimSym) : getAttrib(b, R_DimSymbol),          bdP = cl ? GET_SLOT(b, Matrix_DimSym) : getAttrib(b, R_DimSymbol),
97          val = PROTECT(NEW_OBJECT(MAKE_CLASS("dgeMatrix")));          val = PROTECT(NEW_OBJECT(MAKE_CLASS("dgeMatrix")));
98      int *adims = INTEGER(GET_SLOT(a, Matrix_DimSym)),      int *adims = INTEGER(GET_SLOT(a, Matrix_DimSym)),
99          *bdims = INTEGER(bdP), *Li, *Lp, j, piv;          *bdims = INTEGER(bdP),
100            *Li, *Lp, j, piv;
101      int n = adims[1], ncol = bdims[1];      int n = adims[1], ncol = bdims[1];
102      double *Lx, *D, *in = REAL(cl ? GET_SLOT(b, Matrix_xSym) : b),      double *Lx, *D, *in = REAL(cl ? GET_SLOT(b, Matrix_xSym) : b),
103          *out = REAL(ALLOC_SLOT(val, Matrix_xSym, REALSXP, n * ncol)),          *out = REAL(ALLOC_SLOT(val, Matrix_xSym, REALSXP, n * ncol)),
# Line 107  Line 108 
108      if (*adims != *bdims || ncol < 1 || *adims < 1)      if (*adims != *bdims || ncol < 1 || *adims < 1)
109          error(_("Dimensions of system to be solved are inconsistent"));          error(_("Dimensions of system to be solved are inconsistent"));
110      if (Chol == R_NilValue) Chol = dsCMatrix_chol(a, ScalarLogical(1));      if (Chol == R_NilValue) Chol = dsCMatrix_chol(a, ScalarLogical(1));
111        SET_SLOT(val, Matrix_DimSym, duplicate(bdP));
112      perm = GET_SLOT(Chol, Matrix_permSym);      perm = GET_SLOT(Chol, Matrix_permSym);
113      piv = length(perm);      piv = length(perm);
114      if (piv) tmp = Calloc(n, double);      if (piv) tmp = Calloc(n, double);

Legend:
Removed from v.724  
changed lines
  Added in v.725

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