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.

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

Fix warnings #761

Merged
merged 3 commits into from
May 5, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
18 changes: 8 additions & 10 deletions gtsam/geometry/CalibratedCamera.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,20 @@ class GTSAM_EXPORT PinholeBase {
/// @name Standard Constructors
/// @{

/** default constructor */
PinholeBase() {
}
/// Default constructor
PinholeBase() {}

/** constructor with pose */
explicit PinholeBase(const Pose3& pose) :
pose_(pose) {
}
/// Constructor with pose
explicit PinholeBase(const Pose3& pose) : pose_(pose) {}

/// @}
/// @name Advanced Constructors
/// @{

explicit PinholeBase(const Vector &v) :
pose_(Pose3::Expmap(v)) {
}
explicit PinholeBase(const Vector& v) : pose_(Pose3::Expmap(v)) {}

/// Default destructor
virtual ~PinholeBase() = default;

/// @}
/// @name Testable
Expand Down
2 changes: 1 addition & 1 deletion gtsam/geometry/tests/testRot3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ TEST(Rot3, RQ_derivative) {
const auto R = Rot3::RzRyRx(xyz).matrix();
const auto num = numericalDerivative11(RQ_proxy, R);
Matrix39 calc;
RQ(R, calc).second;
RQ(R, calc);

const auto err = vec_err.second;
CHECK(assert_equal(num, calc, err));
Expand Down
61 changes: 33 additions & 28 deletions gtsam/inference/Factor.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,47 +102,52 @@ typedef FastSet<FactorIndex> FactorIndexSet;
/// @}

public:
/// @name Standard Interface
/// @{
/// Default destructor
// public since it is required for boost serialization and static methods.
// virtual since it is public.
// http://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rc-dtor-virtual
virtual ~Factor() = default;

/// First key
Key front() const { return keys_.front(); }
/// @name Standard Interface
/// @{

/// Last key
Key back() const { return keys_.back(); }
/// First key
Key front() const { return keys_.front(); }

/// find
const_iterator find(Key key) const { return std::find(begin(), end(), key); }
/// Last key
Key back() const { return keys_.back(); }

/// Access the factor's involved variable keys
const KeyVector& keys() const { return keys_; }
/// find
const_iterator find(Key key) const { return std::find(begin(), end(), key); }

/** Iterator at beginning of involved variable keys */
const_iterator begin() const { return keys_.begin(); }
/// Access the factor's involved variable keys
const KeyVector& keys() const { return keys_; }

/** Iterator at end of involved variable keys */
const_iterator end() const { return keys_.end(); }
/** Iterator at beginning of involved variable keys */
const_iterator begin() const { return keys_.begin(); }

/** Iterator at end of involved variable keys */
const_iterator end() const { return keys_.end(); }

/**
/**
* @return the number of variables involved in this factor
*/
size_t size() const { return keys_.size(); }

/// @}
size_t size() const { return keys_.size(); }

/// @}

/// @name Testable
/// @{
/// @name Testable
/// @{

/// print
virtual void print(
const std::string& s = "Factor",
const KeyFormatter& formatter = DefaultKeyFormatter) const;
/// print
virtual void print(
const std::string& s = "Factor",
const KeyFormatter& formatter = DefaultKeyFormatter) const;

/// print only keys
virtual void printKeys(
const std::string& s = "Factor",
const KeyFormatter& formatter = DefaultKeyFormatter) const;
/// print only keys
virtual void printKeys(
const std::string& s = "Factor",
const KeyFormatter& formatter = DefaultKeyFormatter) const;

protected:
/// check equality
Expand Down
4 changes: 4 additions & 0 deletions gtsam/inference/FactorGraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ class FactorGraph {
/// @}

public:
/// Default destructor
// Public and virtual so boost serialization can call it.
virtual ~FactorGraph() = default;

/// @name Adding Single Factors
/// @{

Expand Down