diff --git a/gtsam/linear/GaussianFactorGraph.cpp b/gtsam/linear/GaussianFactorGraph.cpp index 3275409c2..7e5f0b16c 100644 --- a/gtsam/linear/GaussianFactorGraph.cpp +++ b/gtsam/linear/GaussianFactorGraph.cpp @@ -57,7 +57,7 @@ namespace gtsam { /* ************************************************************************* */ std::vector > GaussianFactorGraph::sparseJacobian() const { // First find dimensions of each variable - FastVector dims; + vector dims; BOOST_FOREACH(const sharedFactor& factor, *this) { for(GaussianFactor::const_iterator pos = factor->begin(); pos != factor->end(); ++pos) { if(dims.size() <= *pos) @@ -73,7 +73,7 @@ namespace gtsam { // Iterate over all factors, adding sparse scalar entries typedef boost::tuple triplet; - FastVector entries; + vector entries; size_t row = 0; BOOST_FOREACH(const sharedFactor& factor, *this) { // Convert to JacobianFactor if necessary diff --git a/gtsam/nonlinear/ISAM2.cpp b/gtsam/nonlinear/ISAM2.cpp index 82bc67769..2ec964b93 100644 --- a/gtsam/nonlinear/ISAM2.cpp +++ b/gtsam/nonlinear/ISAM2.cpp @@ -273,7 +273,7 @@ GaussianFactorGraph ISAM2::getCachedBoundaryFactors(Cliques& orphans) { /* ************************************************************************* */ boost::shared_ptr > ISAM2::recalculate(const FastSet& markedKeys, const FastSet& relinKeys, - const FastVector& observedKeys, + const vector& observedKeys, const FastSet& unusedIndices, const boost::optional >& constrainKeys, ISAM2Result& result) @@ -519,7 +519,7 @@ boost::shared_ptr > ISAM2::recalculate(const FastSet& markedKe /* ************************************************************************* */ ISAM2Result ISAM2::update( - const NonlinearFactorGraph& newFactors, const Values& newTheta, const FastVector& removeFactorIndices, + const NonlinearFactorGraph& newFactors, const Values& newTheta, const vector& removeFactorIndices, const boost::optional >& constrainedKeys, const boost::optional >& noRelinKeys, const boost::optional >& extraReelimKeys, bool force_relinearize) { @@ -633,7 +633,7 @@ ISAM2Result ISAM2::update( // NOTE: we use assign instead of the iterator constructor here because this // is a vector of size_t, so the constructor unintentionally resolves to // vector(size_t count, Index value) instead of the iterator constructor. - FastVector observedKeys; observedKeys.reserve(markedKeys.size()); + vector observedKeys; observedKeys.reserve(markedKeys.size()); BOOST_FOREACH(Index index, markedKeys) { if(unusedIndices.find(index) == unusedIndices.end()) // Only add if not unused observedKeys.push_back(index); // Make a copy of these, as we'll soon add to them diff --git a/gtsam/nonlinear/ISAM2.h b/gtsam/nonlinear/ISAM2.h index cc8edbaa0..22322a52c 100644 --- a/gtsam/nonlinear/ISAM2.h +++ b/gtsam/nonlinear/ISAM2.h @@ -504,7 +504,7 @@ public: * @return An ISAM2Result struct containing information about the update */ ISAM2Result update(const NonlinearFactorGraph& newFactors = NonlinearFactorGraph(), const Values& newTheta = Values(), - const FastVector& removeFactorIndices = FastVector(), + const std::vector& removeFactorIndices = std::vector(), const boost::optional >& constrainedKeys = boost::none, const boost::optional >& noRelinKeys = boost::none, const boost::optional >& extraReelimKeys = boost::none, @@ -610,7 +610,7 @@ private: GaussianFactorGraph getCachedBoundaryFactors(Cliques& orphans); boost::shared_ptr > recalculate(const FastSet& markedKeys, const FastSet& relinKeys, - const FastVector& observedKeys, const FastSet& unusedIndices, const boost::optional >& constrainKeys, ISAM2Result& result); + const std::vector& observedKeys, const FastSet& unusedIndices, const boost::optional >& constrainKeys, ISAM2Result& result); // void linear_update(const GaussianFactorGraph& newFactors); void updateDelta(bool forceFullSolve = false) const;