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 3020, Tue Oct 14 16:14:02 2014 UTC revision 3023, Sat Dec 20 22:29:49 2014 UTC
# Line 210  Line 210 
210                                 GET_SLOT(x, Matrix_DimNamesSym));                                 GET_SLOT(x, Matrix_DimNamesSym));
211  }  }
212    
213    SEXP Csparse_to_tCsparse(SEXP x, SEXP uplo, SEXP diag)
214    {
215        CHM_SP chxs = AS_CHM_SP__(x);
216        int Rkind = (chxs->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;
217        R_CheckStack();
218        return chm_sparse_to_SEXP(chxs, /* dofree = */ 0,
219                                  /* uploT = */ (*CHAR(asChar(uplo)) == 'U')? 1: -1,
220                                   Rkind, /* diag = */ CHAR(STRING_ELT(diag, 0)),
221                                   GET_SLOT(x, Matrix_DimNamesSym));
222    }
223    
224    SEXP Csparse_to_tTsparse(SEXP x, SEXP uplo, SEXP diag)
225    {
226        CHM_SP chxs = AS_CHM_SP__(x);
227        CHM_TR chxt = cholmod_sparse_to_triplet(chxs, &c);
228        int Rkind = (chxs->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;
229        R_CheckStack();
230        return chm_triplet_to_SEXP(chxt, 1,
231                                  /* uploT = */ (*CHAR(asChar(uplo)) == 'U')? 1: -1,
232                                   Rkind, /* diag = */ CHAR(STRING_ELT(diag, 0)),
233                                   GET_SLOT(x, Matrix_DimNamesSym));
234    }
235    
236    
237  /* this used to be called  sCMatrix_to_gCMatrix(..)   [in ./dsCMatrix.c ]: */  /* this used to be called  sCMatrix_to_gCMatrix(..)   [in ./dsCMatrix.c ]: */
238  SEXP Csparse_symmetric_to_general(SEXP x)  SEXP Csparse_symmetric_to_general(SEXP x)
239  {  {

Legend:
Removed from v.3020  
changed lines
  Added in v.3023

root@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