SCM

SCM Repository

[matrix] Diff of /pkg/Matrix/src/Mutils.h
ViewVC logotype

Diff of /pkg/Matrix/src/Mutils.h

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

revision 2786, Wed Jun 13 12:11:37 2012 UTC revision 2811, Mon Jul 16 15:50:31 2012 UTC
# Line 73  Line 73 
73    
74  void d_packed_getDiag(double *dest, SEXP x, int n);  void d_packed_getDiag(double *dest, SEXP x, int n);
75  void l_packed_getDiag(   int *dest, SEXP x, int n);  void l_packed_getDiag(   int *dest, SEXP x, int n);
76  void tr_d_packed_getDiag(double *dest, SEXP x);  SEXP d_packed_setDiag(double *diag, int l_d, SEXP x, int n);
77  void tr_l_packed_getDiag(   int *dest, SEXP x);  SEXP l_packed_setDiag(   int *diag, int l_d, SEXP x, int n);
78    SEXP d_packed_addDiag(double *diag, int l_d, SEXP x, int n);
79    
80    void tr_d_packed_getDiag(double *dest, SEXP x, int n);
81    void tr_l_packed_getDiag(   int *dest, SEXP x, int n);
82    
83    SEXP tr_d_packed_setDiag(double *diag, int l_d, SEXP x, int n);
84    SEXP tr_l_packed_setDiag(   int *diag, int l_d, SEXP x, int n);
85    SEXP tr_d_packed_addDiag(double *diag, int l_d, SEXP x, int n);
86    
87  SEXP Matrix_getElement(SEXP list, char *nm);  SEXP Matrix_getElement(SEXP list, char *nm);
88    
# Line 122  Line 130 
130    
131  #define uplo_P(_x_) CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_uploSym), 0))  #define uplo_P(_x_) CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_uploSym), 0))
132  #define diag_P(_x_) CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_diagSym), 0))  #define diag_P(_x_) CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_diagSym), 0))
133    #define Diag_P(_x_) (R_has_slot(x, Matrix_diagSym) ?                    \
134                         CHAR(STRING_ELT(GET_SLOT(_x_, Matrix_diagSym), 0)) : " ")
135  #define class_P(_x_) CHAR(asChar(getAttrib(_x_, R_ClassSymbol)))  #define class_P(_x_) CHAR(asChar(getAttrib(_x_, R_ClassSymbol)))
136    
137    
138  // Define this "Cholmod compatible" to some degree  // Define this "Cholmod compatible" to some degree
139  enum x_slot_kind {x_pattern=-1, x_double=0, x_logical=1, x_integer=2, x_complex=3};  enum x_slot_kind {x_pattern=-1, x_double=0, x_logical=1, x_integer=2, x_complex=3};
140  //                  n             d           l            i            z  //                  n             d           l            i            z

Legend:
Removed from v.2786  
changed lines
  Added in v.2811

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