SCM

SCM Repository

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

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

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

revision 2660, Wed Apr 6 06:53:23 2011 UTC revision 2661, Wed Apr 6 06:55:54 2011 UTC
# Line 157  Line 157 
157      R_CheckStack();      R_CheckStack();
158    
159      if (tr) {      if (tr) {
160          cholmod_sparse *cxt = cholmod_l_transpose(cx, (int)cx->xtype, &c);          cholmod_sparse *cxt = cholmod_transpose(cx, (int)cx->xtype, &c);
161          cx = cxt;          cx = cxt;
162      }      }
163    
# Line 173  Line 173 
173      SEXP ans = PROTECT(sp ? NEW_OBJECT(MAKE_CLASS(SparseResult_class))      SEXP ans = PROTECT(sp ? NEW_OBJECT(MAKE_CLASS(SparseResult_class))
174                            : allocVector(SXP_ans, nc));                            : allocVector(SXP_ans, nc));
175    
176      if (sp) { /* sparseResult - never allocating length-nc ... */      if (sp) { // sparseResult, i.e. *sparseVector (never allocating length-nc)
177          int nza, i1, i2, p, *ai;          int nza, i1, i2, p, *ai;
178          Type_ans *ax;          Type_ans *ax;
179    
# Line 206  Line 206 
206          }          }
207      }      }
208    
209      if (tr) cholmod_l_free_sparse(&cx, &c);      if (tr) cholmod_free_sparse(&cx, &c);
210      UNPROTECT(1);      UNPROTECT(1);
211      return ans;      return ans;
212  }  }

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

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