renamed squaredMahalanobisDistance

release/4.3a0
yetongumich 2020-04-02 11:06:31 -04:00
parent 4c6feb4769
commit 0f713ec077
3 changed files with 8 additions and 8 deletions

View File

@ -157,7 +157,7 @@ Vector Gaussian::unwhiten(const Vector& v) const {
}
/* ************************************************************************* */
double Gaussian::SquaredMahalanobisDistance(const Vector& v) const {
double Gaussian::squaredMahalanobisDistance(const Vector& v) const {
// Note: for Diagonal, which does ediv_, will be correct for constraints
Vector w = whiten(v);
return w.dot(w);
@ -573,7 +573,7 @@ void Isotropic::print(const string& name) const {
}
/* ************************************************************************* */
double Isotropic::SquaredMahalanobisDistance(const Vector& v) const {
double Isotropic::squaredMahalanobisDistance(const Vector& v) const {
return v.dot(v) * invsigma_ * invsigma_;
}

View File

@ -209,13 +209,13 @@ namespace gtsam {
/**
* Squared Mahalanobis distance v'*R'*R*v = <R*v,R*v>
*/
virtual double SquaredMahalanobisDistance(const Vector& v) const;
virtual double squaredMahalanobisDistance(const Vector& v) const;
/**
* Mahalanobis distance
*/
virtual double MahalanobisDistance(const Vector& v) const {
return std::sqrt(SquaredMahalanobisDistance(v));
return std::sqrt(squaredMahalanobisDistance(v));
}
#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4
@ -223,7 +223,7 @@ namespace gtsam {
#endif
inline virtual double distance(const Vector& v) const {
return SquaredMahalanobisDistance(v);
return squaredMahalanobisDistance(v);
}
/**
@ -575,7 +575,7 @@ namespace gtsam {
}
virtual void print(const std::string& name) const;
virtual double SquaredMahalanobisDistance(const Vector& v) const;
virtual double squaredMahalanobisDistance(const Vector& v) const;
virtual Vector whiten(const Vector& v) const;
virtual Vector unwhiten(const Vector& v) const;
virtual Matrix Whiten(const Matrix& H) const;
@ -627,7 +627,7 @@ namespace gtsam {
virtual bool isUnit() const { return true; }
virtual void print(const std::string& name) const;
virtual double SquaredMahalanobisDistance(const Vector& v) const {return v.dot(v); }
virtual double squaredMahalanobisDistance(const Vector& v) const {return v.dot(v); }
virtual Vector whiten(const Vector& v) const { return v; }
virtual Vector unwhiten(const Vector& v) const { return v; }
virtual Matrix Whiten(const Matrix& H) const { return H; }

View File

@ -71,7 +71,7 @@ TEST(NoiseModel, constructors)
// test squared Mahalanobis distance
double distance = 5*5+10*10+15*15;
for(Gaussian::shared_ptr mi: m)
DOUBLES_EQUAL(distance,mi->SquaredMahalanobisDistance(unwhitened),1e-9);
DOUBLES_EQUAL(distance,mi->squaredMahalanobisDistance(unwhitened),1e-9);
// test R matrix
for(Gaussian::shared_ptr mi: m)