Skip to content
Snippets Groups Projects
Commit 122e1ca6 authored by Angel Santamaria-Navarro's avatar Angel Santamaria-Navarro
Browse files

Add conditional YAML read for matchers

parent c4534ef1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 21 deletions
src/matchers/bruteforce/matcher_bruteforce_load_yaml.cpp
+ 8
− 5
View file @ 122e1ca6
......@@ -21,13 +21,16 @@ static ParamsBasePtr createParamsBRUTEFORCEMatcher(const std::string & _filename
if (!yaml_params.IsNull())
{
Node d_yaml = yaml_params["matcher"];
if(d_yaml["type"].as<string>() == "BRUTEFORCE")
{
params_ptr->match_type = d_yaml["match type"].as<int>();
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["match type"])
params_ptr->match_type = d_yaml["match type"].as<int>();
if (d_yaml["min normalized score"])
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["roi"]["width"])
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
if (d_yaml["roi"]["height"])
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
}else
{
std::cerr << "Bad configuration file. Wrong type " << d_yaml["type"].as<string>() << std::endl;
......
src/matchers/bruteforce_hamming/matcher_bruteforce_hamming_load_yaml.cpp
+ 8
− 4
View file @ 122e1ca6
......@@ -23,10 +23,14 @@ static ParamsBasePtr createParamsBRUTEFORCE_HAMMINGMatcher(const std::string & _
Node d_yaml = yaml_params["matcher"];
if(d_yaml["type"].as<string>() == "BRUTEFORCE_HAMMING")
{
params_ptr->match_type = d_yaml["match type"].as<int>();
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["match type"])
params_ptr->match_type = d_yaml["match type"].as<int>();
if (d_yaml["min normalized score"])
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["roi"]["width"])
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
if (d_yaml["roi"]["height"])
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
}else
{
std::cerr << "Bad configuration file. Wrong type " << d_yaml["type"].as<string>() << std::endl;
......
src/matchers/bruteforce_hamming_2/matcher_bruteforce_hamming_2_load_yaml.cpp
+ 8
− 4
View file @ 122e1ca6
......@@ -23,10 +23,14 @@ static ParamsBasePtr createParamsBRUTEFORCE_HAMMING_2Matcher(const std::string &
Node d_yaml = yaml_params["matcher"];
if(d_yaml["type"].as<string>() == "BRUTEFORCE_HAMMING_2")
{
params_ptr->match_type = d_yaml["match type"].as<int>();
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["match type"])
params_ptr->match_type = d_yaml["match type"].as<int>();
if (d_yaml["min normalized score"])
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["roi"]["width"])
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
if (d_yaml["roi"]["height"])
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
}else
{
std::cerr << "Bad configuration file. Wrong type " << d_yaml["type"].as<string>() << std::endl;
......
src/matchers/bruteforce_l1/matcher_bruteforce_l1_load_yaml.cpp
+ 8
− 4
View file @ 122e1ca6
......@@ -23,10 +23,14 @@ static ParamsBasePtr createParamsBRUTEFORCE_L1Matcher(const std::string & _filen
Node d_yaml = yaml_params["matcher"];
if(d_yaml["type"].as<string>() == "BRUTEFORCE_L1")
{
params_ptr->match_type = d_yaml["match type"].as<int>();
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["match type"])
params_ptr->match_type = d_yaml["match type"].as<int>();
if (d_yaml["min normalized score"])
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["roi"]["width"])
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
if (d_yaml["roi"]["height"])
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
}else
{
std::cerr << "Bad configuration file. Wrong type " << d_yaml["type"].as<string>() << std::endl;
......
src/matchers/flannbased/matcher_flannbased_load_yaml.cpp
+ 8
− 4
View file @ 122e1ca6
......@@ -23,10 +23,14 @@ static ParamsBasePtr createParamsFLANNBASEDMatcher(const std::string & _filename
Node d_yaml = yaml_params["matcher"];
if(d_yaml["type"].as<string>() == "FLANNBASED")
{
params_ptr->match_type = d_yaml["match type"].as<int>();
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["match type"])
params_ptr->match_type = d_yaml["match type"].as<int>();
if (d_yaml["min normalized score"])
params_ptr->min_norm_score = d_yaml["min normalized score"].as<double>();
if (d_yaml["roi"]["width"])
params_ptr->roi_width = d_yaml["roi"]["width"].as<unsigned int>();
if (d_yaml["roi"]["height"])
params_ptr->roi_height = d_yaml["roi"]["height"].as<unsigned int>();
}else
{
std::cerr << "Bad configuration file. Wrong type " << d_yaml["type"].as<string>() << std::endl;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment