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

Formatting

release/4.3a0
Andrew Melim 2014-11-07 22:00:19 -05:00
parent 88a11329c0
commit ea19fae155
2 changed files with 81 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtsam/inference/MetisIndex-inl.h
View File

@ -23,10 +23,10 @@
namespace gtsam { namespace gtsam {
/* ************************************************************************* */ /* ************************************************************************* */
template<class FACTOR> template<class FACTOR>
void MetisIndex::augment(const FactorGraph<FACTOR>& factors) void MetisIndex::augment(const FactorGraph<FACTOR>& factors)
{ {
std::map<int, FastSet<int> > adjMap; std::map<int, FastSet<int> > adjMap;
std::map<int, FastSet<int> >::iterator adjMapIt; std::map<int, FastSet<int> >::iterator adjMapIt;
std::set<Key> keySet; std::set<Key> keySet;
@ -70,8 +70,6 @@ namespace gtsam {
// Normalize, subtract the smallest key // Normalize, subtract the smallest key
std::transform(adj_.begin(), adj_.end(), adj_.begin(), std::bind2nd(std::minus<size_t>(), minKey)); std::transform(adj_.begin(), adj_.end(), adj_.begin(), std::bind2nd(std::minus<size_t>(), minKey));
}
}
} }

12
gtsam/inference/MetisIndex.h
View File

@ -35,18 +35,18 @@ namespace gtsam {
* that involve each variable. * that involve each variable.
* \nosubgrouping * \nosubgrouping
*/ */
class GTSAM_EXPORT MetisIndex class GTSAM_EXPORT MetisIndex
{ {
public: public:
typedef boost::shared_ptr<MetisIndex> shared_ptr; typedef boost::shared_ptr<MetisIndex> shared_ptr;
private: private:
FastVector<int> xadj_; // Index of node's adjacency list in adj FastVector<int> xadj_; // Index of node's adjacency list in adj
FastVector<int> adj_; // Stores ajacency lists of all nodes, appended into a single vector FastVector<int> adj_; // Stores ajacency lists of all nodes, appended into a single vector
size_t nFactors_; // Number of factors in the original factor graph size_t nFactors_; // Number of factors in the original factor graph
size_t nKeys_; // size_t nKeys_; //
public: public:
/// @name Standard Constructors /// @name Standard Constructors
/// @{ /// @{
@ -74,7 +74,7 @@ public:
size_t nValues() const { return nKeys_; } size_t nValues() const { return nKeys_; }
/// @} /// @}
}; };
} }