Fixed warnings
parent
1a4fe360ee
commit
9a10242e96
|
@ -139,10 +139,7 @@ public:
|
||||||
template<typename ITERATOR, class FG>
|
template<typename ITERATOR, class FG>
|
||||||
void remove(ITERATOR firstFactor, ITERATOR lastFactor, const FG& factors);
|
void remove(ITERATOR firstFactor, ITERATOR lastFactor, const FG& factors);
|
||||||
|
|
||||||
/** Remove unused empty variables at the end of the ordering (in debug mode
|
/** Remove unused empty variables (in debug mode verifies they are empty). */
|
||||||
* verifies they are empty).
|
|
||||||
* @param nToRemove The number of unused variables at the end to remove
|
|
||||||
*/
|
|
||||||
template<typename ITERATOR>
|
template<typename ITERATOR>
|
||||||
void removeUnusedVariables(ITERATOR firstKey, ITERATOR lastKey);
|
void removeUnusedVariables(ITERATOR firstKey, ITERATOR lastKey);
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ namespace gtsam {
|
||||||
virtual double error(const VectorValues& c) const = 0; /** 0.5*(A*x-b)'*D*(A*x-b) */
|
virtual double error(const VectorValues& c) const = 0; /** 0.5*(A*x-b)'*D*(A*x-b) */
|
||||||
|
|
||||||
/** Return the dimension of the variable pointed to by the given key iterator */
|
/** Return the dimension of the variable pointed to by the given key iterator */
|
||||||
virtual size_t getDim(const_iterator variable) const = 0;
|
virtual DenseIndex getDim(const_iterator variable) const = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a dense \f$ [ \;A\;b\; ] \in \mathbb{R}^{m \times n+1} \f$
|
* Return a dense \f$ [ \;A\;b\; ] \in \mathbb{R}^{m \times n+1} \f$
|
||||||
|
|
|
@ -221,7 +221,7 @@ namespace gtsam {
|
||||||
* @param variable An iterator pointing to the slot in this factor. You can
|
* @param variable An iterator pointing to the slot in this factor. You can
|
||||||
* use, for example, begin() + 2 to get the 3rd variable in this factor.
|
* use, for example, begin() + 2 to get the 3rd variable in this factor.
|
||||||
*/
|
*/
|
||||||
virtual size_t getDim(const_iterator variable) const { return info_(variable-this->begin(), 0).rows(); }
|
virtual DenseIndex getDim(const_iterator variable) const { return info_(variable-this->begin(), 0).rows(); }
|
||||||
|
|
||||||
/** Return the number of columns and rows of the Hessian matrix, including the information vector. */
|
/** Return the number of columns and rows of the Hessian matrix, including the information vector. */
|
||||||
size_t rows() const { return info_.rows(); }
|
size_t rows() const { return info_.rows(); }
|
||||||
|
|
|
@ -227,7 +227,7 @@ namespace gtsam {
|
||||||
/** Return the dimension of the variable pointed to by the given key iterator
|
/** Return the dimension of the variable pointed to by the given key iterator
|
||||||
* todo: Remove this in favor of keeping track of dimensions with variables?
|
* todo: Remove this in favor of keeping track of dimensions with variables?
|
||||||
*/
|
*/
|
||||||
virtual size_t getDim(const_iterator variable) const { return Ab_(variable - begin()).cols(); }
|
virtual DenseIndex getDim(const_iterator variable) const { return Ab_(variable - begin()).cols(); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* return the number of rows in the corresponding linear system
|
* return the number of rows in the corresponding linear system
|
||||||
|
|
|
@ -70,7 +70,7 @@ TEST( Graph, predecessorMap2Graph )
|
||||||
p_map.insert(3, 2);
|
p_map.insert(3, 2);
|
||||||
boost::tie(graph, root, key2vertex) = predecessorMap2Graph<SGraph<Key>, SVertex, Key>(p_map);
|
boost::tie(graph, root, key2vertex) = predecessorMap2Graph<SGraph<Key>, SVertex, Key>(p_map);
|
||||||
|
|
||||||
LONGS_EQUAL(3, boost::num_vertices(graph));
|
LONGS_EQUAL(3, (long)boost::num_vertices(graph));
|
||||||
CHECK(root == key2vertex[2]);
|
CHECK(root == key2vertex[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ TEST( Graph, composePoses )
|
||||||
expected.insert(3, p3);
|
expected.insert(3, p3);
|
||||||
expected.insert(4, p4);
|
expected.insert(4, p4);
|
||||||
|
|
||||||
LONGS_EQUAL(4, actual->size());
|
LONGS_EQUAL(4, (long)actual->size());
|
||||||
CHECK(assert_equal(expected, *actual));
|
CHECK(assert_equal(expected, *actual));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue