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

Merge pull request #945 from bricerebsamen/fix_build

release/4.3a0
Varun Agrawal 2021-11-30 10:32:42 -05:00 committed by GitHub
parent 7bd4ebfb9c 62c22c7fcc
commit 8efaf266c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
.idea .idea
*.pyc *.pyc
*.DS_Store *.DS_Store
*.swp
/examples/Data/dubrovnik-3-7-pre-rewritten.txt /examples/Data/dubrovnik-3-7-pre-rewritten.txt
/examples/Data/pose2example-rewritten.txt /examples/Data/pose2example-rewritten.txt
/examples/Data/pose3example-rewritten.txt /examples/Data/pose3example-rewritten.txt

4
gtsam/geometry/Similarity3.cpp
View File

@ -40,8 +40,8 @@ static Point3Pairs subtractCentroids(const Point3Pairs &abPointPairs,
} }
/// Form inner products x and y and calculate scale. /// Form inner products x and y and calculate scale.
static const double calculateScale(const Point3Pairs &d_abPointPairs, static double calculateScale(const Point3Pairs &d_abPointPairs,
const Rot3 &aRb) { const Rot3 &aRb) {
double x = 0, y = 0; double x = 0, y = 0;
Point3 da, db; Point3 da, db;
for (const Point3Pair& d_abPair : d_abPointPairs) { for (const Point3Pair& d_abPair : d_abPointPairs) {

2
gtsam/inference/BayesTree.h
View File

@ -19,6 +19,8 @@
#pragma once #pragma once
#include <boost/shared_ptr.hpp>
#include <gtsam/inference/Key.h> #include <gtsam/inference/Key.h>
#include <gtsam/base/FastList.h> #include <gtsam/base/FastList.h>
#include <gtsam/base/ConcurrentMap.h> #include <gtsam/base/ConcurrentMap.h>

1
gtsam/inference/Factor.h
View File

@ -22,6 +22,7 @@
#pragma once #pragma once
#include <boost/serialization/nvp.hpp> #include <boost/serialization/nvp.hpp>
#include <boost/shared_ptr.hpp>
#include <gtsam/base/types.h> #include <gtsam/base/types.h>
#include <gtsam/base/FastVector.h> #include <gtsam/base/FastVector.h>

2
gtsam/slam/dataset.cpp
View File

@ -392,7 +392,7 @@ parseMeasurements(const std::string &filename,
size_t maxIndex) { size_t maxIndex) {
ParseMeasurement<Pose2> parse{model ? createSampler(model) : nullptr, ParseMeasurement<Pose2> parse{model ? createSampler(model) : nullptr,
maxIndex, true, NoiseFormatAUTO, maxIndex, true, NoiseFormatAUTO,
KernelFunctionTypeNONE}; KernelFunctionTypeNONE, nullptr};
return parseToVector<BinaryMeasurement<Pose2>>(filename, parse); return parseToVector<BinaryMeasurement<Pose2>>(filename, parse);
} }