SCM

SCM Repository

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

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

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

revision 3078, Tue Mar 31 15:27:56 2015 UTC revision 3079, Tue Mar 31 15:29:43 2015 UTC
# Line 98  Line 98 
98      return R_NilValue;      return R_NilValue;
99  }  }
100    
101  /* ./CHOLMOD/Include/cholmod_core.h says about  'int stype' entry of cholmod_sparse_struct:  /** @brief stype := "symmetry type".
102     *
103     *  ./CHOLMOD/Include/cholmod_core.h says about  'int stype' entry of cholmod_sparse_struct:
104   *   ------------------------------   *   ------------------------------
105   * 0:  matrix is "unsymmetric": use both upper and lower triangular parts   * 0:  matrix is "unsymmetric": use both upper and lower triangular parts
106   *     (the matrix may actually be symmetric in pattern and value, but   *     (the matrix may actually be symmetric in pattern and value, but
# Line 115  Line 117 
117      return 0;      return 0;
118  }  }
119    
120  /* xtype defines the kind of numerical values used:  /** @brief xtype: the _kind_ of numeric (think "x slot") of Cholmod sparse matrices.
121    #define CHOLMOD_PATTERN 0      pattern only, no numerical values    #define CHOLMOD_PATTERN 0      pattern only, no numerical values
122    #define CHOLMOD_REAL    1      a real matrix    #define CHOLMOD_REAL    1      a real matrix
123    #define CHOLMOD_COMPLEX 2      a complex matrix (ANSI C99 compatible)    #define CHOLMOD_COMPLEX 2      a complex matrix (ANSI C99 compatible)
# Line 670  Line 672 
672  CHM_DN as_cholmod_dense(CHM_DN ans, SEXP x)  CHM_DN as_cholmod_dense(CHM_DN ans, SEXP x)
673  {  {
674  #define _AS_cholmod_dense_1                                             \  #define _AS_cholmod_dense_1                                             \
675      static const char *valid[] = { MATRIX_VALID_dense, ""};             \      static const char *valid[] = { MATRIX_VALID_ge_dense, ""};          \
676      int dims[2], ctype = Matrix_check_class_etc(x, valid), nprot = 0;   \      int dims[2], ctype = Matrix_check_class_etc(x, valid), nprot = 0;   \
677                                                                          \                                                                          \
678      if (ctype < 0) {            /* not a classed matrix */              \      if (ctype < 0) {            /* not a classed matrix */              \

Legend:
Removed from v.3078  
changed lines
  Added in v.3079

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