Skip to content
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

Jump to bottom

Implemented an in-place method for transforming DataPoints objects #419

Merged
merged 5 commits into from
Dec 1, 2020
Merged

Implemented an in-place method for transforming DataPoints objects #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87c7dc4
Implemented an in-place method for transforming DataPoints objects
YoshuaNava Nov 19, 2020
2f6065a
Fix typo
YoshuaNava Nov 19, 2020
7c35308
Optimized descriptor rotations
YoshuaNava Nov 19, 2020
a85d15e
Merge branch 'master' into feature/transformations_inplace_compute
pomerlef Dec 1, 2020
3e65d06
Implemented unit tests, added sim transformation to registry, set new…
YoshuaNava Dec 1, 2020
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
3 changes: 3 additions & 0 deletions pointmatcher/PointMatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,9 @@ struct PointMatcher
//! Transform input using the transformation matrix
virtual DataPoints compute(const DataPoints& input, const TransformationParameters& parameters) const = 0;

//! Transform point cloud in-place using the transformation matrix
virtual void inPlaceCompute(const TransformationParameters& parameters, DataPoints& cloud) const = 0;

//! Return whether the given parameters respect the expected constraints
virtual bool checkParameters(const TransformationParameters& parameters) const = 0;

Expand Down
1 change: 1 addition & 0 deletions pointmatcher/Registry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ PointMatcher<T>::PointMatcher()
{
ADD_TO_REGISTRAR_NO_PARAM(Transformation, RigidTransformation, typename TransformationsImpl<T>::RigidTransformation)
ADD_TO_REGISTRAR_NO_PARAM(Transformation, PureTranslation, typename TransformationsImpl<T>::PureTranslation)
ADD_TO_REGISTRAR_NO_PARAM(Transformation, SimilarityTransformation, typename TransformationsImpl<T>::SimilarityTransformation)

ADD_TO_REGISTRAR_NO_PARAM(DataPointsFilter, IdentityDataPointsFilter, typename DataPointsFiltersImpl<T>::IdentityDataPointsFilter)
ADD_TO_REGISTRAR_NO_PARAM(DataPointsFilter, RemoveNaNDataPointsFilter, typename DataPointsFiltersImpl<T>::RemoveNaNDataPointsFilter)
Expand Down
5 changes: 1 addition & 4 deletions pointmatcher/Transformation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,9 @@ void PointMatcher<T>::Transformations::apply(DataPoints& cloud, const Transforma
// TODO: This API must be re-written to not even have the concept
// of chain for this classs.
int num_iter = 0;

DataPoints transformedCloud;
for (TransformationsConstIt it = this->begin(); it != this->end(); ++it)
{
transformedCloud = (*it)->compute(cloud, parameters);
swapDataPoints(cloud, transformedCloud);
(*it)->inPlaceCompute(parameters, cloud);
num_iter++;
}
if (num_iter != 1)
Expand Down
88 changes: 52 additions & 36 deletions pointmatcher/TransformationsImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,18 @@ typename PointMatcher<T>::DataPoints TransformationsImpl<T>::RigidTransformation
const DataPoints& input,
const TransformationParameters& parameters) const
{
assert(input.features.rows() == parameters.rows());
DataPoints transformedCloud = input;
inPlaceCompute(parameters, transformedCloud);
return transformedCloud;
}

//! RigidTransformation
template<typename T>
void TransformationsImpl<T>::RigidTransformation::inPlaceCompute(
const TransformationParameters& parameters,
DataPoints& cloud) const
{
assert(cloud.features.rows() == parameters.rows());
assert(parameters.rows() == parameters.cols());

const unsigned int nbRows = parameters.rows()-1;
Expand All @@ -62,28 +73,23 @@ typename PointMatcher<T>::DataPoints TransformationsImpl<T>::RigidTransformation
if(this->checkParameters(parameters) == false)
throw TransformationError("RigidTransformation: Error, rotation matrix is not orthogonal.");

//DataPoints transformedCloud(input.featureLabels, input.descriptorLabels, input.timeLabels, input.features.cols());
DataPoints transformedCloud = input;

// Apply the transformation to features
transformedCloud.features = parameters * input.features;
cloud.features.applyOnTheLeft(parameters);

// Apply the transformation to descriptors
int row(0);
const int descCols(input.descriptors.cols());
for (size_t i = 0; i < input.descriptorLabels.size(); ++i)
const int descCols(cloud.descriptors.cols());
for (size_t i = 0; i < cloud.descriptorLabels.size(); ++i)
{
const int span(input.descriptorLabels[i].span);
const std::string& name(input.descriptorLabels[i].text);
const BOOST_AUTO(inputDesc, input.descriptors.block(row, 0, span, descCols));
BOOST_AUTO(outputDesc, transformedCloud.descriptors.block(row, 0, span, descCols));
const int span(cloud.descriptorLabels[i].span);
const std::string& name(cloud.descriptorLabels[i].text);
if (name == "normals" || name == "observationDirections")
outputDesc = R * inputDesc;
{
cloud.descriptors.block(row, 0, span, descCols).applyOnTheLeft(R);
}

row += span;
}

return transformedCloud;
}

//! Ensure orthogonality of the rotation matrix
Expand Down Expand Up @@ -159,7 +165,18 @@ typename PointMatcher<T>::DataPoints TransformationsImpl<T>::SimilarityTransform
const DataPoints& input,
const TransformationParameters& parameters) const
{
assert(input.features.rows() == parameters.rows());
DataPoints transformedCloud = input;
inPlaceCompute(parameters, transformedCloud);
return transformedCloud;
}

