SCM

SCM Repository

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

Diff of /pkg/src/dsCMatrix.c

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

revision 2222, Fri Jul 18 10:00:25 2008 UTC revision 2223, Fri Jul 18 23:04:48 2008 UTC
# Line 37  Line 37 
37      SEXP nms = getAttrib(facs, R_NamesSymbol);      SEXP nms = getAttrib(facs, R_NamesSymbol);
38      int sup, ll;      int sup, ll;
39      CHM_FR L;      CHM_FR L;
40      CHM_SP A = AS_CHM_SP(Ap);      CHM_SP A = AS_CHM_SP__(Ap);
41      R_CheckStack();      R_CheckStack();
42    
43      if (LENGTH(facs)) {      if (LENGTH(facs)) {
# Line 160  Line 160 
160  SEXP dsCMatrix_Csparse_solve(SEXP a, SEXP b)  SEXP dsCMatrix_Csparse_solve(SEXP a, SEXP b)
161  {  {
162      CHM_FR L = internal_chm_factor(a, -1, -1, -1, 0.);      CHM_FR L = internal_chm_factor(a, -1, -1, -1, 0.);
163      CHM_SP cx, cb = AS_CHM_SP(b);      CHM_SP cx, cb = AS_CHM_SP__(b);
164      R_CheckStack();      R_CheckStack();
165    
166      cx = cholmod_spsolve(CHOLMOD_A, L, cb, &c);      cx = cholmod_spsolve(CHOLMOD_A, L, cb, &c);
# Line 187  Line 187 
187  *         e.g. make  compressed_to_dgTMatrix() in ./dgCMatrix.c work for dsC */  *         e.g. make  compressed_to_dgTMatrix() in ./dgCMatrix.c work for dsC */
188  SEXP dsCMatrix_to_dgTMatrix(SEXP x)  SEXP dsCMatrix_to_dgTMatrix(SEXP x)
189  {  {
190      CHM_SP A = AS_CHM_SP(x);      CHM_SP A = AS_CHM_SP__(x);
191      CHM_SP Afull = cholmod_copy(A, /*stype*/ 0, /*mode*/ 1, &c);      CHM_SP Afull = cholmod_copy(A, /*stype*/ 0, /*mode*/ 1, &c);
192      CHM_TR At = cholmod_sparse_to_triplet(Afull, &c);      CHM_TR At = cholmod_sparse_to_triplet(Afull, &c);
193      R_CheckStack();      R_CheckStack();

Legend:
Removed from v.2222  
changed lines
  Added in v.2223

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