Fix deperecated copies and redundant moves

release/4.3a0
Matt 2024-12-29 10:46:20 -08:00
parent 9db9ad7a03
commit 846c29fa2e
19 changed files with 42 additions and 18 deletions

View File

@ -85,6 +85,8 @@ public:
/** Copy constructor from the base map class */ /** Copy constructor from the base map class */
ConcurrentMap(const Base& x) : Base(x) {} ConcurrentMap(const Base& x) : Base(x) {}
ConcurrentMap& operator=(const ConcurrentMap& other) = default;
/** Handy 'exists' function */ /** Handy 'exists' function */
bool exists(const KEY& e) const { return this->count(e); } bool exists(const KEY& e) const { return this->count(e); }

View File

@ -62,6 +62,8 @@ public:
/// Construct from c++11 initializer list: /// Construct from c++11 initializer list:
FastList(std::initializer_list<VALUE> l) : Base(l) {} FastList(std::initializer_list<VALUE> l) : Base(l) {}
FastList& operator=(const FastList& other) = default;
#ifdef GTSAM_ALLOCATOR_BOOSTPOOL #ifdef GTSAM_ALLOCATOR_BOOSTPOOL
/** Copy constructor from a standard STL container */ /** Copy constructor from a standard STL container */
FastList(const std::list<VALUE>& x) { FastList(const std::list<VALUE>& x) {

View File

@ -54,6 +54,8 @@ public:
/** Copy constructor from another FastMap */ /** Copy constructor from another FastMap */
FastMap(const FastMap<KEY,VALUE>& x) : Base(x) {} FastMap(const FastMap<KEY,VALUE>& x) : Base(x) {}
FastMap& operator=(const FastMap<KEY,VALUE>& x) = default;
/** Copy constructor from the base map class */ /** Copy constructor from the base map class */
FastMap(const Base& x) : Base(x) {} FastMap(const Base& x) : Base(x) {}

View File

@ -80,6 +80,8 @@ public:
Base(x) { Base(x) {
} }
FastSet& operator=(const FastSet& other) = default;
#ifdef GTSAM_ALLOCATOR_BOOSTPOOL #ifdef GTSAM_ALLOCATOR_BOOSTPOOL
/** Copy constructor from a standard STL container */ /** Copy constructor from a standard STL container */
FastSet(const std::set<VALUE>& x) { FastSet(const std::set<VALUE>& x) {

View File

@ -56,9 +56,10 @@ public:
GenericValue(){} GenericValue(){}
/// Construct from value /// Construct from value
GenericValue(const T& value) : GenericValue(const T& value) : Value(),
value_(value) { value_(value) {}
}
GenericValue(const GenericValue& other) = default;
/// Return a constant value /// Return a constant value
const T& value() const { const T& value() const {
@ -112,7 +113,7 @@ public:
* Clone this value (normal clone on the heap, delete with 'delete' operator) * Clone this value (normal clone on the heap, delete with 'delete' operator)
*/ */
std::shared_ptr<Value> clone() const override { std::shared_ptr<Value> clone() const override {
return std::allocate_shared<GenericValue>(Eigen::aligned_allocator<GenericValue>(), *this); return std::allocate_shared<GenericValue>(Eigen::aligned_allocator<GenericValue>(), *this);
} }
/// Generic Value interface version of retract /// Generic Value interface version of retract

View File

@ -38,6 +38,9 @@ namespace gtsam {
*/ */
class GTSAM_EXPORT Value { class GTSAM_EXPORT Value {
public: public:
// todo - not sure if valid
Value() = default;
Value(const Value& other) = default;
/** Clone this value in a special memory pool, must be deleted with Value::deallocate_, *not* with the 'delete' operator. */ /** Clone this value in a special memory pool, must be deleted with Value::deallocate_, *not* with the 'delete' operator. */
virtual Value* clone_() const = 0; virtual Value* clone_() const = 0;

View File

@ -38,7 +38,7 @@ std::optional<Row> static ParseConditional(const std::string& token) {
} catch (...) { } catch (...) {
return std::nullopt; return std::nullopt;
} }
return std::move(row); return row;
} }
std::optional<Table> static ParseConditionalTable( std::optional<Table> static ParseConditionalTable(
@ -62,7 +62,7 @@ std::optional<Table> static ParseConditionalTable(
} }
} }
} }
return std::move(table); return table;
} }
std::vector<std::string> static Tokenize(const std::string& str) { std::vector<std::string> static Tokenize(const std::string& str) {

View File

@ -60,7 +60,10 @@ public:
} }
/** copy constructor */ /** copy constructor */
Pose2(const Pose2& pose) : r_(pose.r_), t_(pose.t_) {} Pose2(const Pose2& pose) = default;
// : r_(pose.r_), t_(pose.t_) {}
Pose2& operator=(const Pose2& other) = default;
/** /**
* construct from (x,y,theta) * construct from (x,y,theta)

View File

@ -55,9 +55,10 @@ public:
Pose3() : R_(traits<Rot3>::Identity()), t_(traits<Point3>::Identity()) {} Pose3() : R_(traits<Rot3>::Identity()), t_(traits<Point3>::Identity()) {}
/** Copy constructor */ /** Copy constructor */
Pose3(const Pose3& pose) : Pose3(const Pose3& pose) = default;
R_(pose.R_), t_(pose.t_) { // :
} // R_(pose.R_), t_(pose.t_) {
// }
/** Construct from R,t */ /** Construct from R,t */
Pose3(const Rot3& R, const Point3& t) : Pose3(const Rot3& R, const Point3& t) :

View File

@ -52,11 +52,14 @@ namespace gtsam {
Rot2() : c_(1.0), s_(0.0) {} Rot2() : c_(1.0), s_(0.0) {}
/** copy constructor */ /** copy constructor */
Rot2(const Rot2& r) : Rot2(r.c_, r.s_) {} Rot2(const Rot2& r) = default;
// : Rot2(r.c_, r.s_) {}
/// Constructor from angle in radians == exponential map at identity /// Constructor from angle in radians == exponential map at identity
Rot2(double theta) : c_(cos(theta)), s_(sin(theta)) {} Rot2(double theta) : c_(cos(theta)), s_(sin(theta)) {}
// Rot2& operator=(const gtsam::Rot2& other) = default;
/// Named constructor from angle in radians /// Named constructor from angle in radians
static Rot2 fromAngle(double theta) { static Rot2 fromAngle(double theta) {
return Rot2(theta); return Rot2(theta);

View File

@ -69,6 +69,8 @@ struct GTSAM_EXPORT ConjugateGradientParameters
epsilon_abs(p.epsilon_abs), epsilon_abs(p.epsilon_abs),
blas_kernel(GTSAM) {} blas_kernel(GTSAM) {}
ConjugateGradientParameters& operator=(const ConjugateGradientParameters& other) = default;
#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V43 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V43
inline size_t getMinIterations() const { return minIterations; } inline size_t getMinIterations() const { return minIterations; }
inline size_t getMaxIterations() const { return maxIterations; } inline size_t getMaxIterations() const { return maxIterations; }

View File

@ -379,7 +379,7 @@ GaussianFactor::shared_ptr HessianFactor::negate() const {
shared_ptr result = std::make_shared<This>(*this); shared_ptr result = std::make_shared<This>(*this);
// Negate the information matrix of the result // Negate the information matrix of the result
result->info_.negate(); result->info_.negate();
return std::move(result); return result;
} }
/* ************************************************************************* */ /* ************************************************************************* */

View File

@ -117,6 +117,8 @@ namespace gtsam {
/** Conversion from HessianFactor (does Cholesky to obtain Jacobian matrix) */ /** Conversion from HessianFactor (does Cholesky to obtain Jacobian matrix) */
explicit JacobianFactor(const HessianFactor& hf); explicit JacobianFactor(const HessianFactor& hf);
JacobianFactor& operator=(const JacobianFactor& jf) = default;
/** default constructor for I/O */ /** default constructor for I/O */
JacobianFactor(); JacobianFactor();

View File

@ -64,7 +64,7 @@ std::optional<Vector> checkIfDiagonal(const Matrix& M) {
Vector diagonal(n); Vector diagonal(n);
for (j = 0; j < n; j++) for (j = 0; j < n; j++)
diagonal(j) = M(j, j); diagonal(j) = M(j, j);
return std::move(diagonal); return diagonal;
} }
} }

View File

@ -119,6 +119,8 @@ namespace gtsam {
/// Constructor from Vector, with Scatter /// Constructor from Vector, with Scatter
VectorValues(const Vector& c, const Scatter& scatter); VectorValues(const Vector& c, const Scatter& scatter);
VectorValues& operator=(const VectorValues& other) = default;
/** Create a VectorValues with the same structure as \c other, but filled with zeros. */ /** Create a VectorValues with the same structure as \c other, but filled with zeros. */
static VectorValues Zero(const VectorValues& other); static VectorValues Zero(const VectorValues& other);

View File

@ -149,7 +149,7 @@ protected:
noiseModel_->WhitenSystem(Ab.matrix(), b); noiseModel_->WhitenSystem(Ab.matrix(), b);
} }
return std::move(factor); return factor;
} }
/// @return a deep copy of this factor /// @return a deep copy of this factor

