SCM

SCM Repository

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

Diff of /pkg/src/dgBCMatrix.c

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

revision 582, Mon Feb 28 18:15:21 2005 UTC revision 679, Wed Mar 30 14:42:36 2005 UTC
# Line 539  Line 539 
539      if (diag == UNT && axdims[0] == 1) { /* can use R_ldl code */      if (diag == UNT && axdims[0] == 1) { /* can use R_ldl code */
540          if ((side != LFT) && transa == TRN) {   /* case required for lmer */          if ((side != LFT) && transa == TRN) {   /* case required for lmer */
541              int *BTp, nnz = bxdims[2], nrbB;              int *BTp, nnz = bxdims[2], nrbB;
542              int *tmp = expand_column_pointers(ncbB, Bp, Calloc(nnz, int));              int *tmp = expand_cmprPt(ncbB, Bp, Calloc(nnz, int));
543              int *BTi = Calloc(nnz, int);              int *BTi = Calloc(nnz, int);
544              double *BTx = Calloc(nnz, double), *rhs;              double *BTx = Calloc(nnz, double), *rhs;
545    
# Line 731  Line 731 
731          *bdims = INTEGER(GET_SLOT(val, Matrix_DimSym)),          *bdims = INTEGER(GET_SLOT(val, Matrix_DimSym)),
732          *adims = INTEGER(getAttrib(AxP, R_DimSymbol)),          *adims = INTEGER(getAttrib(AxP, R_DimSymbol)),
733          i, j, k, kk, ncb = length(ApP) - 1, nnz = length(AxP), nrb;          i, j, k, kk, ncb = length(ApP) - 1, nnz = length(AxP), nrb;
734      int *Aj = expand_column_pointers(ncb, Ap, Calloc(nnz, int)),      int *Aj = expand_cmprPt(ncb, Ap, Calloc(nnz, int)),
735          *Bi = INTEGER(ALLOC_SLOT(val, Matrix_iSym, INTSXP, nnz)),          *Bi = INTEGER(ALLOC_SLOT(val, Matrix_iSym, INTSXP, nnz)),
736          *Bj = INTEGER(ALLOC_SLOT(val, Matrix_jSym, INTSXP, nnz)),          *Bj = INTEGER(ALLOC_SLOT(val, Matrix_jSym, INTSXP, nnz)),
737          nblk = adims[2], nc = adims[1], nr = adims[0];          nblk = adims[2], nc = adims[1], nr = adims[0];

Legend:
Removed from v.582  
changed lines
  Added in v.679

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