SCM

SCM Repository

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

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

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

revision 2661, Wed Apr 6 06:55:54 2011 UTC revision 2673, Fri May 20 16:19:18 2011 UTC
# Line 645  Line 645 
645                         duplicate(i_) : coerceVector(i_, INTSXP)),                         duplicate(i_) : coerceVector(i_, INTSXP)),
646          j_cp = PROTECT((TYPEOF(j_) == INTSXP) ?          j_cp = PROTECT((TYPEOF(j_) == INTSXP) ?
647                         duplicate(j_) : coerceVector(j_, INTSXP)),                         duplicate(j_) : coerceVector(j_, INTSXP)),
648          // for d.CMatrix and l.CMatrix  but not n.CMatrix          // for d.CMatrix and l.CMatrix  but not n.CMatrix:
649          xslot = GET_SLOT(x, Matrix_xSym);          xslot = GET_SLOT(x, Matrix_xSym);
650    
651      int *dims = INTEGER(GET_SLOT(x, Matrix_DimSym)),      int *dims = INTEGER(GET_SLOT(x, Matrix_DimSym)),
# Line 657  Line 657 
657          *jj = INTEGER(j_cp), len_j = LENGTH(j_cp),          *jj = INTEGER(j_cp), len_j = LENGTH(j_cp),
658          i, j, k;          i, j, k;
659      int    *val_i = INTEGER(GET_SLOT(value, Matrix_iSym));      int    *val_i = INTEGER(GET_SLOT(value, Matrix_iSym));
660        // for dsparseVector only:
661      double *val_x =   REAL (GET_SLOT(value, Matrix_xSym));      double *val_x =   REAL (GET_SLOT(value, Matrix_xSym));
662      int len_val = asInteger(GET_SLOT(value, Matrix_lengthSym));      int len_val = asInteger(GET_SLOT(value, Matrix_lengthSym));
663      int p_last = xp[0];      int p_last = xp[0];
# Line 667  Line 668 
668    
669      PROTECT(ans = duplicate(x));      PROTECT(ans = duplicate(x));
670      for(j = 0; j < ncol; j++) {      for(j = 0; j < ncol; j++) {
671    // FIXME
672    // ....
673    // ....
674    // ....
675    // ....
676    
677    
678    
679    
680    
681    
682    
683    // ....
684    // ....
685    // ....
686    // ....
687    // ....
688      }      }
689      UNPROTECT(3);      UNPROTECT(3);
690      return ans;      return ans;

Legend:
Removed from v.2661  
changed lines
  Added in v.2673

R-Forge@R-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business University of Wisconsin - Madison Powered By FusionForge