Got rid of (defunct) "dump" methods
parent
c046fed37c
commit
921cb0a8fc
|
@ -91,13 +91,6 @@ namespace gtsam {
|
||||||
return Point2(fx_ * x + s_ * y + u0_, fy_ * y + v0_);
|
return Point2(fx_ * x + s_ * y + u0_, fy_ * y + v0_);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string dump() const {
|
|
||||||
char buffer[100];
|
|
||||||
buffer[0] = 0;
|
|
||||||
sprintf(buffer, "%f %f %f %f %f", fx_, fy_, s_, u0_, v0_);
|
|
||||||
return std::string(buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** friends */
|
/** friends */
|
||||||
friend Matrix Duncalibrate2(const Cal3_S2& K, const Point2& p);
|
friend Matrix Duncalibrate2(const Cal3_S2& K, const Point2& p);
|
||||||
|
|
||||||
|
|
|
@ -59,8 +59,6 @@ namespace gtsam {
|
||||||
*/
|
*/
|
||||||
virtual double error(const Config& c) const = 0;
|
virtual double error(const Config& c) const = 0;
|
||||||
|
|
||||||
virtual std::string dump() const = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* return keys in preferred order
|
* return keys in preferred order
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -99,11 +99,6 @@ list<string> LinearConstraint::keys(const std::string& key) const {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
string LinearConstraint::dump() const {
|
|
||||||
string ret;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
LinearConstraint::shared_ptr combineConstraints(
|
LinearConstraint::shared_ptr combineConstraints(
|
||||||
const set<LinearConstraint::shared_ptr>& constraints) {
|
const set<LinearConstraint::shared_ptr>& constraints) {
|
||||||
map<string, Matrix> blocks;
|
map<string, Matrix> blocks;
|
||||||
|
|
|
@ -90,10 +90,6 @@ public:
|
||||||
*/
|
*/
|
||||||
ConstrainedConditionalGaussian::shared_ptr
|
ConstrainedConditionalGaussian::shared_ptr
|
||||||
eliminate(const std::string& key);
|
eliminate(const std::string& key);
|
||||||
/**
|
|
||||||
* returns a version of the factor as a string
|
|
||||||
*/
|
|
||||||
std::string dump() const;
|
|
||||||
|
|
||||||
/** get a copy of b */
|
/** get a copy of b */
|
||||||
const Vector& get_b() const {
|
const Vector& get_b() const {
|
||||||
|
|
|
@ -120,7 +120,6 @@ public:
|
||||||
// Implementing Factor virtual functions
|
// Implementing Factor virtual functions
|
||||||
|
|
||||||
double error(const VectorConfig& c) const; /** 0.5*(A*x-b)'*(A*x-b) */
|
double error(const VectorConfig& c) const; /** 0.5*(A*x-b)'*(A*x-b) */
|
||||||
std::string dump() const { return "";}
|
|
||||||
std::size_t size() const { return As.size();}
|
std::size_t size() const { return As.size();}
|
||||||
|
|
||||||
/** STL like, return the iterator pointing to the first node */
|
/** STL like, return the iterator pointing to the first node */
|
||||||
|
|
|
@ -98,9 +98,6 @@ namespace gtsam {
|
||||||
/** get the size of the factor */
|
/** get the size of the factor */
|
||||||
std::size_t size() const{return keys_.size();}
|
std::size_t size() const{return keys_.size();}
|
||||||
|
|
||||||
/** dump the information of the factor into a string **/
|
|
||||||
std::string dump() const{return "";}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
/** Serialization function */
|
/** Serialization function */
|
||||||
|
@ -149,8 +146,6 @@ namespace gtsam {
|
||||||
|
|
||||||
/** linearize a non-linearFactor1 to get a linearFactor1 */
|
/** linearize a non-linearFactor1 to get a linearFactor1 */
|
||||||
boost::shared_ptr<LinearFactor> linearize(const VectorConfig& c) const;
|
boost::shared_ptr<LinearFactor> linearize(const VectorConfig& c) const;
|
||||||
|
|
||||||
std::string dump() const {return "";}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -193,8 +188,6 @@ namespace gtsam {
|
||||||
|
|
||||||
/** Linearize a non-linearFactor2 to get a linearFactor2 */
|
/** Linearize a non-linearFactor2 to get a linearFactor2 */
|
||||||
boost::shared_ptr<LinearFactor> linearize(const VectorConfig& c) const;
|
boost::shared_ptr<LinearFactor> linearize(const VectorConfig& c) const;
|
||||||
|
|
||||||
std::string dump() const{return "";};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
|
|
|
@ -86,21 +86,3 @@ bool VSLAMFactor<Config>::equals(const NonlinearFactor<Config>& f, double tol) c
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
template <class Config>
|
|
||||||
string VSLAMFactor<Config>::dump() const
|
|
||||||
{
|
|
||||||
int i = getCameraFrameNumber();
|
|
||||||
int j = getLandmarkNumber();
|
|
||||||
Vector z = ConvenientFactor::measurement();
|
|
||||||
char buffer[200];
|
|
||||||
buffer[0] = 0;
|
|
||||||
sprintf(buffer, "1 %d %d %f %d", i, j , ConvenientFactor::sigma(), (int)z.size());
|
|
||||||
for(size_t i = 0; i < z.size(); i++)
|
|
||||||
sprintf(buffer, "%s %f", buffer, z(i));
|
|
||||||
sprintf(buffer, "%s %s", buffer, K_.dump().c_str());
|
|
||||||
|
|
||||||
return string(buffer);
|
|
||||||
string temp;
|
|
||||||
return temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -66,11 +66,6 @@ class VSLAMFactor : public NonlinearFactor<Config>
|
||||||
|
|
||||||
int getCameraFrameNumber() const { return cameraFrameNumber_; }
|
int getCameraFrameNumber() const { return cameraFrameNumber_; }
|
||||||
int getLandmarkNumber() const { return landmarkNumber_; }
|
int getLandmarkNumber() const { return landmarkNumber_; }
|
||||||
|
|
||||||
/**
|
|
||||||
* dump the information of the factor into a string
|
|
||||||
*/
|
|
||||||
std::string dump() const;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,18 +106,6 @@ namespace gtsam {
|
||||||
odprintf("]\n");
|
odprintf("]\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
|
||||||
string dump(const Vector& v)
|
|
||||||
{
|
|
||||||
ostringstream oss;
|
|
||||||
oss << "[";
|
|
||||||
size_t n = v.size();
|
|
||||||
for(size_t i=0; i<n; i++)
|
|
||||||
oss << v[i] << (i<n-1 ? "; " : "");
|
|
||||||
oss << "]";
|
|
||||||
return oss.str();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
bool operator==(const Vector& vec1,const Vector& vec2) {
|
bool operator==(const Vector& vec1,const Vector& vec2) {
|
||||||
Vector::const_iterator it1 = vec1.begin();
|
Vector::const_iterator it1 = vec1.begin();
|
||||||
|
|
|
@ -56,11 +56,6 @@ bool zero(const Vector& v);
|
||||||
*/
|
*/
|
||||||
void print(const Vector& v, const std::string& s = "");
|
void print(const Vector& v, const std::string& s = "");
|
||||||
|
|
||||||
/**
|
|
||||||
* returns a string suitable for printing
|
|
||||||
*/
|
|
||||||
std::string dump(const Vector& v);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* operator==()
|
* operator==()
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue