Skip to content

Remove RegisterOption argument registration (allow other argument types) #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gareth-cross wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove RegisterOption argument registration (allow other argument types) #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions glomap/controllers/option_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,6 @@ void OptionManager::Reset() {

desc_ = std::make_shared<boost::program_options::options_description>();

options_bool_.clear();
options_int_.clear();
options_double_.clear();
options_string_.clear();

added_mapper_options_ = false;
added_view_graph_calibration_options_ = false;
added_relative_pose_options_ = false;
Expand Down
26 changes: 0 additions & 26 deletions glomap/controllers/option_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,8 @@ class OptionManager {
T* option,
const std::string& help_text = "");

template <typename T>
void RegisterOption(const std::string& name, const T* option);

std::shared_ptr<boost::program_options::options_description> desc_;

std::vector<std::pair<std::string, const bool*>> options_bool_;
std::vector<std::pair<std::string, const int*>> options_int_;
std::vector<std::pair<std::string, const double*>> options_double_;
std::vector<std::pair<std::string, const std::string*>> options_string_;

bool added_database_options_ = false;
bool added_image_options_ = false;
bool added_mapper_options_ = false;
Expand Down Expand Up @@ -120,7 +112,6 @@ void OptionManager::AddAndRegisterRequiredOption(const std::string& name,
desc_->add_options()(name.c_str(),
boost::program_options::value<T>(option)->required(),
help_text.c_str());
RegisterOption(name, option);
}

template <typename T>
Expand All @@ -131,23 +122,6 @@ void OptionManager::AddAndRegisterDefaultOption(const std::string& name,
name.c_str(),
boost::program_options::value<T>(option)->default_value(*option),
help_text.c_str());
RegisterOption(name, option);
}

template <typename T>
void OptionManager::RegisterOption(const std::string& name, const T* option) {
if (std::is_same<T, bool>::value) {
options_bool_.emplace_back(name, reinterpret_cast<const bool*>(option));
} else if (std::is_same<T, int>::value) {
options_int_.emplace_back(name, reinterpret_cast<const int*>(option));
} else if (std::is_same<T, double>::value) {
options_double_.emplace_back(name, reinterpret_cast<const double*>(option));
} else if (std::is_same<T, std::string>::value) {
options_string_.emplace_back(name,
reinterpret_cast<const std::string*>(option));
} else {
LOG(ERROR) << "Unsupported option type: " << name;
}
}

} // namespace glomap
Loading