View File

@ -61,7 +61,7 @@ ConvertNoiseModel(const SharedNoiseModel &model, size_t d, bool defaultToUnit) {
return noiseModel::Robust::Create( return noiseModel::Robust::Create(
noiseModel::mEstimator::Huber::Create(1.345), isoModel); noiseModel::mEstimator::Huber::Create(1.345), isoModel);
} else { } else {
return std::move(isoModel); return isoModel;
} }
} }

View File

@ -43,6 +43,7 @@ public:
Pose3Upright(const Rot2& bearing, const Point3& t); Pose3Upright(const Rot2& bearing, const Point3& t);
Pose3Upright(double x, double y, double z, double theta); Pose3Upright(double x, double y, double z, double theta);
Pose3Upright(const Pose2& pose, double z); Pose3Upright(const Pose2& pose, double z);
Pose3Upright& operator=(const Pose3Upright& x) = default;
/// Down-converts from a full Pose3 /// Down-converts from a full Pose3
Pose3Upright(const Pose3& fullpose); Pose3Upright(const Pose3& fullpose);

View File

@ -35,9 +35,7 @@ public:
} }
/// Copy constructor /// Copy constructor
Mechanization_bRn2(const Mechanization_bRn2& other) : Mechanization_bRn2(const Mechanization_bRn2& other) = default;
bRn_(other.bRn_), x_g_(other.x_g_), x_a_(other.x_a_) {
}
/// gravity in the body frame /// gravity in the body frame
Vector3 b_g(double g_e) const { Vector3 b_g(double g_e) const {