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 766, Tue Jun 7 23:03:34 2005 UTC
# Line 53  Line 53 
53                  int ap[], int ai[], double ax[]);                  int ap[], int ai[], double ax[]);
54  void ssc_symbolic_permute(int n, int upper, const int perm[],  void ssc_symbolic_permute(int n, int upper, const int perm[],
55                            int Ap[], int Ai[]);                            int Ap[], int Ai[]);
 double *nlme_symmetrize(double *a, const int nc);  
 void nlme_check_Lapack_error(int info, const char *laName);  
 SEXP nlme_replaceSlot(SEXP obj, SEXP names, SEXP value);  
 SEXP nlme_weight_matrix_list(SEXP MLin, SEXP wts, SEXP adjst, SEXP MLout);  
56  SEXP Matrix_make_named(int TYP, char **names);  SEXP Matrix_make_named(int TYP, char **names);
57  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);
58  double *packed_to_full(double *dest, const double *src, int n,  double *packed_to_full(double *dest, const double *src, int n,
# Line 65  Line 61 
61                         enum CBLAS_UPLO uplo, enum CBLAS_DIAG diag);                         enum CBLAS_UPLO uplo, enum CBLAS_DIAG diag);
62  double *packed_getDiag(double *dest, SEXP x);  double *packed_getDiag(double *dest, SEXP x);
63    
64    
65  extern   /* stored pointers to symbols initialized in R_init_Matrix */  extern   /* stored pointers to symbols initialized in R_init_Matrix */
66  #include "Syms.h"  #include "Syms.h"
67    
# Line 74  Line 71 
71  /* 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 */
72  #define PACKED_LENGTH(n)   ((n) * ((n) + 1))/2  #define PACKED_LENGTH(n)   ((n) * ((n) + 1))/2
73    
74    /* duplicate the slot with name given by sym from src to dest */
75    #define slot_dup(dest, src, sym)  SET_SLOT(dest, sym, duplicate(GET_SLOT(src, sym)))
76    
77  /**  /**
78   * Check for valid length of a packed triangular array and return the   * Check for valid length of a packed triangular array and return the
79   * corresponding number of columns   * corresponding number of columns
# Line 118  Line 118 
118  }  }
119    
120  /**  /**
121   * 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
122   * in the array mj.   * in the array mj.
123   *   *
124   * @param ncol number of columns   * @param ncol number of columns (or rows)
125   * @param mp column pointer vector of length ncol + 1   * @param mp column pointer vector of length ncol + 1
126   * @param mj vector of length mp[ncol] - 1 to hold the result   * @param mj vector of length mp[ncol] to hold the result
127   *   *
128   * @return mj   * @return mj
129   */   */
130  static R_INLINE  static R_INLINE
131  int* expand_column_pointers(int ncol, const int mp[], int mj[])  int* expand_cmprPt(int ncol, const int mp[], int mj[])
132  {  {
133      int j;      int j;
134      for (j = 0; j < ncol; j++) {      for (j = 0; j < ncol; j++) {
# Line 237  Line 237 
237    
238  void make_array_triangular(double *x, SEXP from);  void make_array_triangular(double *x, SEXP from);
239    
240    SEXP Matrix_expand_pointers(SEXP pP);
241    
242  #ifdef __cplusplus  #ifdef __cplusplus
243  }  }
244  #endif  #endif

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

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