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 597, Thu Mar 3 19:58:59 2005 UTC revision 738, Tue May 17 17:25:31 2005 UTC
# Line 65  Line 65 
65                         enum CBLAS_UPLO uplo, enum CBLAS_DIAG diag);                         enum CBLAS_UPLO uplo, enum CBLAS_DIAG diag);
66  double *packed_getDiag(double *dest, SEXP x);  double *packed_getDiag(double *dest, SEXP x);
67    
68    
69  extern   /* stored pointers to symbols initialized in R_init_Matrix */  extern   /* stored pointers to symbols initialized in R_init_Matrix */
70  #include "Syms.h"  #include "Syms.h"
71    
# Line 74  Line 75 
75  /* number of elements in one triangle of a square matrix of order n */  /* number of elements in one triangle of a square matrix of order n */
76  #define PACKED_LENGTH(n)   ((n) * ((n) + 1))/2  #define PACKED_LENGTH(n)   ((n) * ((n) + 1))/2
77    
78    /* duplicate the slot with name given by sym from src to dest */
79    #define slot_dup(dest, src, sym)  SET_SLOT(dest, sym, duplicate(GET_SLOT(src, sym)))
80    
81  /**  /**
82   * Check for valid length of a packed triangular array and return the   * Check for valid length of a packed triangular array and return the
83   * corresponding number of columns   * corresponding number of columns
# Line 118  Line 122 
122  }  }
123    
124  /**  /**
125   * Expand the column pointers in the array mp into a full set of column indices   * Expand compressed pointers in the array mp into a full set of indices
126   * in the array mj.   * in the array mj.
127   *   *
128   * @param ncol number of columns   * @param ncol number of columns (or rows)
129   * @param mp column pointer vector of length ncol + 1   * @param mp column pointer vector of length ncol + 1
130   * @param mj vector of length mp[ncol] - 1 to hold the result   * @param mj vector of length mp[ncol] to hold the result
131   *   *
132   * @return mj   * @return mj
133   */   */
134  static R_INLINE  static R_INLINE
135  int* expand_column_pointers(int ncol, const int mp[], int mj[])  int* expand_cmprPt(int ncol, const int mp[], int mj[])
136  {  {
137      int j;      int j;
138      for (j = 0; j < ncol; j++) {      for (j = 0; j < ncol; j++) {
# Line 237  Line 241 
241    
242  void make_array_triangular(double *x, SEXP from);  void make_array_triangular(double *x, SEXP from);
243    
244    SEXP Matrix_expand_pointers(SEXP pP);
245    
246  #ifdef __cplusplus  #ifdef __cplusplus
247  }  }
248  #endif  #endif

Legend:
Removed from v.597  
changed lines
  Added in v.738

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