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 1416, Tue Aug 22 22:44:14 2006 UTC revision 1461, Tue Aug 29 16:17:27 2006 UTC
# Line 50  Line 50 
50    
51  int csc_unsorted_columns(int ncol, const int p[], const int i[]);  int csc_unsorted_columns(int ncol, const int p[], const int i[]);
52  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[]);
 SEXP triple_as_SEXP(int nrow, int ncol, int nz,  
                     const int Ti [], const int Tj [], const double Tx [],  
                     char *Rclass);  
53  SEXP csc_check_column_sorting(SEXP A);  SEXP csc_check_column_sorting(SEXP A);
 void csc_compTr(int m, int n, int nnz,  
                 const int xp[], const int xi[], const double xx[],  
                 int ap[], int ai[], double ax[]);  
 void ssc_symbolic_permute(int n, int upper, const int perm[],  
                           int Ap[], int Ai[]);  
54  SEXP Matrix_make_named(int TYP, char **names);  SEXP Matrix_make_named(int TYP, char **names);
55  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);
56  double *packed_getDiag(double *dest, SEXP x);  double *packed_getDiag(double *dest, SEXP x);
# Line 93  Line 85 
85    
86  #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))
87  #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))
88    #define class_P(_x_) CHAR(asChar(getAttrib(_x_, R_ClassSymbol)))
89    
90  /**  /**
91   * Check for valid length of a packed triangular array and return the   * Check for valid length of a packed triangular array and return the
# Line 305  Line 297 
297  SEXP alloc_dtrMatrix(int n, char *uplo, char *diag, SEXP rownms, SEXP colnms);  SEXP alloc_dtrMatrix(int n, char *uplo, char *diag, SEXP rownms, SEXP colnms);
298  SEXP alloc_dsCMatrix(int n, int nz, char *uplo, SEXP rownms, SEXP colnms);  SEXP alloc_dsCMatrix(int n, int nz, char *uplo, SEXP rownms, SEXP colnms);
299    
300  SEXP dup_mMatrix_as_dgeMatrix(SEXP A, SEXP classed);  SEXP dup_mMatrix_as_dgeMatrix(SEXP A);
301    
302    static R_INLINE SEXP
303    mMatrix_as_dgeMatrix(SEXP A)
304    {
305        return strcmp(class_P(A), "dgeMatrix") ? A : dup_mMatrix_as_dgeMatrix(A);
306    }
307    
308  /**  /**
309   * Return the 0-based index of a string match in a vector of strings   * Return the 0-based index of a string match in a vector of strings

Legend:
Removed from v.1416  
changed lines
  Added in v.1461

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