SCM

SCM Repository

[matrix] Diff of /pkg/Matrix/src/Mutils.h
ViewVC logotype

Diff of /pkg/Matrix/src/Mutils.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2628, Sat Dec 11 16:56:51 2010 UTC revision 2645, Mon Feb 21 10:57:47 2011 UTC
# Line 53  Line 53 
53  #define LFT CblasLeft  #define LFT CblasLeft
54  #define RGT CblasRight  #define RGT CblasRight
55    
 #if !defined(R_VERSION) || R_VERSION < R_Version(2, 7, 0)  
 char La_norm_type(const char *typstr);  
 char La_rcond_type(const char *typstr);  
 #endif  
   
56  double get_double_by_name(SEXP obj, char *nm);  double get_double_by_name(SEXP obj, char *nm);
57  SEXP set_double_by_name(SEXP obj, double val, char *nm);  SEXP set_double_by_name(SEXP obj, double val, char *nm);
58  SEXP as_det_obj(double val, int log, int sign);  SEXP as_det_obj(double val, int log, int sign);
# Line 71  Line 66 
66  /* int csc_unsorted_columns(int ncol, const int p[], const int i[]); */  /* int csc_unsorted_columns(int ncol, const int p[], const int i[]); */
67  /* 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[]); */
68  /* SEXP csc_check_column_sorting(SEXP A); */  /* SEXP csc_check_column_sorting(SEXP A); */
 #if R_VERSION < R_Version(2, 10, 0)  
 SEXP Matrix_make_named(int TYP, const char **names);  
 #else  
 # define Matrix_make_named Rf_mkNamed  
 #endif  
69    
70  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);  SEXP check_scalar_string(SEXP sP, char *vals, char *nm);
71  Rboolean equal_string_vectors(SEXP s1, SEXP s2);  Rboolean equal_string_vectors(SEXP s1, SEXP s2);
# Line 284  Line 274 
274      }      }
275  }  }
276    
277    /**
278     * These are the ones users should use -- is() versions, also looking
279     * at super classes:
280     */
281  int Matrix_check_class_etc(SEXP x, char **valid);  int Matrix_check_class_etc(SEXP x, char **valid);
282    #if R_VERSION < R_Version(2, 13, 0)
283  int Matrix_check_class_and_super(SEXP x, char **valid, SEXP rho);  int Matrix_check_class_and_super(SEXP x, char **valid, SEXP rho);
284    #else
285    # define Matrix_check_class_and_super R_check_class_and_super
286    #endif
287    
288  #ifdef __cplusplus  #ifdef __cplusplus
289  }  }

Legend:
Removed from v.2628  
changed lines
  Added in v.2645

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