fix wrong spelling of Clarke (Clark)

lschneiderbauer · Jan 1, 2024 · 4e6066f · 4e6066f
1 parent 8863609
commit 4e6066f
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -2,7 +2,7 @@
 
 S3method(autoplot,heumilkr_result)
 S3method(plot,heumilkr_result)
-export(clark_wright)
+export(clarke_wright)
 importFrom(ggplot2,aes)
 importFrom(ggplot2,autoplot)
 importFrom(ggplot2,geom_path)

diff --git a/R/clark_wright.R → R/clarke_wright.R b/R/clark_wright.R → R/clarke_wright.R
@@ -43,7 +43,7 @@
 #'   dist(pos),
 #'   data.frame(n = NA_integer_, caps = 6)
 #' )
-clark_wright <- function(demand, distances, vehicles) {
+clarke_wright <- function(demand, distances, vehicles) {
   stopifnot(inherits(distances, "dist"))
   stopifnot(attr(distances, "Size") == length(demand) + 1)
   stopifnot(is.data.frame(vehicles))
@@ -57,7 +57,7 @@ clark_wright <- function(demand, distances, vehicles) {
   heumilkr_result(
     as.data.frame(
       .Call(
-        `_heumilkr_cpp_clark_wright`, as.numeric(demand), distances,
+        `_heumilkr_cpp_clarke_wright`, as.numeric(demand), distances,
         vehicles$n, vehicles$caps
       ),
       col.names = c("run_id", "order", "vehicle_id")

diff --git a/R/cpp11.R b/R/cpp11.R
@@ -1,5 +1,5 @@
 # Generated by cpp11: do not edit by hand
 
-cpp_clark_wright <- function(demand, distances, n_res, capacities) {
-  .Call(`_heumilkr_cpp_clark_wright`, demand, distances, n_res, capacities)
+cpp_clarke_wright <- function(demand, distances, n_res, capacities) {
+  .Call(`_heumilkr_cpp_clarke_wright`, demand, distances, n_res, capacities)
 }
diff --git a/benchmark/benchmark.R b/benchmark/benchmark.R
@@ -26,7 +26,7 @@ result <-
         distances <- dist(pos[1:(n + 1), ])
 
         bench::mark(
-          clark_wright(demand, distances, vehicles)
+          clarke_wright(demand, distances, vehicles)
         ) |>
           rowwise() |>
           mutate(

diff --git a/man/clark_wright.Rd → man/clarke_wright.Rd b/man/clark_wright.Rd → man/clarke_wright.Rd
diff --git a/src/clark_wright.cpp → src/clarke_wright.cpp b/src/clark_wright.cpp → src/clarke_wright.cpp
@@ -30,7 +30,7 @@ list triple_to_list(const std::vector<std::tuple<T1, T2, T3>> vec)
   return lst;
 }
 
-[[cpp11::register]] list cpp_clark_wright(const std::vector<double> &demand,
+[[cpp11::register]] list cpp_clarke_wright(const std::vector<double> &demand,
                                           const std::vector<double> &distances,
                                           const std::vector<int> &n_res,
                                           const std::vector<double> &capacities)

diff --git a/src/cpp11.cpp b/src/cpp11.cpp
@@ -5,17 +5,17 @@
 #include "cpp11/declarations.hpp"
 #include <R_ext/Visibility.h>
 
-// clark_wright.cpp
-list cpp_clark_wright(const std::vector<double> & demand, const std::vector<double> & distances, const std::vector<int> & n_res, const std::vector<double> & capacities);
-extern "C" SEXP _heumilkr_cpp_clark_wright(SEXP demand, SEXP distances, SEXP n_res, SEXP capacities) {
+// clarke_wright.cpp
+list cpp_clarke_wright(const std::vector<double> & demand, const std::vector<double> & distances, const std::vector<int> & n_res, const std::vector<double> & capacities);
+extern "C" SEXP _heumilkr_cpp_clarke_wright(SEXP demand, SEXP distances, SEXP n_res, SEXP capacities) {
   BEGIN_CPP11
-    return cpp11::as_sexp(cpp_clark_wright(cpp11::as_cpp<cpp11::decay_t<const std::vector<double> &>>(demand), cpp11::as_cpp<cpp11::decay_t<const std::vector<double> &>>(distances), cpp11::as_cpp<cpp11::decay_t<const std::vector<int> &>>(n_res), cpp11::as_cpp<cpp11::decay_t<const std::vector<double> &>>(capacities)));
+    return cpp11::as_sexp(cpp_clarke_wright(cpp11::as_cpp<cpp11::decay_t<const std::vector<double> &>>(demand), cpp11::as_cpp<cpp11::decay_t<const std::vector<double> &>>(distances), cpp11::as_cpp<cpp11::decay_t<const std::vector<int> &>>(n_res), cpp11::as_cpp<cpp11::decay_t<const std::vector<double> &>>(capacities)));
   END_CPP11
 }
 
 extern "C" {
 static const R_CallMethodDef CallEntries[] = {
-    {"_heumilkr_cpp_clark_wright", (DL_FUNC) &_heumilkr_cpp_clark_wright, 4},
+    {"_heumilkr_cpp_clarke_wright", (DL_FUNC) &_heumilkr_cpp_clarke_wright, 4},
     {NULL, NULL, 0}
 };
 }

diff --git a/tests/testthat/test-clark_wright.R → tests/testthat/test-clarke_wright.R b/tests/testthat/test-clark_wright.R → tests/testthat/test-clarke_wright.R
@@ -8,7 +8,7 @@ test_that("runs without error", {
     )
 
   expect_no_error(
-    clark_wright(
+    clarke_wright(
       demand,
       dist(pos),
       data.frame(n = NA_integer_, caps = 99999)
@@ -21,7 +21,7 @@ test_that("vehicle with infinite capacity covers everything in a single run", {
     gen.demand_net(max_sites = 10L),
     function(demand_net) {
       res <-
-        clark_wright(
+        clarke_wright(
           demand_net$demand,
           demand_net$distances, data.frame(n = NA_integer_, caps = 99999)
         )