diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2023-04-27 23:20:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-27 23:20:10 +0200 |
| commit | 9c04252f9c8573bdbb787b5e3a0f671487eb412e (patch) | |
| tree | 2c111deed492fa8cb09ede189e2ca080c60c590d /streamingvisitors/src | |
| parent | 27cff4355a2f2bced9da6357ec6c1d7024ba70ff (diff) | |
| parent | 40d65770f45b6d4a16d19668487291c02597fa29 (diff) | |
Merge pull request #26893 from vespa-engine/arnej/remove-unused-distance-functions-3
remove unused distance functions
Diffstat (limited to 'streamingvisitors/src')
| -rw-r--r-- | streamingvisitors/src/tests/nearest_neighbor_field_searcher/nearest_neighbor_field_searcher_test.cpp | 4 | ||||
| -rw-r--r-- | streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/streamingvisitors/src/tests/nearest_neighbor_field_searcher/nearest_neighbor_field_searcher_test.cpp b/streamingvisitors/src/tests/nearest_neighbor_field_searcher/nearest_neighbor_field_searcher_test.cpp index b64d477fd4c..2cd9017653f 100644 --- a/streamingvisitors/src/tests/nearest_neighbor_field_searcher/nearest_neighbor_field_searcher_test.cpp +++ b/streamingvisitors/src/tests/nearest_neighbor_field_searcher/nearest_neighbor_field_searcher_test.cpp @@ -57,7 +57,6 @@ public: vsm::test::MockFieldSearcherEnv env; ValueType tensor_type; TensorDataType data_type; - SquaredEuclideanDistance dist_func; vsm::FieldIdT field_id; NearestNeighborFieldSearcher searcher; MockQuery query; @@ -66,7 +65,6 @@ public: : env(), tensor_type(ValueType::from_spec("tensor(x[2])")), data_type(tensor_type), - dist_func(CellType::DOUBLE), field_id(2), searcher(field_id, DistanceMetric::Euclidean), query() @@ -97,7 +95,7 @@ public: expect_match(exp_square_distance, node); } void expect_match(double exp_square_distance, const NearestNeighborQueryNode& node) { - double exp_raw_score = dist_func.to_rawscore(exp_square_distance); + double exp_raw_score = 1.0 / (1.0 + std::sqrt(exp_square_distance)); EXPECT_TRUE(node.evaluate()); EXPECT_DOUBLE_EQ(exp_square_distance, node.get_distance().value()); EXPECT_DOUBLE_EQ(exp_raw_score, node.get_raw_score().value()); diff --git a/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp index db4ee12438e..d4aee8ad652 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp +++ b/streamingvisitors/src/vespa/vsm/searcher/nearest_neighbor_field_searcher.cpp @@ -21,7 +21,6 @@ using search::attribute::Config; using search::fef::QueryValue; using search::tensor::DistanceCalculator; using search::tensor::TensorExtAttribute; -using search::tensor::make_distance_function; using vespalib::eval::ValueType; namespace { |