SCM

SCM Repository

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

Diff of /pkg/src/Csparse.c

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

revision 925, Mon Sep 19 19:01:31 2005 UTC revision 928, Mon Sep 19 21:10:59 2005 UTC
# Line 92  Line 92 
92  #endif  /* USE_CHOLMOD */  #endif  /* USE_CHOLMOD */
93  }  }
94    
95  SEXP Csparse_crossprod(SEXP x, SEXP trans)  SEXP Csparse_crossprod(SEXP x, SEXP trans, SEXP triplet)
96  {  {
97  #ifdef USE_CHOLMOD  #ifdef USE_CHOLMOD
98      int tr = asLogical(trans);  /* gets reversed because _aat is trcrossprod */      int trip = asLogical(triplet);
99      cholmod_sparse *chx = as_cholmod_sparse(x), *chcp, *chxt;      cholmod_triplet
100            *cht = trip ? as_cholmod_triplet(x) : (cholmod_triplet*) NULL;
101        cholmod_sparse *chcp, *chxt,
102            *chx = trip ? cholmod_triplet_to_sparse(cht, cht->nnz, &c)
103            : as_cholmod_sparse(x);
104        int tr = asLogical(trans);  /* gets reversed because _aat is tcrossprod */
105    
106      if (!tr)      if (!tr)
107          chxt = cholmod_transpose(chx, (int) chx->xtype, &c);          chxt = cholmod_transpose(chx, (int) chx->xtype, &c);
108      chcp = cholmod_aat((tr) ? chxt : chx, (int *) NULL, 0, chx->xtype, &c);      chcp = cholmod_aat((!tr) ? chxt : chx, (int *) NULL, 0, chx->xtype, &c);
109    
110      Free(chx);      Free(trip ? cht : chx);
111        if (trip) cholmod_free_sparse(&chx, &c);
112      if (!tr) cholmod_free_sparse(&chxt, &c);      if (!tr) cholmod_free_sparse(&chxt, &c);
113      return chm_sparse_to_SEXP(chcp, 1);      return chm_sparse_to_SEXP(chcp, 1);
114  #else  #else

Legend:
Removed from v.925  
changed lines
  Added in v.928

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