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

Merge pull request #5 from chrisbeall/fix/mac-factorIndices 

Fixes for clang on Mac
release/4.3a0
Chris Beall 2019-05-18 20:07:08 -07:00 committed by GitHub
parent 2d15b9aed6 5fe891a1c3
commit e05e6e9700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam_unstable/nonlinear/BatchFixedLagSmoother.cpp
View File

@ -52,7 +52,7 @@ Matrix BatchFixedLagSmoother::marginalCovariance(Key key) const {
/* ************************************************************************* */
FixedLagSmoother::Result BatchFixedLagSmoother::update(
const NonlinearFactorGraph& newFactors, const Values& newTheta,
const KeyTimestampMap& timestamps, const FastVector<size_t>& factorsToRemove) {
const KeyTimestampMap& timestamps, const FactorIndices& factorsToRemove) {
// Update all of the internal variables with the new information
gttic(augment_system);

8
gtsam_unstable/nonlinear/BatchFixedLagSmoother.h
View File

@ -41,22 +41,22 @@ public:
virtual ~BatchFixedLagSmoother() { };
/** Print the factor for debugging and testing (implementing Testable) */
virtual void print(const std::string& s = "BatchFixedLagSmoother:\n", const KeyFormatter& keyFormatter = DefaultKeyFormatter) const;
virtual void print(const std::string& s = "BatchFixedLagSmoother:\n", const KeyFormatter& keyFormatter = DefaultKeyFormatter) const override;
/** Check if two IncrementalFixedLagSmoother Objects are equal */
virtual bool equals(const FixedLagSmoother& rhs, double tol = 1e-9) const;
virtual bool equals(const FixedLagSmoother& rhs, double tol = 1e-9) const override;
/** Add new factors, updating the solution and relinearizing as needed. */
Result update(const NonlinearFactorGraph& newFactors = NonlinearFactorGraph(),
const Values& newTheta = Values(),
const KeyTimestampMap& timestamps = KeyTimestampMap(),
const FastVector<size_t>& factorsToRemove = FastVector<size_t>());
const FactorIndices& factorsToRemove = FactorIndices()) override;
/** Compute an estimate from the incomplete linear delta computed during the last update.
* This delta is incomplete because it was not updated below wildfire_threshold. If only
* a single variable is needed, it is faster to call calculateEstimate(const KEY&).
*/
Values calculateEstimate() const {
Values calculateEstimate() const override {
return theta_.retract(delta_);
}

2
gtsam_unstable/nonlinear/FixedLagSmoother.h
View File

@ -93,7 +93,7 @@ public:
virtual Result update(const NonlinearFactorGraph& newFactors = NonlinearFactorGraph(),
const Values& newTheta = Values(),
const KeyTimestampMap& timestamps = KeyTimestampMap(),
const FastVector<size_t>& factorsToRemove = FastVector<size_t>()) = 0;
const FactorIndices& factorsToRemove = FactorIndices()) = 0;
/** Compute an estimate from the incomplete linear delta computed during the last update.
* This delta is incomplete because it was not updated below wildfire_threshold. If only

2
gtsam_unstable/nonlinear/IncrementalFixedLagSmoother.cpp
View File

@ -65,7 +65,7 @@ bool IncrementalFixedLagSmoother::equals(const FixedLagSmoother& rhs,
/* ************************************************************************* */
FixedLagSmoother::Result IncrementalFixedLagSmoother::update(
const NonlinearFactorGraph& newFactors, const Values& newTheta,
const KeyTimestampMap& timestamps, const FastVector<size_t>& factorsToRemove) {
const KeyTimestampMap& timestamps, const FactorIndices& factorsToRemove) {
const bool debug = ISDEBUG("IncrementalFixedLagSmoother update");

8
gtsam_unstable/nonlinear/IncrementalFixedLagSmoother.h
View File

@ -49,10 +49,10 @@ public:
/** Print the factor for debugging and testing (implementing Testable) */
virtual void print(const std::string& s = "IncrementalFixedLagSmoother:\n",
const KeyFormatter& keyFormatter = DefaultKeyFormatter) const;
const KeyFormatter& keyFormatter = DefaultKeyFormatter) const override;
/** Check if two IncrementalFixedLagSmoother Objects are equal */
virtual bool equals(const FixedLagSmoother& rhs, double tol = 1e-9) const;
virtual bool equals(const FixedLagSmoother& rhs, double tol = 1e-9) const override;
/**
* Add new factors, updating the solution and re-linearizing as needed.
@ -64,13 +64,13 @@ public:
Result update(const NonlinearFactorGraph& newFactors = NonlinearFactorGraph(),
const Values& newTheta = Values(), //
const KeyTimestampMap& timestamps = KeyTimestampMap(),
const FastVector<size_t>& factorsToRemove = FactorIndices());
const FactorIndices& factorsToRemove = FactorIndices()) override;
/** Compute an estimate from the incomplete linear delta computed during the last update.
* This delta is incomplete because it was not updated below wildfire_threshold. If only
* a single variable is needed, it is faster to call calculateEstimate(const KEY&).
*/
Values calculateEstimate() const {
Values calculateEstimate() const override {
return isam_.calculateEstimate();
}