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

Wrap FindKarcherMean for Rot3 #1069

Merged
merged 16 commits into from
Jan 28, 2022
Merged

Wrap FindKarcherMean for Rot3 #1069

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
41384d1
Update slam.i
johnwlambert Jan 26, 2022
8ba9ae5
fix typo
johnwlambert Jan 26, 2022
b7a502e
fix typo
johnwlambert Jan 26, 2022
055e027
fix template bug
johnwlambert Jan 27, 2022
20622c2
add new type for vector of Rot3's
johnwlambert Jan 27, 2022
9e63911
add Rot3Vector type to specializations
johnwlambert Jan 27, 2022
6678fe0
add Rot3Vector to python/CMakeLists.txt
johnwlambert Jan 27, 2022
15c3dd4
make vector of Rot3's opaque
johnwlambert Jan 27, 2022
72e4a9a
Address Akshay comments
johnwlambert Jan 27, 2022
2f3fe73
fix templated function
johnwlambert Jan 27, 2022
8a22ffa
define FindKarcherMean in .i file
johnwlambert Jan 27, 2022
e0b37ed
use Eigen::aligned_allocator
johnwlambert Jan 27, 2022
56312d9
use Eigen::aligned_allocator
johnwlambert Jan 27, 2022
d37881e
use aligned allocator for Rot3Vector
johnwlambert Jan 27, 2022
01f3fe5
Merge branch 'develop' into wrap-karcher-mean-rot3
dellaert Jan 28, 2022
55d8399
Fix wrapping
dellaert Jan 28, 2022
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
14 changes: 13 additions & 1 deletion gtsam/slam/slam.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,25 @@ class InitializePose3 {
static gtsam::Values initialize(const gtsam::NonlinearFactorGraph& graph);
};

#include <gtsam/slam/KarcherMeanFactor-inl.h>
#include <gtsam/slam/KarcherMeanFactor.h>
template <T = {gtsam::Point2, gtsam::Rot2, gtsam::Pose2, gtsam::Point3,
gtsam::SO3, gtsam::SO4, gtsam::Rot3, gtsam::Pose3}>
virtual class KarcherMeanFactor : gtsam::NonlinearFactor {
KarcherMeanFactor(const gtsam::KeyVector& keys);
};

class Rot3Vector {
Rot3Vector();
size_t size() const;

// structure specific methods
gtsam::Rot3 at(size_t i) const;
void push_back(const gtsam::Rot3& R);
johnwlambert marked this conversation as resolved.
Show resolved Hide resolved
};
gtsam::Rot3 FindKarcherMean<gtsam::Rot3>(const Rot3Vector &rotations);
typedef FindKarcherMean<gtsam::Rot3> FindKarcherMeanRot3;
gtsam::Rot3 FindKarcherMeanRot3(const gtsam::Rot3Vector& rotations);

#include <gtsam/slam/FrobeniusFactor.h>
gtsam::noiseModel::Isotropic* ConvertNoiseModel(gtsam::noiseModel::Base* model,
size_t d);
Expand Down
1 change: 1 addition & 0 deletions python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ set(ignore
gtsam::Point3Pairs
gtsam::Pose3Pairs
gtsam::Pose3Vector
gtsam::Rot3Vector
gtsam::KeyVector
gtsam::BinaryMeasurementsUnit3
gtsam::DiscreteKey
Expand Down
1 change: 1 addition & 0 deletions python/gtsam/preamble/slam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ PYBIND11_MAKE_OPAQUE(
std::vector<boost::shared_ptr<gtsam::BetweenFactor<gtsam::Pose3> > >);
PYBIND11_MAKE_OPAQUE(
std::vector<boost::shared_ptr<gtsam::BetweenFactor<gtsam::Pose2> > >);
PYBIND11_MAKE_OPAQUE(std::vector<gtsam::Rot3, Eigen::aligned_allocator<gtsam::Rot3> >);
1 change: 1 addition & 0 deletions python/gtsam/specializations/slam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ py::bind_vector<
py::bind_vector<
std::vector<boost::shared_ptr<gtsam::BetweenFactor<gtsam::Pose2> > > >(
m_, "BetweenFactorPose2s");
py::bind_vector<std::vector<gtsam::Rot3, Eigen::aligned_allocator<gtsam::Rot3>>(m_, "Rot3Vector");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a missing ">" at the end here, that should let you wrap Rot3Vector at least.