SCM

SCM Repository

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

Diff of /pkg/src/Mutils.h

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

revision 1517, Wed Sep 6 13:34:03 2006 UTC revision 1555, Wed Sep 13 14:47:28 2006 UTC
# Line 46  Line 46 
46  SEXP set_factors(SEXP obj, SEXP val, char *nm);  SEXP set_factors(SEXP obj, SEXP val, char *nm);
47  SEXP dgCMatrix_set_Dim(SEXP x, int nrow);  SEXP dgCMatrix_set_Dim(SEXP x, int nrow);
48    
49  int csc_unsorted_columns(int ncol, const int p[], const int i[]);  /* int csc_unsorted_columns(int ncol, const int p[], const int i[]); */
50  void csc_sort_columns(int ncol, const int p[], int i[], double x[]);  /* void csc_sort_columns(int ncol, const int p[], int i[], double x[]); */
51  SEXP csc_check_column_sorting(SEXP A);  /* SEXP csc_check_column_sorting(SEXP A); */
52  SEXP Matrix_make_named(int TYP, char **names);  SEXP Matrix_make_named(int TYP, char **names);
53  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);
54  double *packed_getDiag(double *dest, SEXP x);  double *packed_getDiag(double *dest, SEXP x);
# Line 85  Line 85 
85  #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))
86  #define class_P(_x_) CHAR(asChar(getAttrib(_x_, R_ClassSymbol)))  #define class_P(_x_) CHAR(asChar(getAttrib(_x_, R_ClassSymbol)))
87    
88    #define Real_kind(_x_)  (isReal(GET_SLOT(_x_, Matrix_xSym)) ? 0 :       \
89                             (isLogical(GET_SLOT(_x_, Matrix_xSym)) ? 1 :   \
90                              -1))
91    
92    
93  /**  /**
94   * Check for valid length of a packed triangular array and return the   * Check for valid length of a packed triangular array and return the
95   * corresponding number of columns   * corresponding number of columns
# Line 157  Line 162 
162    
163  SEXP Matrix_expand_pointers(SEXP pP);  SEXP Matrix_expand_pointers(SEXP pP);
164    
 /* Move these to the lme4 sources */  
 SEXP alloc_dgeMatrix(int m, int n, SEXP rownms, SEXP colnms);  
 SEXP alloc_dpoMatrix(int n, char *uplo, SEXP rownms, SEXP colnms);  
 SEXP alloc_dtrMatrix(int n, char *uplo, char *diag, SEXP rownms, SEXP colnms);  
 SEXP alloc_dsCMatrix(int n, int nz, char *uplo, SEXP rownms, SEXP colnms);  
   
165  SEXP dup_mMatrix_as_dgeMatrix(SEXP A);  SEXP dup_mMatrix_as_dgeMatrix(SEXP A);
166    
167  static R_INLINE SEXP  static R_INLINE SEXP

Legend:
Removed from v.1517  
changed lines
  Added in v.1555

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