templated scale.hpp

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: colourvalues
 Type: Package
 Title: Assigns Colours to Values
-Version: 0.3.7
-Date: 2020-12-02
+Version: 0.3.7001
+Date: 2021-03-30
 Authors@R: c(
     person("David", "Cooley", ,"[email protected]", role = c("aut", "cre"))
     )

inst/include/colourvalues/scale/scale.hpp

@@ -6,14 +6,18 @@
 namespace colourvalues {
 namespace scale {
 
-  inline Rcpp::NumericVector minmax( Rcpp::NumericVector& x ) {
-    int n = x.size();
+  template< int RTYPE >
+  inline Rcpp::Vector< RTYPE > minmax( Rcpp::Vector< RTYPE >& x ) {
+    R_xlen_t n = x.size();
+
+    typedef typename Rcpp::traits::storage_type< RTYPE >::type T;
 
-    double min = 0;
-    double max = 0;
+    T min = 0;
+    T max = 0;
     bool first_value = false;
 
-    for( int i = 0; i < n; i++) {
+    R_xlen_t i;
+    for( i = 0; i < n; i++) {
 
       if( !ISNAN( x[i] ) ) {
         if( !first_value ) {
@@ -29,11 +33,12 @@ namespace scale {
         }
       }
     }
-    return Rcpp::NumericVector::create(min, max);
+    return Rcpp::Vector< RTYPE >::create( min, max );
   }
 
   // Always rescales to (0, 1)
   // used for variables
+  // iff input is INTSXP; the output will be REALSXP
   inline void rescale( Rcpp::NumericVector& x ) {
     int n = x.size();