-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Fix SampleConsensusModel constructor to not use a virtual function #6305
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.
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
jmackay2
wants to merge
2
commits into
PointCloudLibrary:master
Choose a base branch
from
jmackay2:sac_model_constructor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,6 +48,7 @@ | |
#include <boost/random/uniform_int.hpp> // for uniform_int | ||
#include <boost/random/variate_generator.hpp> // for variate_generator | ||
#include <random> | ||
#include <numeric> | ||
|
||
#include <pcl/memory.h> | ||
#include <pcl/console/print.h> | ||
|
@@ -101,41 +102,14 @@ namespace pcl | |
} | ||
|
||
public: | ||
/** \brief Constructor for base SampleConsensusModel. | ||
* \param[in] cloud the input point cloud dataset | ||
* \param[in] random if true set the random seed to the current time, else set to 12345 (default: false) | ||
*/ | ||
SampleConsensusModel (const PointCloudConstPtr &cloud, bool random = false) | ||
: input_ () | ||
, radius_min_ (-std::numeric_limits<double>::max ()) | ||
, radius_max_ (std::numeric_limits<double>::max ()) | ||
, samples_radius_ (0.) | ||
, samples_radius_search_ () | ||
, rng_dist_ (new boost::uniform_int<> (0, std::numeric_limits<int>::max ())) | ||
, custom_model_constraints_ ([](auto){return true;}) | ||
{ | ||
if (random) | ||
rng_alg_.seed (std::random_device()()); | ||
else | ||
rng_alg_.seed (12345u); | ||
|
||
// Sets the input cloud and creates a vector of "fake" indices | ||
setInputCloud (cloud); | ||
|
||
// Create a random number generator object | ||
rng_gen_.reset (new boost::variate_generator<boost::mt19937&, boost::uniform_int<> > (rng_alg_, *rng_dist_)); | ||
} | ||
|
||
/** \brief Constructor for base SampleConsensusModel. | ||
* \param[in] cloud the input point cloud dataset | ||
* \param[in] indices a vector of point indices to be used from \a cloud | ||
* \param[in] random if true set the random seed to the current time, else set to 12345 (default: false) | ||
*/ | ||
SampleConsensusModel (const PointCloudConstPtr &cloud, | ||
const Indices &indices, | ||
bool random = false) | ||
SampleConsensusModel (const PointCloudConstPtr &cloud, const Indices &indices = Indices(), const bool random = false) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could adding a default value for |
||
: input_ (cloud) | ||
, indices_ (new Indices (indices)) | ||
, indices_(new Indices(indices)) | ||
, radius_min_ (-std::numeric_limits<double>::max ()) | ||
, radius_max_ (std::numeric_limits<double>::max ()) | ||
, samples_radius_ (0.) | ||
|
@@ -148,6 +122,13 @@ namespace pcl | |
else | ||
rng_alg_.seed (12345u); | ||
|
||
// If no indices are provided, use all points | ||
if (indices_->empty()) | ||
{ | ||
indices_->resize(cloud->size()); | ||
std::iota(indices_->begin(), indices_->end(), 0); | ||
} | ||
|
||
if (indices_->size () > input_->size ()) | ||
{ | ||
PCL_ERROR("[pcl::SampleConsensusModel] Invalid index vector given with size " | ||
|
@@ -160,7 +141,14 @@ namespace pcl | |
|
||
// Create a random number generator object | ||
rng_gen_.reset (new boost::variate_generator<boost::mt19937&, boost::uniform_int<> > (rng_alg_, *rng_dist_)); | ||
}; | ||
} | ||
|
||
/** \brief Constructor for base SampleConsensusModel. | ||
* \param[in] cloud the input point cloud dataset | ||
* \param[in] random if true set the random seed to the current time, else set to 12345 (default: false) | ||
*/ | ||
SampleConsensusModel (const PointCloudConstPtr &cloud, const bool random = false) | ||
: SampleConsensusModel(cloud, Indices(), random) {}; | ||
|
||
/** \brief Destructor for base SampleConsensusModel. */ | ||
virtual ~SampleConsensusModel () = default; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume?