fix matrix coiercion

Author: pachadotdev

Makefile

@@ -1,23 +1,25 @@
 clean:
-	@clear
 	@Rscript -e 'devtools::clean_dll("extended-tests/cpp4rtest");'
 	@Rscript -e 'devtools::clean_dll("extended-tests/cpp11benchmark")'
 	@Rscript -e 'devtools::clean_dll("extended-tests/cpp4rbenchmark")'
 	@Rscript -e 'devtools::clean_dll("extended-tests/Rcppbenchmark")'
 
+register:
+	@Rscript -e	'cpp4r::register("extended-tests/cpp4rtest")'
+	@Rscript -e	'cpp4r::register("extended-tests/cpp4rbenchmark")'
+
 install:
-	@clear
 	@Rscript -e 'devtools::install("./")'
 
 docs:
-	@clear
 	@Rscript -e 'devtools::document("./"); pkgsite::build_site("./")'
 
 check:
-	@clear
 	@echo "==============================="
 	@echo "Checking R code"
+	@$(MAKE) clean
 	@$(MAKE) install
+	@$(MAKE) register
 	@Rscript -e	'cpp4r::register("extended-tests/cpp4rtest")'
 	@Rscript -e 'devtools::check("./", error_on = "error")'
 	@echo "==============================="
@@ -29,9 +31,11 @@ check:
 	@echo "==============================="
 
 bench:
-	@clear
 	@rm -f extended-tests-results/*.rds
 	@rm -f extended-tests-results/bench_summary.md
+	@$(MAKE) clean
+	@$(MAKE) install
+	@$(MAKE) register
 	@export -p USE_CLANG; /bin/bash -euo pipefail -c './scripts/bench_loop.sh'
 	@Rscript './scripts/combine-benchmarks.R'
 

R/register.R

@@ -349,38 +349,8 @@ convert_cpp_default_to_r <- function(cpp_default) {
 
 # Helper function to generate type checking/coercion code
 generate_type_check <- function(param_name, param_type) {
-  # Map C++ types to R coercion functions
-  if (param_type == "int" || grepl("^int[[:space:]]*$", param_type)) {
-    return(glue::glue("{param_name} <- as.integer({param_name})"))
-  } else if (param_type == "double" || grepl("^double[[:space:]]*$", param_type)) {
-    return(glue::glue("{param_name} <- as.numeric({param_name})"))
-  } else if (param_type == "bool" || grepl("^bool[[:space:]]*$", param_type)) {
-    return(glue::glue("{param_name} <- as.logical({param_name})"))
-  } else if (grepl("string", param_type, ignore.case = TRUE)) {
-    return(glue::glue("{param_name} <- as.character({param_name})"))
-  }
-  
-  # Handle cpp4r matrix types - set proper storage mode
-  if (grepl("integers_matrix", param_type)) {
-    return(glue::glue("storage.mode({param_name}) <- \"integer\""))
-  } else if (grepl("doubles_matrix", param_type)) {
-    return(glue::glue("storage.mode({param_name}) <- \"double\""))
-  } else if (grepl("logicals_matrix", param_type)) {
-    return(glue::glue("storage.mode({param_name}) <- \"logical\""))
-  }
-  
-  # Handle cpp4r vector types - set proper storage mode as well
-  if (grepl("^integers[^_]", param_type) || param_type == "integers") {
-    return(glue::glue("storage.mode({param_name}) <- \"integer\""))
-  } else if (grepl("^doubles[^_]", param_type) || param_type == "doubles") {
-    return(glue::glue("storage.mode({param_name}) <- \"double\""))
-  } else if (grepl("^logicals[^_]", param_type) || param_type == "logicals") {
-    return(glue::glue("storage.mode({param_name}) <- \"logical\""))
-  } else if (grepl("^strings[^_]", param_type) || param_type == "strings") {
-    return(glue::glue("storage.mode({param_name}) <- \"character\""))
-  }
-  
-  # For other cpp4r types, don't add checks (they handle conversion internally)
+  # No type checking or coercion - match cpp11's approach
+  # The C++ side handles all type validation and conversion
   return("")
 }
 

extended-tests/cpp4rbenchmark/R/cpp4r.R

@@ -3,44 +3,29 @@
 #' @title Add Two Matrices
 #' @export
 add_two_cpp4r <- function(a, b) {
-	storage.mode(a) <- "double"
-	storage.mode(b) <- "double"
 	.Call(`_cpp4rbenchmark_add_two_cpp4r`, a, b)
 }
 
 #' @title Add Four Matrices
 #' @export
 add_four_cpp4r <- function(a, b, c, d) {
-	storage.mode(a) <- "double"
-	storage.mode(b) <- "double"
-	storage.mode(c) <- "double"
-	storage.mode(d) <- "double"
 	.Call(`_cpp4rbenchmark_add_four_cpp4r`, a, b, c, d)
 }
 
 #' @title Multiply Four Matrices
 #' @export
 multiply_four_cpp4r <- function(a, b, c, d) {
-	storage.mode(a) <- "double"
-	storage.mode(b) <- "double"
-	storage.mode(c) <- "double"
-	storage.mode(d) <- "double"
 	.Call(`_cpp4rbenchmark_multiply_four_cpp4r`, a, b, c, d)
 }
 
 #' @title Submatrix Manipulation
 #' @export
 submatrix_manipulation_cpp4r <- function(a, b) {
-	storage.mode(a) <- "double"
-	storage.mode(b) <- "double"
 	.Call(`_cpp4rbenchmark_submatrix_manipulation_cpp4r`, a, b)
 }
 
 #' @title Multi-Operation Expression
 #' @export
 multi_operation_cpp4r <- function(a, b, c) {
-	storage.mode(a) <- "double"
-	storage.mode(b) <- "double"
-	storage.mode(c) <- "double"
 	.Call(`_cpp4rbenchmark_multi_operation_cpp4r`, a, b, c)
 }