From fdf69b481bf1742b14fe555bc7e0ec51238f85ed Mon Sep 17 00:00:00 2001
From: asantamaria <asantamaria@iri.upc.edu>
Date: Tue, 22 Jan 2019 16:03:58 +0100
Subject: [PATCH] Cleaning unnecessary casts
---
src/examples/fundamental_matrix.cpp | 59 -------------------
src/examples/test_algorithm_activesearch.cpp | 59 -------------------
src/examples/test_algorithm_anms.cpp | 59 -------------------
.../test_algorithm_opticalflowpyrlk.cpp | 25 --------
src/examples/test_algorithm_trackfeatures.cpp | 59 -------------------
src/examples/test_descriptor.cpp | 48 ---------------
src/examples/test_detector.cpp | 25 --------
src/examples/test_matcher.cpp | 59 -------------------
src/test/gtest_detectors.cpp | 27 ---------
9 files changed, 420 deletions(-)
diff --git a/src/examples/fundamental_matrix.cpp b/src/examples/fundamental_matrix.cpp
index 98ffef9..3f44500 100644
--- a/src/examples/fundamental_matrix.cpp
+++ b/src/examples/fundamental_matrix.cpp
@@ -67,73 +67,14 @@ int main(int argc, char** argv)
std::string det_name = vision_utils::readYamlType(yaml_file_params_vision_utils, "detector");
vision_utils::DetectorBasePtr det_ptr = vision_utils::setupDetector(det_name, det_name + " detector", yaml_file_params_vision_utils);
- if (det_name.compare("ORB") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorORB>(det_ptr);
- else if (det_name.compare("FAST") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorFAST>(det_ptr);
- else if (det_name.compare("SIFT") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorSIFT>(det_ptr);
- else if (det_name.compare("SURF") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorSURF>(det_ptr);
- else if (det_name.compare("BRISK") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorBRISK>(det_ptr);
- else if (det_name.compare("MSER") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorMSER>(det_ptr);
- else if (det_name.compare("GFTT") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorGFTT>(det_ptr);
- else if (det_name.compare("HARRIS") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorHARRIS>(det_ptr);
- else if (det_name.compare("SBD") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorSBD>(det_ptr);
- else if (det_name.compare("KAZE") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorKAZE>(det_ptr);
- else if (det_name.compare("AKAZE") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorAKAZE>(det_ptr);
- else if (det_name.compare("AGAST") == 0)
- det_ptr = std::static_pointer_cast<vision_utils::DetectorAGAST>(det_ptr);
-
// Descriptor
std::string des_name = vision_utils::readYamlType(yaml_file_params_vision_utils, "descriptor");
vision_utils::DescriptorBasePtr des_ptr = vision_utils::setupDescriptor(des_name, des_name + " descriptor", yaml_file_params_vision_utils);
- if (des_name.compare("ORB") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorORB>(des_ptr);
- else if (des_name.compare("SIFT") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorSIFT>(des_ptr);
- else if (des_name.compare("SURF") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorSURF>(des_ptr);
- else if (des_name.compare("BRISK") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorBRISK>(des_ptr);
- else if (des_name.compare("KAZE") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorKAZE>(des_ptr);
- else if (des_name.compare("AKAZE") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorAKAZE>(des_ptr);
- else if (des_name.compare("LATCH") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorLATCH>(des_ptr);
- else if (des_name.compare("FREAK") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorFREAK>(des_ptr);
- else if (des_name.compare("BRIEF") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorBRIEF>(des_ptr);
- else if (des_name.compare("DAISY") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorDAISY>(des_ptr);
- else if (des_name.compare("LUCID") == 0)
- des_ptr = std::static_pointer_cast<vision_utils::DescriptorLUCID>(des_ptr);
-
// Matcher
std::string mat_name = vision_utils::readYamlType(yaml_file_params_vision_utils, "matcher");
vision_utils::MatcherBasePtr mat_ptr = vision_utils::setupMatcher(mat_name, mat_name + " matcher", yaml_file_params_vision_utils);
- if (mat_name.compare("FLANNBASED") == 0)
- mat_ptr = std::static_pointer_cast<vision_utils::MatcherFLANNBASED>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE") == 0)
- mat_ptr = std::static_pointer_cast<vision_utils::MatcherBRUTEFORCE>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_L1") == 0)
- mat_ptr = std::static_pointer_cast<vision_utils::MatcherBRUTEFORCE_L1>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING") == 0)
- mat_ptr = std::static_pointer_cast<vision_utils::MatcherBRUTEFORCE_HAMMING>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING_2") == 0)
- mat_ptr = std::static_pointer_cast<vision_utils::MatcherBRUTEFORCE_HAMMING_2>(mat_ptr);
-
// set and print image properties
unsigned int img_width = (unsigned int)capture.get(CV_CAP_PROP_FRAME_WIDTH);
unsigned int img_height = (unsigned int)capture.get(CV_CAP_PROP_FRAME_HEIGHT);
diff --git a/src/examples/test_algorithm_activesearch.cpp b/src/examples/test_algorithm_activesearch.cpp
index dcba809..102bb65 100644
--- a/src/examples/test_algorithm_activesearch.cpp
+++ b/src/examples/test_algorithm_activesearch.cpp
@@ -43,73 +43,14 @@ int main(void)
std::string det_name = readYamlType(yaml_file_params, "detector");
DetectorBasePtr det_ptr = setupDetector(det_name, det_name + " detector", yaml_file_params);
- if (det_name.compare("ORB") == 0)
- det_ptr = std::static_pointer_cast<DetectorORB>(det_ptr);
- else if (det_name.compare("FAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorFAST>(det_ptr);
- else if (det_name.compare("SIFT") == 0)
- det_ptr = std::static_pointer_cast<DetectorSIFT>(det_ptr);
- else if (det_name.compare("SURF") == 0)
- det_ptr = std::static_pointer_cast<DetectorSURF>(det_ptr);
- else if (det_name.compare("BRISK") == 0)
- det_ptr = std::static_pointer_cast<DetectorBRISK>(det_ptr);
- else if (det_name.compare("MSER") == 0)
- det_ptr = std::static_pointer_cast<DetectorMSER>(det_ptr);
- else if (det_name.compare("GFTT") == 0)
- det_ptr = std::static_pointer_cast<DetectorGFTT>(det_ptr);
- else if (det_name.compare("HARRIS") == 0)
- det_ptr = std::static_pointer_cast<DetectorHARRIS>(det_ptr);
- else if (det_name.compare("SBD") == 0)
- det_ptr = std::static_pointer_cast<DetectorSBD>(det_ptr);
- else if (det_name.compare("KAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorKAZE>(det_ptr);
- else if (det_name.compare("AKAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorAKAZE>(det_ptr);
- else if (det_name.compare("AGAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorAGAST>(det_ptr);
-
// Descriptor
std::string des_name = readYamlType(yaml_file_params, "descriptor");
DescriptorBasePtr des_ptr = setupDescriptor(des_name, des_name + " descriptor", yaml_file_params);
- if (des_name.compare("ORB") == 0)
- des_ptr = std::static_pointer_cast<DescriptorORB>(des_ptr);
- else if (des_name.compare("SIFT") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSIFT>(des_ptr);
- else if (des_name.compare("SURF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSURF>(des_ptr);
- else if (des_name.compare("BRISK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRISK>(des_ptr);
- else if (des_name.compare("KAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorKAZE>(des_ptr);
- else if (des_name.compare("AKAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorAKAZE>(des_ptr);
- else if (des_name.compare("LATCH") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLATCH>(des_ptr);
- else if (des_name.compare("FREAK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorFREAK>(des_ptr);
- else if (des_name.compare("BRIEF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRIEF>(des_ptr);
- else if (des_name.compare("DAISY") == 0)
- des_ptr = std::static_pointer_cast<DescriptorDAISY>(des_ptr);
- else if (des_name.compare("LUCID") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLUCID>(des_ptr);
-
// Matcher
std::string mat_name = readYamlType(yaml_file_params, "matcher");
MatcherBasePtr mat_ptr = setupMatcher(mat_name, mat_name + " matcher", yaml_file_params);
- if (mat_name.compare("FLANNBASED") == 0)
- mat_ptr = std::static_pointer_cast<MatcherFLANNBASED>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_L1") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_L1>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_HAMMING>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING_2") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_HAMMING_2>(mat_ptr);
-
// User info
std::cout << std::endl << "... Testing " << det_ptr->getName() << ", " << des_ptr->getName() << ", " << mat_ptr->getName() << " and " << active_search_grid_ptr->getName() << " ..." << std::endl;
diff --git a/src/examples/test_algorithm_anms.cpp b/src/examples/test_algorithm_anms.cpp
index 91cbedd..81d350e 100644
--- a/src/examples/test_algorithm_anms.cpp
+++ b/src/examples/test_algorithm_anms.cpp
@@ -41,73 +41,14 @@ int main(void)
std::string det_name = readYamlType(yaml_file_params, "detector");
DetectorBasePtr det_ptr = setupDetector(det_name, det_name + " detector", yaml_file_params);
- if (det_name.compare("ORB") == 0)
- det_ptr = std::static_pointer_cast<DetectorORB>(det_ptr);
- else if (det_name.compare("FAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorFAST>(det_ptr);
- else if (det_name.compare("SIFT") == 0)
- det_ptr = std::static_pointer_cast<DetectorSIFT>(det_ptr);
- else if (det_name.compare("SURF") == 0)
- det_ptr = std::static_pointer_cast<DetectorSURF>(det_ptr);
- else if (det_name.compare("BRISK") == 0)
- det_ptr = std::static_pointer_cast<DetectorBRISK>(det_ptr);
- else if (det_name.compare("MSER") == 0)
- det_ptr = std::static_pointer_cast<DetectorMSER>(det_ptr);
- else if (det_name.compare("GFTT") == 0)
- det_ptr = std::static_pointer_cast<DetectorGFTT>(det_ptr);
- else if (det_name.compare("HARRIS") == 0)
- det_ptr = std::static_pointer_cast<DetectorHARRIS>(det_ptr);
- else if (det_name.compare("SBD") == 0)
- det_ptr = std::static_pointer_cast<DetectorSBD>(det_ptr);
- else if (det_name.compare("KAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorKAZE>(det_ptr);
- else if (det_name.compare("AKAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorAKAZE>(det_ptr);
- else if (det_name.compare("AGAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorAGAST>(det_ptr);
-
// Descriptor
std::string des_name = readYamlType(yaml_file_params, "descriptor");
DescriptorBasePtr des_ptr = setupDescriptor(des_name, des_name + " descriptor", yaml_file_params);
- if (des_name.compare("ORB") == 0)
- des_ptr = std::static_pointer_cast<DescriptorORB>(des_ptr);
- else if (des_name.compare("SIFT") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSIFT>(des_ptr);
- else if (des_name.compare("SURF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSURF>(des_ptr);
- else if (des_name.compare("BRISK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRISK>(des_ptr);
- else if (des_name.compare("KAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorKAZE>(des_ptr);
- else if (des_name.compare("AKAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorAKAZE>(des_ptr);
- else if (des_name.compare("LATCH") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLATCH>(des_ptr);
- else if (des_name.compare("FREAK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorFREAK>(des_ptr);
- else if (des_name.compare("BRIEF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRIEF>(des_ptr);
- else if (des_name.compare("DAISY") == 0)
- des_ptr = std::static_pointer_cast<DescriptorDAISY>(des_ptr);
- else if (des_name.compare("LUCID") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLUCID>(des_ptr);
-
// Matcher
std::string mat_name = readYamlType(yaml_file_params, "matcher");
MatcherBasePtr mat_ptr = setupMatcher(mat_name, mat_name + " matcher", yaml_file_params);
- if (mat_name.compare("FLANNBASED") == 0)
- mat_ptr = std::static_pointer_cast<MatcherFLANNBASED>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_L1") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_L1>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_HAMMING>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING_2") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_HAMMING_2>(mat_ptr);
-
// User info
std::cout << std::endl << "... Testing " << det_ptr->getName() << ", " << des_ptr->getName() << ", " << mat_ptr->getName() << " and ANMS" << " ..." << std::endl;
diff --git a/src/examples/test_algorithm_opticalflowpyrlk.cpp b/src/examples/test_algorithm_opticalflowpyrlk.cpp
index 7ccd57f..c0cf4b3 100644
--- a/src/examples/test_algorithm_opticalflowpyrlk.cpp
+++ b/src/examples/test_algorithm_opticalflowpyrlk.cpp
@@ -41,31 +41,6 @@ int main(void)
std::string det_name = readYamlType(yaml_file_params, "detector");
DetectorBasePtr det_ptr = setupDetector(det_name, det_name + " detector", yaml_file_params);
- if (det_name.compare("ORB") == 0)
- det_ptr = std::static_pointer_cast<DetectorORB>(det_ptr);
- else if (det_name.compare("FAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorFAST>(det_ptr);
- else if (det_name.compare("SIFT") == 0)
- det_ptr = std::static_pointer_cast<DetectorSIFT>(det_ptr);
- else if (det_name.compare("SURF") == 0)
- det_ptr = std::static_pointer_cast<DetectorSURF>(det_ptr);
- else if (det_name.compare("BRISK") == 0)
- det_ptr = std::static_pointer_cast<DetectorBRISK>(det_ptr);
- else if (det_name.compare("MSER") == 0)
- det_ptr = std::static_pointer_cast<DetectorMSER>(det_ptr);
- else if (det_name.compare("GFTT") == 0)
- det_ptr = std::static_pointer_cast<DetectorGFTT>(det_ptr);
- else if (det_name.compare("HARRIS") == 0)
- det_ptr = std::static_pointer_cast<DetectorHARRIS>(det_ptr);
- else if (det_name.compare("SBD") == 0)
- det_ptr = std::static_pointer_cast<DetectorSBD>(det_ptr);
- else if (det_name.compare("KAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorKAZE>(det_ptr);
- else if (det_name.compare("AKAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorAKAZE>(det_ptr);
- else if (det_name.compare("AGAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorAGAST>(det_ptr);
-
// User info
std::cout << std::endl << "... Testing " << det_ptr->getName() << " with " << alg_of_ptr->getName() << " ..." << std::endl;
diff --git a/src/examples/test_algorithm_trackfeatures.cpp b/src/examples/test_algorithm_trackfeatures.cpp
index ef0441b..6040b5c 100644
--- a/src/examples/test_algorithm_trackfeatures.cpp
+++ b/src/examples/test_algorithm_trackfeatures.cpp
@@ -43,73 +43,14 @@ int main(void)
std::string det_name = readYamlType(yaml_file_params, "detector");
DetectorBasePtr det_ptr = setupDetector(det_name, det_name + " detector", yaml_file_params);
- if (det_name.compare("ORB") == 0)
- det_ptr = std::static_pointer_cast<DetectorORB>(det_ptr);
- else if (det_name.compare("FAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorFAST>(det_ptr);
- else if (det_name.compare("SIFT") == 0)
- det_ptr = std::static_pointer_cast<DetectorSIFT>(det_ptr);
- else if (det_name.compare("SURF") == 0)
- det_ptr = std::static_pointer_cast<DetectorSURF>(det_ptr);
- else if (det_name.compare("BRISK") == 0)
- det_ptr = std::static_pointer_cast<DetectorBRISK>(det_ptr);
- else if (det_name.compare("MSER") == 0)
- det_ptr = std::static_pointer_cast<DetectorMSER>(det_ptr);
- else if (det_name.compare("GFTT") == 0)
- det_ptr = std::static_pointer_cast<DetectorGFTT>(det_ptr);
- else if (det_name.compare("HARRIS") == 0)
- det_ptr = std::static_pointer_cast<DetectorHARRIS>(det_ptr);
- else if (det_name.compare("SBD") == 0)
- det_ptr = std::static_pointer_cast<DetectorSBD>(det_ptr);
- else if (det_name.compare("KAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorKAZE>(det_ptr);
- else if (det_name.compare("AKAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorAKAZE>(det_ptr);
- else if (det_name.compare("AGAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorAGAST>(det_ptr);
-
// Descriptor
std::string des_name = readYamlType(yaml_file_params, "descriptor");
DescriptorBasePtr des_ptr = setupDescriptor(des_name, des_name + " descriptor", yaml_file_params);
- if (des_name.compare("ORB") == 0)
- des_ptr = std::static_pointer_cast<DescriptorORB>(des_ptr);
- else if (des_name.compare("SIFT") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSIFT>(des_ptr);
- else if (des_name.compare("SURF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSURF>(des_ptr);
- else if (des_name.compare("BRISK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRISK>(des_ptr);
- else if (des_name.compare("KAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorKAZE>(des_ptr);
- else if (des_name.compare("AKAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorAKAZE>(des_ptr);
- else if (des_name.compare("LATCH") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLATCH>(des_ptr);
- else if (des_name.compare("FREAK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorFREAK>(des_ptr);
- else if (des_name.compare("BRIEF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRIEF>(des_ptr);
- else if (des_name.compare("DAISY") == 0)
- des_ptr = std::static_pointer_cast<DescriptorDAISY>(des_ptr);
- else if (des_name.compare("LUCID") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLUCID>(des_ptr);
-
// Matcher
std::string mat_name = readYamlType(yaml_file_params, "matcher");
MatcherBasePtr mat_ptr = setupMatcher(mat_name, mat_name + " matcher", yaml_file_params);
- if (mat_name.compare("FLANNBASED") == 0)
- mat_ptr = std::static_pointer_cast<MatcherFLANNBASED>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_L1") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_L1>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_HAMMING>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING_2") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_HAMMING_2>(mat_ptr);
-
// User info
std::cout << std::endl << "... Testing " << det_ptr->getName() << ", " << des_ptr->getName() << ", " << mat_ptr->getName() << " and " << tracker_ptr->getName() << " ..." << std::endl;
diff --git a/src/examples/test_descriptor.cpp b/src/examples/test_descriptor.cpp
index f43fb97..532b426 100644
--- a/src/examples/test_descriptor.cpp
+++ b/src/examples/test_descriptor.cpp
@@ -31,31 +31,6 @@ int main(void)
DetectorBasePtr det_ptr = setupDetector(det_name, det_name + " detector", vu_root + path_yaml_file + "/" + det_name + ".yaml");
- if (det_name.compare("ORB") == 0)
- det_ptr = std::static_pointer_cast<DetectorORB>(det_ptr);
- else if (det_name.compare("FAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorFAST>(det_ptr);
- else if (det_name.compare("SIFT") == 0)
- det_ptr = std::static_pointer_cast<DetectorSIFT>(det_ptr);
- else if (det_name.compare("SURF") == 0)
- det_ptr = std::static_pointer_cast<DetectorSURF>(det_ptr);
- else if (det_name.compare("BRISK") == 0)
- det_ptr = std::static_pointer_cast<DetectorBRISK>(det_ptr);
- else if (det_name.compare("MSER") == 0)
- det_ptr = std::static_pointer_cast<DetectorMSER>(det_ptr);
- else if (det_name.compare("GFTT") == 0)
- det_ptr = std::static_pointer_cast<DetectorGFTT>(det_ptr);
- else if (det_name.compare("HARRIS") == 0)
- det_ptr = std::static_pointer_cast<DetectorHARRIS>(det_ptr);
- else if (det_name.compare("SBD") == 0)
- det_ptr = std::static_pointer_cast<DetectorSBD>(det_ptr);
- else if (det_name.compare("KAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorKAZE>(det_ptr);
- else if (det_name.compare("AKAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorAKAZE>(det_ptr);
- else if (det_name.compare("AGAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorAGAST>(det_ptr);
-
std::cout << "\n================ DESCRIPTOR TEST =================" << std::endl;
std::string def_descriptor = "ORB";
@@ -64,29 +39,6 @@ int main(void)
DescriptorBasePtr des_ptr = setupDescriptor(des_name, des_name + " descriptor", vu_root + path_yaml_file + "/" + des_name + ".yaml");
- if (des_name.compare("ORB") == 0)
- des_ptr = std::static_pointer_cast<DescriptorORB>(des_ptr);
- else if (des_name.compare("SIFT") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSIFT>(des_ptr);
- else if (des_name.compare("SURF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSURF>(des_ptr);
- else if (des_name.compare("BRISK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRISK>(des_ptr);
- else if (des_name.compare("KAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorKAZE>(des_ptr);
- else if (des_name.compare("AKAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorAKAZE>(des_ptr);
- else if (des_name.compare("LATCH") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLATCH>(des_ptr);
- else if (des_name.compare("FREAK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorFREAK>(des_ptr);
- else if (des_name.compare("BRIEF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRIEF>(des_ptr);
- else if (des_name.compare("DAISY") == 0)
- des_ptr = std::static_pointer_cast<DescriptorDAISY>(des_ptr);
- else if (des_name.compare("LUCID") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLUCID>(des_ptr);
-
std::cout << std::endl << "... Testing " << det_ptr->getName() << " with " << des_ptr->getName() << " ..." << std::endl;
// Open camera
diff --git a/src/examples/test_detector.cpp b/src/examples/test_detector.cpp
index 14d634a..f909143 100644
--- a/src/examples/test_detector.cpp
+++ b/src/examples/test_detector.cpp
@@ -32,31 +32,6 @@ int main(void)
DetectorBasePtr det_ptr = setupDetector(det_name, det_name + " detector", vu_root + path_yaml_file + "/" + det_name + ".yaml");
- if (det_name.compare("ORB") == 0)
- det_ptr = std::static_pointer_cast<DetectorORB>(det_ptr);
- else if (det_name.compare("FAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorFAST>(det_ptr);
- else if (det_name.compare("SIFT") == 0)
- det_ptr = std::static_pointer_cast<DetectorSIFT>(det_ptr);
- else if (det_name.compare("SURF") == 0)
- det_ptr = std::static_pointer_cast<DetectorSURF>(det_ptr);
- else if (det_name.compare("BRISK") == 0)
- det_ptr = std::static_pointer_cast<DetectorBRISK>(det_ptr);
- else if (det_name.compare("MSER") == 0)
- det_ptr = std::static_pointer_cast<DetectorMSER>(det_ptr);
- else if (det_name.compare("GFTT") == 0)
- det_ptr = std::static_pointer_cast<DetectorGFTT>(det_ptr);
- else if (det_name.compare("HARRIS") == 0)
- det_ptr = std::static_pointer_cast<DetectorHARRIS>(det_ptr);
- else if (det_name.compare("SBD") == 0)
- det_ptr = std::static_pointer_cast<DetectorSBD>(det_ptr);
- else if (det_name.compare("KAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorKAZE>(det_ptr);
- else if (det_name.compare("AKAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorAKAZE>(det_ptr);
- else if (det_name.compare("AGAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorAGAST>(det_ptr);
-
std::cout << std::endl << "... Testing " << det_ptr->getName() << " ..." << std::endl;
// Open camera
diff --git a/src/examples/test_matcher.cpp b/src/examples/test_matcher.cpp
index 7f68a07..3b6cb23 100644
--- a/src/examples/test_matcher.cpp
+++ b/src/examples/test_matcher.cpp
@@ -32,60 +32,12 @@ int main(void)
DetectorBasePtr det_ptr = setupDetector(det_name, det_name + " detector", vu_root + path_yaml_file + "/" + det_name + ".yaml");
- if (det_name.compare("ORB") == 0)
- det_ptr = std::static_pointer_cast<DetectorORB>(det_ptr);
- else if (det_name.compare("FAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorFAST>(det_ptr);
- else if (det_name.compare("SIFT") == 0)
- det_ptr = std::static_pointer_cast<DetectorSIFT>(det_ptr);
- else if (det_name.compare("SURF") == 0)
- det_ptr = std::static_pointer_cast<DetectorSURF>(det_ptr);
- else if (det_name.compare("BRISK") == 0)
- det_ptr = std::static_pointer_cast<DetectorBRISK>(det_ptr);
- else if (det_name.compare("MSER") == 0)
- det_ptr = std::static_pointer_cast<DetectorMSER>(det_ptr);
- else if (det_name.compare("GFTT") == 0)
- det_ptr = std::static_pointer_cast<DetectorGFTT>(det_ptr);
- else if (det_name.compare("HARRIS") == 0)
- det_ptr = std::static_pointer_cast<DetectorHARRIS>(det_ptr);
- else if (det_name.compare("SBD") == 0)
- det_ptr = std::static_pointer_cast<DetectorSBD>(det_ptr);
- else if (det_name.compare("KAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorKAZE>(det_ptr);
- else if (det_name.compare("AKAZE") == 0)
- det_ptr = std::static_pointer_cast<DetectorAKAZE>(det_ptr);
- else if (det_name.compare("AGAST") == 0)
- det_ptr = std::static_pointer_cast<DetectorAGAST>(det_ptr);
-
std::string def_descriptor = "ORB";
std::cout << std::endl << "Which DESCRIPTOR do you want to test? Type one of the registered names [default: " << def_descriptor << "]: ";
std::string des_name = readFromUser(def_descriptor);
DescriptorBasePtr des_ptr = setupDescriptor(des_name, des_name + " descriptor", vu_root + path_yaml_file + "/" + des_name + ".yaml");
- if (des_name.compare("ORB") == 0)
- des_ptr = std::static_pointer_cast<DescriptorORB>(des_ptr);
- else if (des_name.compare("SIFT") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSIFT>(des_ptr);
- else if (des_name.compare("SURF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorSURF>(des_ptr);
- else if (des_name.compare("BRISK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRISK>(des_ptr);
- else if (des_name.compare("KAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorKAZE>(des_ptr);
- else if (des_name.compare("AKAZE") == 0)
- des_ptr = std::static_pointer_cast<DescriptorAKAZE>(des_ptr);
- else if (des_name.compare("LATCH") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLATCH>(des_ptr);
- else if (des_name.compare("FREAK") == 0)
- des_ptr = std::static_pointer_cast<DescriptorFREAK>(des_ptr);
- else if (des_name.compare("BRIEF") == 0)
- des_ptr = std::static_pointer_cast<DescriptorBRIEF>(des_ptr);
- else if (des_name.compare("DAISY") == 0)
- des_ptr = std::static_pointer_cast<DescriptorDAISY>(des_ptr);
- else if (des_name.compare("LUCID") == 0)
- des_ptr = std::static_pointer_cast<DescriptorLUCID>(des_ptr);
-
std::cout << "\n================ MATCHER TEST =================" << std::endl;
std::string def_matcher = "BRUTEFORCE";
@@ -94,17 +46,6 @@ int main(void)
MatcherBasePtr mat_ptr = setupMatcher(mat_name, mat_name + " matcher", vu_root + path_yaml_file + "/" + mat_name + ".yaml");
- if (mat_name.compare("FLANNBASED") == 0)
- mat_ptr = std::static_pointer_cast<MatcherFLANNBASED>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_L1") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_L1>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_HAMMING>(mat_ptr);
- if (mat_name.compare("BRUTEFORCE_HAMMING_2") == 0)
- mat_ptr = std::static_pointer_cast<MatcherBRUTEFORCE_HAMMING_2>(mat_ptr);
-
std::cout << std::endl << "... Testing " << det_ptr->getName() << " with " << des_ptr->getName() << " and " << mat_ptr->getName() << " ..." << std::endl;
// Open camera
diff --git a/src/test/gtest_detectors.cpp b/src/test/gtest_detectors.cpp
index 0e0b917..0e6a0ee 100644
--- a/src/test/gtest_detectors.cpp
+++ b/src/test/gtest_detectors.cpp
@@ -17,33 +17,6 @@ std::map<int, cv::Point2f> TestDetectorROI(const cv::Mat& _image, vision_utils::
{
std::map<int, cv::Point2f> points_found;
- if (_det_name.compare("ORB") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorORB>(_det_ptr);
- else if (_det_name.compare("FAST") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorFAST>(_det_ptr);
- else if (_det_name.compare("SIFT") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorSIFT>(_det_ptr);
- else if (_det_name.compare("SURF") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorSURF>(_det_ptr);
- else if (_det_name.compare("BRISK") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorBRISK>(_det_ptr);
- else if (_det_name.compare("MSER") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorMSER>(_det_ptr);
- else if (_det_name.compare("GFTT") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorGFTT>(_det_ptr);
- else if (_det_name.compare("HARRIS") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorHARRIS>(_det_ptr);
- else if (_det_name.compare("QUICKHARRIS") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorQUICKHARRIS>(_det_ptr);
- else if (_det_name.compare("SBD") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorSBD>(_det_ptr);
- else if (_det_name.compare("KAZE") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorKAZE>(_det_ptr);
- else if (_det_name.compare("AKAZE") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorAKAZE>(_det_ptr);
- else if (_det_name.compare("AGAST") == 0)
- _det_ptr = std::static_pointer_cast<vision_utils::DetectorAGAST>(_det_ptr);
-
if(_det_ptr==NULL)
return points_found;
--
GitLab