Added test

Author: mariusmuja

test/flann_hierarchical_test.cpp

@@ -63,6 +63,13 @@ TEST_F(HierarchicalIndex_Brief100K, TestSearch)
 			query, indices, dists, k_nn_, flann::SearchParams(2000), 0.9, gt_indices, gt_dists);
 }
 
+TEST_F(HierarchicalIndex_Brief100K, TestSearch2)
+{
+	TestSearch2<Distance>(data, flann::HierarchicalClusteringIndexParams(),
+			query, indices, dists, k_nn_, flann::SearchParams(2000), 0.9, gt_indices, gt_dists);
+}
+
+
 TEST_F(HierarchicalIndex_Brief100K, TestAddIncremental)
 {
 	TestAddIncremental<Distance>(data, flann::HierarchicalClusteringIndexParams(),
@@ -101,6 +108,9 @@ TEST_F(HierarchicalIndex_Brief100K, TestCopy2)
 }
 
 
+
+
+
 int main(int argc, char** argv)
 {
 	testing::InitGoogleTest(&argc, argv);

test/flann_kdtree_test.cpp

@@ -22,6 +22,13 @@ TEST_F(KDTree_SIFT10K, TestSearch)
 			dists, knn, flann::SearchParams(256), 0.75, gt_indices);
 }
 
+TEST_F(KDTree_SIFT10K, TestSearch2)
+{
+	TestSearch2<flann::L2<float> >(data, flann::KDTreeIndexParams(4), query, indices,
+			dists, knn, flann::SearchParams(256), 0.75, gt_indices);
+}
+
+
 TEST_F(KDTree_SIFT10K, TestAddIncremental)
 {
 	TestAddIncremental<flann::L2<float> >(data, flann::KDTreeIndexParams(4), query, indices,

test/flann_tests.h

@@ -164,6 +164,43 @@ class FLANNTestFixture : public ::testing::Test {
 		printf("Precision: %g\n", precision);
 	}
 
+
+	template<typename Distance>
+	void TestSearch2(const flann::Matrix<typename Distance::ElementType>& data,
+			const flann::IndexParams& index_params,
+			const flann::Matrix<typename Distance::ElementType>& query,
+			flann::Matrix<size_t>& indices,
+			flann::Matrix<typename Distance::ResultType>& dists,
+			size_t knn,
+			const flann::SearchParams& search_params,
+			float expected_precision,
+			const flann::Matrix<size_t>& gt_indices,
+			const flann::Matrix<typename Distance::ResultType>& gt_dists = flann::Matrix<typename Distance::ResultType>())
+	{
+		flann::seed_random(0);
+		Index<Distance> index(index_params);
+		char message[256];
+		const char* index_name = index_type_to_name(index.getType());
+		sprintf(message, "Building %s index... ", index_name);
+		start_timer( message );
+		index.buildIndex(data);
+		printf("done (%g seconds)\n", stop_timer());
+
+		start_timer("Searching KNN...");
+		index.knnSearch(query, indices, dists, knn, search_params );
+		printf("done (%g seconds)\n", stop_timer());
+
+		float precision;
+		if (gt_dists.ptr()==NULL) {
+			precision = compute_precision(gt_indices, indices);
+		}
+		else {
+			precision = computePrecisionDiscrete(gt_dists, dists);
+		}
+		EXPECT_GE(precision, expected_precision);
+		printf("Precision: %g\n", precision);
+	}
+
 	template<typename Distance>
 	void TestAddIncremental(const flann::Matrix<typename Distance::ElementType>& data,
 			const flann::IndexParams& index_params,