diff --git a/gtsam/linear/GaussianFactorGraph.h b/gtsam/linear/GaussianFactorGraph.h index 2f5bb582a..584eb02ce 100644 --- a/gtsam/linear/GaussianFactorGraph.h +++ b/gtsam/linear/GaussianFactorGraph.h @@ -180,10 +180,12 @@ namespace gtsam { ///@name Linear Algebra ///@{ + /// Sparse matrix representation as vector of tuples. typedef std::vector> - SparseMatrixBoostTriplets; ///< Sparse matrix representation as vector of tuples. - typedef std::vector> - SparseMatrixGtsamTriplets; ///< Sparse matrix representation as vector of SparseTriplet's. + SparseMatrixBoostTriplets; + /// Sparse matrix representation as vector of slightly more efficient + /// tuples. + typedef std::vector> SparseMatrixGtsamTriplets; /** * Return vector of i, j, and s to generate an m-by-n sparse augmented @@ -430,13 +432,6 @@ namespace gtsam { /// @} private: - /** Serialization function */ - friend class boost::serialization::access; - template - void serialize(ARCHIVE & ar, const unsigned int /*version*/) { - ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base); - } - /** Performs in-place population of a sparse jacobian. Contains the * common functionality amongst different sparseJacobian functions. * @param entries a container of triplets that supports @@ -445,6 +440,13 @@ namespace gtsam { void sparseJacobianInPlace(T& entries, const Ordering& ordering, size_t& nrows, size_t& ncols) const; + /** Serialization function */ + friend class boost::serialization::access; + template + void serialize(ARCHIVE & ar, const unsigned int /*version*/) { + ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base); + } + public: /** \deprecated */