diff --git a/R/RcppExports.R b/R/RcppExports.R index e2dbee3..b98852f 100644 --- a/R/RcppExports.R +++ b/R/RcppExports.R @@ -5,10 +5,6 @@ cpp_circle_layout <- function(input_rad_vec, centroid, rad_scale_factor = 1, try .Call(`_APackOfTheClones_cpp_circle_layout`, input_rad_vec, centroid, rad_scale_factor, try_place, verbose) } -get_transformed_clone_sizes <- function(sizelist, clone_scale_factor, num_clusters) { - .Call(`_APackOfTheClones_get_transformed_clone_sizes`, sizelist, clone_scale_factor, num_clusters) -} - get_average_vector <- function(vec_list) { .Call(`_APackOfTheClones_get_average_vector`, vec_list) } diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index 97847a4..888c110 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -25,19 +25,6 @@ BEGIN_RCPP return rcpp_result_gen; END_RCPP } -// get_transformed_clone_sizes -Rcpp::List get_transformed_clone_sizes(Rcpp::List sizelist, double clone_scale_factor, int num_clusters); -RcppExport SEXP _APackOfTheClones_get_transformed_clone_sizes(SEXP sizelistSEXP, SEXP clone_scale_factorSEXP, SEXP num_clustersSEXP) { -BEGIN_RCPP - Rcpp::RObject rcpp_result_gen; - Rcpp::RNGScope rcpp_rngScope_gen; - Rcpp::traits::input_parameter< Rcpp::List >::type sizelist(sizelistSEXP); - Rcpp::traits::input_parameter< double >::type clone_scale_factor(clone_scale_factorSEXP); - Rcpp::traits::input_parameter< int >::type num_clusters(num_clustersSEXP); - rcpp_result_gen = Rcpp::wrap(get_transformed_clone_sizes(sizelist, clone_scale_factor, num_clusters)); - return rcpp_result_gen; -END_RCPP -} // get_average_vector std::vector get_average_vector(Rcpp::List vec_list); RcppExport SEXP _APackOfTheClones_get_average_vector(SEXP vec_listSEXP) { @@ -96,7 +83,6 @@ RcppExport SEXP run_testthat_tests(SEXP); static const R_CallMethodDef CallEntries[] = { {"_APackOfTheClones_cpp_circle_layout", (DL_FUNC) &_APackOfTheClones_cpp_circle_layout, 5}, - {"_APackOfTheClones_get_transformed_clone_sizes", (DL_FUNC) &_APackOfTheClones_get_transformed_clone_sizes, 3}, {"_APackOfTheClones_get_average_vector", (DL_FUNC) &_APackOfTheClones_get_average_vector, 1}, {"_APackOfTheClones_get_component_repulsion_vector", (DL_FUNC) &_APackOfTheClones_get_component_repulsion_vector, 4}, {"_APackOfTheClones_do_cluster_intersect", (DL_FUNC) &_APackOfTheClones_do_cluster_intersect, 5}, diff --git a/tests/testthat/test-get_clone_sizes.R b/tests/testthat/test-get_clone_sizes.R index 0b48f8f..edafd22 100644 --- a/tests/testthat/test-get_clone_sizes.R +++ b/tests/testthat/test-get_clone_sizes.R @@ -29,6 +29,6 @@ test_that("get_transformed_clone_sizes works", { sizelist <- list(c(1,1,2), NULL, c(0.5,3)) expect_equal( get_transformed_clone_sizes(sizelist, 0.5, 3), - list(c(0.5, 0.5, 1), list(), c(0.25, 1.5)) + list(c(0.5, 0.5, sqrt(2)*0.5), list(), c(sqrt(0.5)*0.5, sqrt(3)*0.5)) ) })