12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use goto flow

release/4.3a0
Varun Agrawal 2020-11-30 17:32:02 -05:00
parent 9d15afaab1
commit 3e6efe3a51
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtsam/slam/FrobeniusFactor.cpp
View File

@ -26,7 +26,6 @@ namespace gtsam {
SharedNoiseModel SharedNoiseModel
ConvertNoiseModel(const SharedNoiseModel &model, size_t d, bool defaultToUnit) { ConvertNoiseModel(const SharedNoiseModel &model, size_t d, bool defaultToUnit) {
double sigma = 1.0; double sigma = 1.0;
bool exit = false;
if (model != nullptr) { if (model != nullptr) {
const auto &robust = boost::dynamic_pointer_cast<noiseModel::Robust>(model); const auto &robust = boost::dynamic_pointer_cast<noiseModel::Robust>(model);
@ -40,7 +39,7 @@ ConvertNoiseModel(const SharedNoiseModel &model, size_t d, bool defaultToUnit) {
size_t n = sigmas.size(); size_t n = sigmas.size();
if (n == 1) { if (n == 1) {
sigma = sigmas(0); // Rot2 sigma = sigmas(0); // Rot2
exit = true; goto exit;
} }
else if (n == 3 || n == 6) { else if (n == 3 || n == 6) {
sigma = sigmas(2); // Pose2, Rot3, or Pose3 sigma = sigmas(2); // Pose2, Rot3, or Pose3
@ -49,13 +48,13 @@ ConvertNoiseModel(const SharedNoiseModel &model, size_t d, bool defaultToUnit) {
throw std::runtime_error("Can only convert isotropic rotation noise"); throw std::runtime_error("Can only convert isotropic rotation noise");
} }
} }
exit = true; goto exit;
} }
if (!defaultToUnit && !exit) { if (!defaultToUnit) {
throw std::runtime_error("Can only convert Pose2/Pose3 noise models"); throw std::runtime_error("Can only convert Pose2/Pose3 noise models");
} }
} }
exit:
auto isoModel = noiseModel::Isotropic::Sigma(d, sigma); auto isoModel = noiseModel::Isotropic::Sigma(d, sigma);
const auto &robust = boost::dynamic_pointer_cast<noiseModel::Robust>(model); const auto &robust = boost::dynamic_pointer_cast<noiseModel::Robust>(model);
if (robust) { if (robust) {