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 477, Wed Feb 2 14:14:59 2005 UTC revision 478, Wed Feb 2 14:33:51 2005 UTC
# Line 583  Line 583 
583                                  /* transpose B */                                  /* transpose B */
584              for (i = 0, nrbB = -1; i < nnz; i++) if (Bi[i] > nrbB) nrbB = Bi[i];              for (i = 0, nrbB = -1; i < nnz; i++) if (Bi[i] > nrbB) nrbB = Bi[i];
585              BTp = Calloc(nrbB, int);              BTp = Calloc(nrbB, int);
586              triplet_to_col(ncbB, nrbB, nnz, tmp, Bi, Bx, BTp, BTi, BTx);              dgTMatrix_to_dgCMatrix(ncbB, nrbB, nnz, tmp, Bi, Bx, BTp, BTi, BTx);
587                                  /* sanity check */                                  /* sanity check */
588              if (BTp[nrbB] != nnz) error("cscb_trcbsm: transpose operation failed");              if (BTp[nrbB] != nnz) error("cscb_trcbsm: transpose operation failed");
589              Free(tmp);              Free(tmp);
# Line 677  Line 677 
677      error("Code not yet written");      error("Code not yet written");
678  }  }
679    
680  SEXP cscBlocked_2cscMatrix(SEXP A)  SEXP cscBlocked_2dgCMatrix(SEXP A)
681  {  {
682      SEXP val = PROTECT(NEW_OBJECT(MAKE_CLASS("cscMatrix"))),      SEXP val = PROTECT(NEW_OBJECT(MAKE_CLASS("dgCMatrix"))),
683          ApP = GET_SLOT(A, Matrix_pSym),          ApP = GET_SLOT(A, Matrix_pSym),
684          AiP = GET_SLOT(A, Matrix_iSym),          AiP = GET_SLOT(A, Matrix_iSym),
685          AxP = GET_SLOT(A, Matrix_xSym);          AxP = GET_SLOT(A, Matrix_xSym);

Legend:
Removed from v.477  
changed lines
  Added in v.478

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