//! SimilarityTransformation
template<typename T>
void TransformationsImpl<T>::SimilarityTransformation::inPlaceCompute(
const TransformationParameters& parameters,
DataPoints& cloud) const
{
assert(cloud.features.rows() == parameters.rows());
assert(parameters.rows() == parameters.cols());

const unsigned int nbRows = parameters.rows()-1;
Expand All @@ -170,28 +187,23 @@ typename PointMatcher<T>::DataPoints TransformationsImpl<T>::SimilarityTransform
if(this->checkParameters(parameters) == false)
throw TransformationError("SimilarityTransformation: Error, invalid similarity transform.");

//DataPoints transformedCloud(input.featureLabels, input.descriptorLabels, input.timeLabels, input.features.cols());
DataPoints transformedCloud = input;

// Apply the transformation to features
transformedCloud.features = parameters * input.features;
cloud.features.applyOnTheLeft(parameters);

// Apply the transformation to descriptors
int row(0);
const int descCols(input.descriptors.cols());
for (size_t i = 0; i < input.descriptorLabels.size(); ++i)
const int descCols(cloud.descriptors.cols());
for (size_t i = 0; i < cloud.descriptorLabels.size(); ++i)
{
const int span(input.descriptorLabels[i].span);
const std::string& name(input.descriptorLabels[i].text);
const BOOST_AUTO(inputDesc, input.descriptors.block(row, 0, span, descCols));
BOOST_AUTO(outputDesc, transformedCloud.descriptors.block(row, 0, span, descCols));
const int span(cloud.descriptorLabels[i].span);
const std::string& name(cloud.descriptorLabels[i].text);
if (name == "normals" || name == "observationDirections")
outputDesc = R * inputDesc;
{
cloud.descriptors.block(row, 0, span, descCols).applyOnTheLeft(R);
}

row += span;
}

return transformedCloud;
}

//! Nothing to check for a similarity transform
Expand All @@ -215,19 +227,23 @@ template struct TransformationsImpl<double>::SimilarityTransformation;
template<typename T>
typename PointMatcher<T>::DataPoints TransformationsImpl<T>::PureTranslation::compute(const DataPoints& input,
const TransformationParameters& parameters) const {
assert(input.features.rows() == parameters.rows());
DataPoints transformedCloud = input;
inPlaceCompute(parameters, transformedCloud);
return transformedCloud;
}

template<typename T>
void TransformationsImpl<T>::PureTranslation::inPlaceCompute(
const TransformationParameters& parameters,
DataPoints& cloud) const {
assert(cloud.features.rows() == parameters.rows());
assert(parameters.rows() == parameters.cols());

if(this->checkParameters(parameters) == false)
throw PointMatcherSupport::TransformationError("PureTranslation: Error, left part not identity.");

//DataPoints transformedCloud(input.featureLabels, input.descriptorLabels, input.features.cols());
DataPoints transformedCloud = input;

// Apply the transformation to features
transformedCloud.features = parameters * input.features;

return transformedCloud;
cloud.features.applyOnTheLeft(parameters);
}

template<typename T>
Expand Down
4 changes: 4 additions & 0 deletions pointmatcher/TransformationsImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ struct TransformationsImpl

RigidTransformation() : Transformation("RigidTransformation", ParametersDoc(), Parameters()) {}
virtual DataPoints compute(const DataPoints& input, const TransformationParameters& parameters) const;
virtual void inPlaceCompute(const TransformationParameters& parameters, DataPoints& cloud) const;
virtual bool checkParameters(const TransformationParameters& parameters) const;
virtual TransformationParameters correctParameters(const TransformationParameters& parameters) const;
};
Expand All @@ -71,7 +72,9 @@ struct TransformationsImpl
return "Similarity transformation (rotation + translation + scale).";
}

YoshuaNava marked this conversation as resolved.
Show resolved Hide resolved
SimilarityTransformation() : Transformation("SimilarityTransformation", ParametersDoc(), Parameters()) {}
virtual DataPoints compute(const DataPoints& input, const TransformationParameters& parameters) const;
virtual void inPlaceCompute(const TransformationParameters& parameters, DataPoints& cloud) const;
virtual bool checkParameters(const TransformationParameters& parameters) const;
virtual TransformationParameters correctParameters(const TransformationParameters& parameters) const;
};
Expand All @@ -85,6 +88,7 @@ struct TransformationsImpl

PureTranslation() : Transformation("PureTranslation", ParametersDoc(), Parameters()) {}
virtual DataPoints compute(const DataPoints& input, const TransformationParameters& parameters) const;
virtual void inPlaceCompute(const TransformationParameters& parameters, DataPoints& cloud) const;
virtual bool checkParameters(const TransformationParameters& parameters) const;
virtual TransformationParameters correctParameters(const TransformationParameters& parameters) const;
};
Expand Down
Loading