trying sommat else

SymbolixAU · Dec 3, 2020 · 60289d9 · 60289d9
1 parent 7ba8b24
commit 60289d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/inst/include/colourvalues/palettes/ylorrd.hpp b/inst/include/colourvalues/palettes/ylorrd.hpp
@@ -25,11 +25,14 @@ namespace palette {
     0.109803921568627,0.149019607843137,0.149019607843137
   };
 
-const Rcpp::List ylorrd = Rcpp::List::create(
-  _["r"] = ylorrd_red,
-  _["g"] = ylorrd_green,
-  _["b"] = ylorrd_blue
-);
+  inline Rcpp::DataFrame ylorrd() {
+    return Rcpp::DataFrame::create(
+      _["r"] = ylorrd_red,
+      _["g"] = ylorrd_green,
+      _["b"] = ylorrd_blue
+    );
+  }
+
 } // namespace palette
 } // namepsace colourvalues
 

diff --git a/tests/testthat/test-palettes.R b/tests/testthat/test-palettes.R
@@ -7,8 +7,8 @@ test_that("palettes are returned", {
   all_palettes <- color_palettes()
   expect_true( length(all_palettes) == 52 )
 
-  for( palette in all_palettes[10:length(all_palettes)] ) {
-    # print(palette)
+  for( palette in all_palettes[1:7] ) {
+    #print(palette)
     expect_silent( colour_values(1, palette = palette ))
     res <- colourvalues::get_palette( palette )
     expect_true( ncol( res ) == 3 & nrow( res ) == 256 )