diff --git a/cpp/TupleConfig-inl.h b/cpp/TupleConfig-inl.h index 0197bb6f0..785f7cb30 100644 --- a/cpp/TupleConfig-inl.h +++ b/cpp/TupleConfig-inl.h @@ -42,7 +42,7 @@ namespace gtsam { /* ************************************************************************* */ template void PairConfig::print(const std::string& s) const { - std::cout << "TupleConfig " << s << ", size " << size_ << "\n"; + std::cout << "TupleConfig " << s << ", size " << size() << "\n"; first().print(s + "Config1: "); second().print(s + "Config2: "); } diff --git a/cpp/TupleConfig.h b/cpp/TupleConfig.h index 4ac611d6d..b3bff7439 100644 --- a/cpp/TupleConfig.h +++ b/cpp/TupleConfig.h @@ -376,25 +376,21 @@ namespace gtsam { private: - size_t size_; - size_t dim_; - PairConfig(const LieConfig& config1, const LieConfig& config2) : - first_(config1), second_(config2), - size_(config1.size()+config2.size()), dim_(gtsam::dim(config1)+gtsam::dim(config2)) {} + first_(config1), second_(config2){} public: /** * Default constructor creates an empty config. */ - PairConfig(): size_(0), dim_(0) {} + PairConfig(){} /** * Copy constructor */ PairConfig(const PairConfig& c): - first_(c.first_), second_(c.second_), size_(c.size_), dim_(c.dim_) {} + first_(c.first_), second_(c.second_){} /** * Print @@ -422,27 +418,23 @@ namespace gtsam { /** * size is the total number of variables in this config. */ - size_t size() const { return size_; } + size_t size() const { return first_.size() + second_.size(); } /** * dim is the dimensionality of the tangent space */ - size_t dim() const { return dim_; } + size_t dim() const { return first_.dim() + second_.dim(); } private: template void insert_helper(Config& config, const Key& j, const Value& value) { config.insert(j, value); - size_ ++; - dim_ += gtsam::dim(value); } template void erase_helper(Config& config, const Key& j) { size_t dim; config.erase(j, dim); - dim_ -= dim; - size_ --; } public: