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 951, Wed Sep 28 12:42:51 2005 UTC revision 1395, Sun Aug 20 03:15:25 2006 UTC
# Line 5  Line 5 
5  extern "C" {  extern "C" {
6  #endif  #endif
7    
8  #include <Rdefines.h>  #include <Rdefines.h> /* Rinternals.h + GET_SLOT etc */
9  #include <Rconfig.h>  #include <R.h>  /* includes Rconfig.h */
 #include <R.h>  /* to include Rconfig.h */  
10    
11  #ifdef ENABLE_NLS  #ifdef ENABLE_NLS
12  #include <libintl.h>  #include <libintl.h>
# Line 18  Line 17 
17    
18  SEXP triangularMatrix_validate(SEXP obj);  SEXP triangularMatrix_validate(SEXP obj);
19  SEXP symmetricMatrix_validate(SEXP obj);  SEXP symmetricMatrix_validate(SEXP obj);
20    SEXP dense_nonpacked_validate(SEXP obj);
21    
22  /* enum constants from cblas.h and some short forms */  /* enum constants from cblas.h and some short forms */
23  enum CBLAS_ORDER {CblasRowMajor=101, CblasColMajor=102};  enum CBLAS_ORDER {CblasRowMajor=101, CblasColMajor=102};
# Line 61  Line 61 
61                            int Ap[], int Ai[]);                            int Ap[], int Ai[]);
62  SEXP Matrix_make_named(int TYP, char **names);  SEXP Matrix_make_named(int TYP, char **names);
63  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);
 double *packed_to_full(double *dest, const double *src, int n,  
                        enum CBLAS_UPLO uplo);  
 double *full_to_packed(double *dest, const double *src, int n,  
                        enum CBLAS_UPLO uplo, enum CBLAS_DIAG diag);  
64  double *packed_getDiag(double *dest, SEXP x);  double *packed_getDiag(double *dest, SEXP x);
65  SEXP Matrix_getElement(SEXP list, char *nm);  SEXP Matrix_getElement(SEXP list, char *nm);
66    
67    #define PACKED_TO_FULL(TYPE)                                            \
68    TYPE *packed_to_full_ ## TYPE(TYPE *dest, const TYPE *src,              \
69                                 int n, enum CBLAS_UPLO uplo)
70    PACKED_TO_FULL(double);
71    PACKED_TO_FULL(int);
72    #undef PACKED_TO_FULL
73    
74    #define FULL_TO_PACKED(TYPE)                                            \
75    TYPE *full_to_packed_ ## TYPE(TYPE *dest, const TYPE *src, int n,       \
76                                  enum CBLAS_UPLO uplo, enum CBLAS_DIAG diag)
77    FULL_TO_PACKED(double);
78    FULL_TO_PACKED(int);
79    #undef FULL_TO_PACKED
80    
81    
82  extern   /* stored pointers to symbols initialized in R_init_Matrix */  extern   /* stored pointers to symbols initialized in R_init_Matrix */
83  #include "Syms.h"  #include "Syms.h"
# Line 246  Line 256 
256      }      }
257  }  }
258    
259  void make_array_triangular(double *x, SEXP from);  void make_d_matrix_triangular(double *x, SEXP from);
260    void make_i_matrix_triangular(   int *x, SEXP from);
261    
262    void make_d_matrix_symmetric(double *to, SEXP from);
263    void make_i_matrix_symmetric(   int *to, SEXP from);
264    
265  SEXP Matrix_expand_pointers(SEXP pP);  SEXP Matrix_expand_pointers(SEXP pP);
266    
# Line 285  Line 299 
299      return dest;      return dest;
300  }  }
301    
302    SEXP alloc_real_classed_matrix(char *class, int nrow, int ncol);
303    SEXP alloc_dgeMatrix(int m, int n, SEXP rownms, SEXP colnms);
304    SEXP alloc_dpoMatrix(int n, char *uplo, SEXP rownms, SEXP colnms);
305    SEXP alloc_dtrMatrix(int n, char *uplo, char *diag, SEXP rownms, SEXP colnms);
306    SEXP alloc_dsCMatrix(int n, int nz, char *uplo, SEXP rownms, SEXP colnms);
307    
308    SEXP dup_mMatrix_as_dgeMatrix(SEXP A, SEXP classed);
309    
310  #ifdef __cplusplus  #ifdef __cplusplus
311  }  }
312  #endif  #endif

Legend:
Removed from v.951  
changed lines
  Added in v.1395

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