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 1441, Thu Aug 24 21:59:49 2006 UTC revision 1507, Mon Sep 4 18:41:34 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 187  Line 179 
179      return missing;      return missing;
180  }  }
181    
 SEXP alloc3Darray(SEXPTYPE mode, int nrow, int ncol, int nface);  
   
182  /**  /**
183   * Calculate the zero-based index in a row-wise packed lower triangular matrix.   * Calculate the zero-based index in a row-wise packed lower triangular matrix.
184   * This is used for the arrays of blocked sparse matrices.   * This is used for the arrays of blocked sparse matrices.
# Line 205  Line 195 
195      return (k * (k + 1))/2 + i;      return (k * (k + 1))/2 + i;
196  }  }
197    
 /**  
  * Check for a complete match on matrix dimensions  
  *  
  * @param xd dimensions of first matrix  
  * @param yd dimensions of second matrix  
  *  
  * @return 1 if dimensions match, otherwise 0  
  */  
 static R_INLINE  
 int match_mat_dims(const int xd[], const int yd[])  
 {  
     return xd[0] == yd[0] && xd[1] == yd[1];  
 }  
   
198  double *expand_csc_column(double *dest, int m, int j,  double *expand_csc_column(double *dest, int m, int j,
199                            const int Ap[], const int Ai[], const double Ax[]);                            const int Ap[], const int Ai[], const double Ax[]);
200    
# Line 299  Line 275 
275      return dest;      return dest;
276  }  }
277    
 SEXP alloc_real_classed_matrix(char *class, int nrow, int ncol);  
278  SEXP alloc_dgeMatrix(int m, int n, SEXP rownms, SEXP colnms);  SEXP alloc_dgeMatrix(int m, int n, SEXP rownms, SEXP colnms);
279  SEXP alloc_dpoMatrix(int n, char *uplo, SEXP rownms, SEXP colnms);  SEXP alloc_dpoMatrix(int n, char *uplo, SEXP rownms, SEXP colnms);
280  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);
# Line 307  Line 282 
282    
283  SEXP dup_mMatrix_as_dgeMatrix(SEXP A);  SEXP dup_mMatrix_as_dgeMatrix(SEXP A);
284    
285    static R_INLINE SEXP
286    mMatrix_as_dgeMatrix(SEXP A)
287    {
288        return strcmp(class_P(A), "dgeMatrix") ? dup_mMatrix_as_dgeMatrix(A) : A;
289    }
290    
291  /**  /**
292   * 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.1441  
changed lines
  Added in v.1507

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