moves dist fun

Nowosad · Jan 13, 2024 · 6bc13dd · 6bc13dd
1 parent b2f3bea
commit 6bc13dd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/src/distances.cpp b/src/distances.cpp
@@ -2,6 +2,23 @@
 #include "dtw/include/DTW.hpp"
 // using namespace cpp11::literals; // so we can use ""_nm syntax
 
+double get_vals_dist(vector<double>& values1, vector<double>& values2,
+                           std::string& dist_name, cpp11::function dist_fun){
+  if (dist_name == "euclidean"){
+    return euclidean(values1, values2);
+  } else if (dist_name == "jsd"){
+    return jensen_shannon(values1, values2);
+  } else if (dist_name == "dtw"){
+    return dtw3(values1, values2);
+  } else if (dist_name == "dtw2d"){
+    return dtw2d(values1, values2);
+  } else if (dist_name != ""){
+    return custom_distance(values1, values2, dist_name);
+  } else {
+    return dist_fun(values1, values2);
+  }
+}
+
 double euclidean(std::vector<double>& values1, std::vector<double>& values2){
   int len1 = values1.size();
   double dist = 0.0;

diff --git a/src/distances.h b/src/distances.h
@@ -5,6 +5,9 @@
 
 using namespace std;
 
+/* Calculate the values distance between a center and an individual pixel. */
+double get_vals_dist(vector<double>& values1, vector<double>& values2,
+                           std::string& dist_name, cpp11::function dist_fun);
 double euclidean(std::vector<double>& values1, std::vector<double>& values2);
 double manhattan(vector<double>& values1, vector<double>& values2);
 double jensen_shannon(vector<double>& values1, vector<double>& values2);

diff --git a/src/private_functions.cpp b/src/private_functions.cpp
@@ -103,23 +103,6 @@ void Slic::inits(integers mat, doubles_matrix<> vals,
   }
 }
 
-double Slic::get_vals_dist(vector<double>& values1, vector<double>& values2,
-                           std::string& dist_name, cpp11::function dist_fun){
-  if (dist_name == "euclidean"){
-    return euclidean(values1, values2);
-  } else if (dist_name == "jsd"){
-    return jensen_shannon(values1, values2);
-  } else if (dist_name == "dtw"){
-    return dtw3(values1, values2);
-  } else if (dist_name == "dtw2d"){
-    return dtw2d(values1, values2);
-  } else if (dist_name != ""){
-    return custom_distance(values1, values2, dist_name);
-  } else {
-    return dist_fun(values1, values2);
-  }
-}
-
 double Slic::compute_dist(int& ci, int& y, int& x, vector<double>& values,
                           std::string& dist_name, cpp11::function dist_fun) {
 
@@ -180,6 +163,3 @@ vector<int> Slic::find_local_minimum(doubles_matrix<> vals, int& y, int& x,
   }
   return loc_min;
 }
-
-
-
diff --git a/src/slic.h b/src/slic.h
@@ -54,10 +54,6 @@ class Slic {
                          std::string& dist_name, cpp11::function dist_fun,
                          integers_matrix<> input_centers);
 
-    /* Calculate the values distance between a center and an individual pixel. */
-    double get_vals_dist(vector<double>& values1, vector<double>& values2,
-                         std::string& dist_name, cpp11::function dist_fun);
-
     /* Compute the total (spatial and value) distance between a center and an individual pixel. */
     double compute_dist(int& ci, int& y, int& x, vector<double>& value,
                         std::string& dist_name, cpp11::function dist_fun);