added empty constructors for serialization, also made sure SymbolicConditional.h was installed

release/4.3a0
Manohar Paluri 2009-11-10 14:55:07 +00:00
parent 1f15650da0
commit 0d928035e0
4 changed files with 12 additions and 3 deletions

View File

@ -29,6 +29,11 @@ protected:
public: public:
/** empty constructor for serialization */
Conditional() :
key_("__unitialized__") {
}
/** constructor */ /** constructor */
Conditional(const std::string& key) : Conditional(const std::string& key) :
key_(key) { key_(key) {
@ -37,7 +42,6 @@ public:
/* destructor */ /* destructor */
virtual ~Conditional() { virtual ~Conditional() {
} }
;
/** check equality */ /** check equality */
bool equals(const Conditional& c, double tol = 1e-9) const { bool equals(const Conditional& c, double tol = 1e-9) const {

View File

@ -52,7 +52,7 @@ protected:
public: public:
/** default constructor needed for serialization */ /** default constructor needed for serialization */
ConditionalGaussian(): Conditional("__unitialized__") {} ConditionalGaussian(){}
/** constructor */ /** constructor */
ConditionalGaussian(const std::string& key) : ConditionalGaussian(const std::string& key) :

View File

@ -150,7 +150,7 @@ testVSLAMFactor_LDADD = libgtsam.la
# The header files will be installed in ~/include/gtsam # The header files will be installed in ~/include/gtsam
headers = gtsam.h Value.h Testable.h Factor.h Conditional.h LinearFactorSet.h headers = gtsam.h Value.h Testable.h Factor.h Conditional.h SymbolicConditional.h LinearFactorSet.h
headers += Point2Prior.h Simulated2DOdometry.h Simulated2DMeasurement.h smallExample.h headers += Point2Prior.h Simulated2DOdometry.h Simulated2DMeasurement.h smallExample.h
headers += $(sources:.cpp=.h) headers += $(sources:.cpp=.h)
# templates: # templates:

View File

@ -32,6 +32,11 @@ namespace gtsam {
/** convenience typename for a shared pointer to this class */ /** convenience typename for a shared pointer to this class */
typedef boost::shared_ptr<SymbolicConditional> shared_ptr; typedef boost::shared_ptr<SymbolicConditional> shared_ptr;
/**
* Empty Constructor to make serialization possible
*/
SymbolicConditional(){}
/** /**
* No parents * No parents
*/ */