added akaze and fixed problem with yaml

src/detectors/brisk/detector_brisk_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsBRISKDetector(const std::string & _filename_dot
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "BRISK DET")
+        if(d_yaml["type"].as<string>() == "BRISK")
         {
         	params_ptr->thresh			= d_yaml["thresh"].as<int>();
         	params_ptr->octaves			= d_yaml["octaves"].as<int>();

src/detectors/detector_base.cpp

@@ -41,7 +41,7 @@ DetectorBasePtr setupDetector(const std::string& _type, const std::string& _uniq
 #ifdef USING_YAML
 DetectorBasePtr setupDetector(const std::string& _type, const std::string& _unique_name, const std::string& _filename_dot_yaml)
 {
-	ParamsBasePtr params_ptr = ParamsFactory::get().create(_type, _filename_dot_yaml);
+	ParamsBasePtr params_ptr = ParamsFactory::get().create(_type+" DET", _filename_dot_yaml);
 	return setupDetector(_type, _unique_name, params_ptr);
 }
 #endif

src/detectors/fast/detector_fast.cpp

@@ -13,5 +13,5 @@ DetectorFAST::~DetectorFAST(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("FAST DET", DetectorFAST);
+VU_REGISTER_DETECTOR("FAST", DetectorFAST);
 } /* namespace vision_utils */

src/detectors/fast/detector_fast_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsFASTDetector(const std::string & _filename_dot_
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "FAST DET")
+        if(d_yaml["type"].as<string>() == "FAST")
         {
         	params_ptr->threshold    		= d_yaml["threshold"].as<int>();
         	params_ptr->nonmaxSuppression   = d_yaml["nonmaxSuppression"].as<bool>();

src/detectors/gftt/detector_gftt.cpp

@@ -13,5 +13,5 @@ DetectorGFTT::~DetectorGFTT(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("GFTT DET", DetectorGFTT);
+VU_REGISTER_DETECTOR("GFTT", DetectorGFTT);
 } /* namespace vision_utils */

src/detectors/gftt/detector_gftt_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsGFTTDetector(const std::string & _filename_dot_
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "GFTT DET")
+        if(d_yaml["type"].as<string>() == "GFTT")
         {
         	params_ptr->maxCorners    		= d_yaml["maxCorners"].as<int>();
         	params_ptr->qualityLevel    	= d_yaml["qualityLevel"].as<double>();

src/detectors/harris/detector_harris.cpp

@@ -13,5 +13,5 @@ DetectorHARRIS::~DetectorHARRIS(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("HARRIS DET", DetectorHARRIS);
+VU_REGISTER_DETECTOR("HARRIS", DetectorHARRIS);
 } /* namespace vision_utils */

src/detectors/harris/detector_harris_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsHARRISDetector(const std::string & _filename_do
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "HARRIS DET")
+        if(d_yaml["type"].as<string>() == "HARRIS")
         {
         	params_ptr->maxCorners    		= d_yaml["maxCorners"].as<int>();
         	params_ptr->qualityLevel    	= d_yaml["qualityLevel"].as<double>();

src/detectors/kaze/detector_kaze.cpp

@@ -13,5 +13,5 @@ DetectorKAZE::~DetectorKAZE(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("KAZE DET", DetectorKAZE);
+VU_REGISTER_DETECTOR("KAZE", DetectorKAZE);
 } /* namespace vision_utils */

src/detectors/kaze/detector_kaze_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsKAZEDetector(const std::string & _filename_dot_
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "KAZE DET")
+        if(d_yaml["type"].as<string>() == "KAZE")
         {
         	params_ptr->extended	= d_yaml["extended"].as<bool>();
         	params_ptr->upright	= d_yaml["upright"].as<bool>();

src/detectors/mser/detector_mser.cpp

@@ -13,5 +13,5 @@ DetectorMSER::~DetectorMSER(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("MSER DET", DetectorMSER);
+VU_REGISTER_DETECTOR("MSER", DetectorMSER);
 } /* namespace vision_utils */

src/detectors/mser/detector_mser_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsMSERDetector(const std::string & _filename_dot_
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "MSER DET")
+        if(d_yaml["type"].as<string>() == "MSER")
         {
         	params_ptr->delta			= d_yaml["delta"].as<int>();
         	params_ptr->min_area		= d_yaml["min_area"].as<int>();

src/detectors/orb/detector_orb.cpp

@@ -13,5 +13,5 @@ DetectorORB::~DetectorORB(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("ORB DET", DetectorORB);
+VU_REGISTER_DETECTOR("ORB", DetectorORB);
 } /* namespace vision_utils */

src/detectors/orb/detector_orb_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsORBDetector(const std::string & _filename_dot_y
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "ORB DET")
+        if(d_yaml["type"].as<string>() == "ORB")
         {
         	params_ptr->nfeatures    	= d_yaml["nfeatures"].as<unsigned int>();
         	params_ptr->scaleFactor     = d_yaml["scale factor"].as<float>();

src/detectors/sbd/detector_sbd.cpp

@@ -13,5 +13,5 @@ DetectorSBD::~DetectorSBD(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("SBD DET", DetectorSBD);
+VU_REGISTER_DETECTOR("SBD", DetectorSBD);
 } /* namespace vision_utils */

src/detectors/sbd/detector_sbd_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsSBDDetector(const std::string & _filename_dot_y
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "SBD DET")
+        if(d_yaml["type"].as<string>() == "SBD")
         {
         	params_ptr->cv_params.thresholdStep			= d_yaml["thresholdStep"].as<float>();
 			params_ptr->cv_params.minThreshold			= d_yaml["minThreshold"].as<float>();

src/detectors/sift/detector_sift.cpp

@@ -13,5 +13,5 @@ DetectorSIFT::~DetectorSIFT(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("SIFT DET", DetectorSIFT);
+VU_REGISTER_DETECTOR("SIFT", DetectorSIFT);
 } /* namespace vision_utils */

src/detectors/sift/detector_sift_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsSIFTDetector(const std::string & _filename_dot_
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "SIFT DET")
+        if(d_yaml["type"].as<string>() == "SIFT")
         {
         	params_ptr->nfeatures			= d_yaml["nfeatures"].as<int>();
         	params_ptr->nOctaveLayers		= d_yaml["nOctaveLayers"].as<int>();

src/detectors/surf/detector_surf.cpp

@@ -13,5 +13,5 @@ DetectorSURF::~DetectorSURF(void)
 // Register in the DetectorsFactory
 namespace vision_utils
 {
-VU_REGISTER_DETECTOR("SURF DET", DetectorSURF);
+VU_REGISTER_DETECTOR("SURF", DetectorSURF);
 } /* namespace vision_utils */

src/detectors/surf/detector_surf_load_yaml.cpp

@@ -21,7 +21,7 @@ static ParamsBasePtr createParamsSURFDetector(const std::string & _filename_dot_
     if (!yaml_params.IsNull())
     {
         Node d_yaml = yaml_params["detector"];
-        if(d_yaml["type"].as<string>() == "SURF DET")
+        if(d_yaml["type"].as<string>() == "SURF")
         {
         	params_ptr->hessianThreshold	= d_yaml["hessianThreshold"].as<double>();
         	params_ptr->nOctaves			= d_yaml["nOctaves"].as<int>();