garbage collect unused APIarnej/remove-convert-in-calculator

7 files changed, 8 insertions, 19 deletions

diff --git a/searchlib/src/vespa/searchlib/tensor/angular_distance.h b/searchlib/src/vespa/searchlib/tensor/angular_distance.h
index bba83576153..caed5d8c216 100644
--- a/searchlib/src/vespa/searchlib/tensor/angular_distance.h
+++ b/searchlib/src/vespa/searchlib/tensor/angular_distance.h
@@ -78,10 +78,7 @@ private:
 template <typename FloatType>
 class AngularDistanceFunctionFactory : public DistanceFunctionFactory {
 public:
-    AngularDistanceFunctionFactory()
-        : DistanceFunctionFactory(vespalib::eval::get_cell_type<FloatType>())
-        {}
-
+    AngularDistanceFunctionFactory() = default;
     BoundDistanceFunction::UP for_query_vector(const vespalib::eval::TypedCells& lhs) override;
     BoundDistanceFunction::UP for_insertion_vector(const vespalib::eval::TypedCells& lhs) override;
 };
diff --git a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp
index c088d498f0f..36411b183f9 100644
--- a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.cpp
@@ -77,8 +77,7 @@ class SimpleDistanceFunctionFactory : public DistanceFunctionFactory {
     DistanceFunction::UP _df;
 public:
     SimpleDistanceFunctionFactory(DistanceFunction::UP df)
-        : DistanceFunctionFactory(df->expected_cell_type()),
-          _df(std::move(df))
+        : _df(std::move(df))
         {}
 
     BoundDistanceFunction::UP for_query_vector(const vespalib::eval::TypedCells& lhs) override {
diff --git a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.h b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.h
index 1edb94bd7aa..433c8e1962a 100644
--- a/searchlib/src/vespa/searchlib/tensor/distance_function_factory.h
+++ b/searchlib/src/vespa/searchlib/tensor/distance_function_factory.h
@@ -15,8 +15,7 @@ namespace search::tensor {
  * for one particular vector in the distance function object.
  */
 struct DistanceFunctionFactory {
-    const vespalib::eval::CellType expected_cell_type;
-    DistanceFunctionFactory(vespalib::eval::CellType ct) : expected_cell_type(ct) {}
+    DistanceFunctionFactory() = default;
     virtual ~DistanceFunctionFactory() {}
     virtual BoundDistanceFunction::UP for_query_vector(const vespalib::eval::TypedCells& lhs) = 0;
     virtual BoundDistanceFunction::UP for_insertion_vector(const vespalib::eval::TypedCells& lhs) = 0;
@@ -25,7 +24,7 @@ struct DistanceFunctionFactory {
 
 /**
  * Create a distance function object customized for the given metric
- * variant and cell type.
+ * variant and (attribute) cell type.
  **/
 DistanceFunction::UP
 make_distance_function(search::attribute::DistanceMetric variant,
diff --git a/searchlib/src/vespa/searchlib/tensor/euclidean_distance.h b/searchlib/src/vespa/searchlib/tensor/euclidean_distance.h
index b406f0d3d1a..06295caee9e 100644
--- a/searchlib/src/vespa/searchlib/tensor/euclidean_distance.h
+++ b/searchlib/src/vespa/searchlib/tensor/euclidean_distance.h
@@ -83,9 +83,7 @@ private:
 template <typename FloatType>
 class EuclideanDistanceFunctionFactory : public DistanceFunctionFactory {
 public:
-    EuclideanDistanceFunctionFactory()
-        : DistanceFunctionFactory(vespalib::eval::get_cell_type<FloatType>())
-        {}
+    EuclideanDistanceFunctionFactory() = default;
     BoundDistanceFunction::UP for_query_vector(const vespalib::eval::TypedCells& lhs) override;
     BoundDistanceFunction::UP for_insertion_vector(const vespalib::eval::TypedCells& lhs) override;
 };
diff --git a/searchlib/src/vespa/searchlib/tensor/geo_degrees_distance.h b/searchlib/src/vespa/searchlib/tensor/geo_degrees_distance.h
index 4522bc03c9e..56f75f6daed 100644
--- a/searchlib/src/vespa/searchlib/tensor/geo_degrees_distance.h
+++ b/searchlib/src/vespa/searchlib/tensor/geo_degrees_distance.h
@@ -53,7 +53,7 @@ public:
 
 class GeoDistanceFunctionFactory : public DistanceFunctionFactory {
 public:
-    GeoDistanceFunctionFactory() : DistanceFunctionFactory(vespalib::eval::CellType::DOUBLE) {}
+    GeoDistanceFunctionFactory() = default;
     BoundDistanceFunction::UP for_query_vector(const vespalib::eval::TypedCells& lhs) override;
     BoundDistanceFunction::UP for_insertion_vector(const vespalib::eval::TypedCells& lhs) override;
 };
diff --git a/searchlib/src/vespa/searchlib/tensor/hamming_distance.h b/searchlib/src/vespa/searchlib/tensor/hamming_distance.h
index 23c855eb137..3022e0da503 100644
--- a/searchlib/src/vespa/searchlib/tensor/hamming_distance.h
+++ b/searchlib/src/vespa/searchlib/tensor/hamming_distance.h
@@ -33,9 +33,7 @@ public:
 template <typename FloatType>
 class HammingDistanceFunctionFactory : public DistanceFunctionFactory {
 public:
-    HammingDistanceFunctionFactory()
-        : DistanceFunctionFactory(vespalib::eval::get_cell_type<FloatType>())
-        {}
+    HammingDistanceFunctionFactory() = default;
     BoundDistanceFunction::UP for_query_vector(const vespalib::eval::TypedCells& lhs) override;
     BoundDistanceFunction::UP for_insertion_vector(const vespalib::eval::TypedCells& lhs) override;
 };
diff --git a/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.h b/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.h
index 88953a236e7..be1699c36ad 100644
--- a/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.h
+++ b/searchlib/src/vespa/searchlib/tensor/prenormalized_angular_distance.h
@@ -17,9 +17,7 @@ namespace search::tensor {
 template <typename FloatType>
 class PrenormalizedAngularDistanceFunctionFactory : public DistanceFunctionFactory {
 public:
-    PrenormalizedAngularDistanceFunctionFactory()
-        : DistanceFunctionFactory(vespalib::eval::get_cell_type<FloatType>())
-        {}
+    PrenormalizedAngularDistanceFunctionFactory() = default;
     BoundDistanceFunction::UP for_query_vector(const vespalib::eval::TypedCells& lhs) override;
     BoundDistanceFunction::UP for_insertion_vector(const vespalib::eval::TypedCells& lhs) override;
 };