Rebasing...

release/4.3a0
Alex Cunningham 2013-06-20 17:08:30 +00:00
parent 9f9807ef19
commit e7334b89bd
1 changed files with 16 additions and 16 deletions

View File

@ -14,25 +14,25 @@
namespace gtsam { namespace gtsam {
// Serialize/Deserialize a NonlinearFactorGraph // Serialize/Deserialize a NonlinearFactorGraph
GTSAM_EXPORT std::string serializeGraph(const NonlinearFactorGraph& graph); std::string serializeGraph(const NonlinearFactorGraph& graph);
GTSAM_EXPORT NonlinearFactorGraph::shared_ptr deserializeGraph(const std::string& serialized_graph); NonlinearFactorGraph::shared_ptr deserializeGraph(const std::string& serialized_graph);
GTSAM_EXPORT std::string serializeGraphXML(const NonlinearFactorGraph& graph, std::string serializeGraphXML(const NonlinearFactorGraph& graph,
const std::string& name = "graph"); const std::string& name = "graph");
GTSAM_EXPORT NonlinearFactorGraph::shared_ptr deserializeGraphXML(const std::string& serialized_graph, NonlinearFactorGraph::shared_ptr deserializeGraphXML(const std::string& serialized_graph,
const std::string& name = "graph"); const std::string& name = "graph");
// Serialize/Deserialize a Values // Serialize/Deserialize a Values
GTSAM_EXPORT std::string serializeValues(const Values& values); std::string serializeValues(const Values& values);
GTSAM_EXPORT Values::shared_ptr deserializeValues(const std::string& serialized_values); Values::shared_ptr deserializeValues(const std::string& serialized_values);
GTSAM_EXPORT std::string serializeValuesXML(const Values& values, const std::string& name = "values"); std::string serializeValuesXML(const Values& values, const std::string& name = "values");
GTSAM_EXPORT Values::shared_ptr deserializeValuesXML(const std::string& serialized_values, Values::shared_ptr deserializeValuesXML(const std::string& serialized_values,
const std::string& name = "values"); const std::string& name = "values");
// Serialize to/from files // Serialize to/from files
@ -40,21 +40,21 @@ GTSAM_EXPORT Values::shared_ptr deserializeValuesXML(const std::string& serializ
// Filename arguments include path // Filename arguments include path
// Serialize // Serialize
GTSAM_EXPORT bool serializeGraphToFile(const NonlinearFactorGraph& graph, const std::string& fname); bool serializeGraphToFile(const NonlinearFactorGraph& graph, const std::string& fname);
GTSAM_EXPORT bool serializeGraphToXMLFile(const NonlinearFactorGraph& graph, bool serializeGraphToXMLFile(const NonlinearFactorGraph& graph,
const std::string& fname, const std::string& name = "graph"); const std::string& fname, const std::string& name = "graph");
GTSAM_EXPORT bool serializeValuesToFile(const Values& values, const std::string& fname); bool serializeValuesToFile(const Values& values, const std::string& fname);
GTSAM_EXPORT bool serializeValuesToXMLFile(const Values& values, bool serializeValuesToXMLFile(const Values& values,
const std::string& fname, const std::string& name = "values"); const std::string& fname, const std::string& name = "values");
// Deserialize // Deserialize
GTSAM_EXPORT NonlinearFactorGraph::shared_ptr deserializeGraphFromFile(const std::string& fname); NonlinearFactorGraph::shared_ptr deserializeGraphFromFile(const std::string& fname);
GTSAM_EXPORT NonlinearFactorGraph::shared_ptr deserializeGraphFromXMLFile(const std::string& fname, NonlinearFactorGraph::shared_ptr deserializeGraphFromXMLFile(const std::string& fname,
const std::string& name = "graph"); const std::string& name = "graph");
GTSAM_EXPORT Values::shared_ptr deserializeValuesFromFile(const std::string& fname); Values::shared_ptr deserializeValuesFromFile(const std::string& fname);
GTSAM_EXPORT Values::shared_ptr deserializeValuesFromXMLFile(const std::string& fname, Values::shared_ptr deserializeValuesFromXMLFile(const std::string& fname,
const std::string& name = "values"); const std::string& name = "values");
} // \namespace gtsam } // \namespace gtsam