12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #408 from borglab/fix/matlab_wrapper 

Fix/matlab wrapper
release/4.3a0
Frank Dellaert 2020-07-14 20:12:07 -04:00 committed by GitHub
parent b0e9a0ccd8 94bb08ed34
commit 7d22007d84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/DiscreteBayesNetExample.cpp
View File

@ -18,7 +18,7 @@
#include <gtsam/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam/discrete/DiscreteMarginals.h> #include <gtsam/discrete/DiscreteMarginals.h>
#include <gtsam/inference/BayesNet-inst.h> #include <gtsam/inference/BayesNet.h>
#include <iomanip> #include <iomanip>

2
examples/HMMExample.cpp
View File

@ -18,7 +18,7 @@
#include <gtsam/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam/discrete/DiscreteMarginals.h> #include <gtsam/discrete/DiscreteMarginals.h>
#include <gtsam/inference/BayesNet-inst.h> #include <gtsam/inference/BayesNet.h>
#include <iomanip> #include <iomanip>
#include <sstream> #include <sstream>

6
gtsam/base/Matrix.h
View File

@ -610,5 +610,11 @@ namespace boost {
split_free(ar, m, version); split_free(ar, m, version);
} }
// specialized to Matrix for MATLAB wrapper
template <class Archive>
void serialize(Archive& ar, gtsam::Matrix& m, const unsigned int version) {
split_free(ar, m, version);
}
} // namespace serialization } // namespace serialization
} // namespace boost } // namespace boost

2
gtsam/discrete/tests/testDiscreteBayesTree.cpp
View File

@ -19,7 +19,7 @@
#include <gtsam/discrete/DiscreteBayesNet.h> #include <gtsam/discrete/DiscreteBayesNet.h>
#include <gtsam/discrete/DiscreteBayesTree.h> #include <gtsam/discrete/DiscreteBayesTree.h>
#include <gtsam/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam/inference/BayesNet-inst.h> #include <gtsam/inference/BayesNet.h>
#include <boost/assign/std/vector.hpp> #include <boost/assign/std/vector.hpp>
using namespace boost::assign; using namespace boost::assign;

2
gtsam/discrete/tests/testDiscreteFactorGraph.cpp
View File

@ -19,7 +19,7 @@
#include <gtsam/discrete/DiscreteFactorGraph.h> #include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam/discrete/DiscreteEliminationTree.h> #include <gtsam/discrete/DiscreteEliminationTree.h>
#include <gtsam/discrete/DiscreteBayesTree.h> #include <gtsam/discrete/DiscreteBayesTree.h>
#include <gtsam/inference/BayesNet-inst.h> #include <gtsam/inference/BayesNet.h>
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>

2
gtsam/geometry/SOn.h
View File

@ -340,7 +340,7 @@ void serialize(
const unsigned int file_version const unsigned int file_version
) { ) {
Matrix& M = Q.matrix_; Matrix& M = Q.matrix_;
ar& M; ar& BOOST_SERIALIZATION_NVP(M);
} }
/* /*

4
gtsam/inference/BayesNet.h
View File

@ -69,4 +69,6 @@ namespace gtsam {
void saveGraph(const std::string &s, const KeyFormatter& keyFormatter = DefaultKeyFormatter) const; void saveGraph(const std::string &s, const KeyFormatter& keyFormatter = DefaultKeyFormatter) const;
}; };
} }
#include <gtsam/inference/BayesNet-inst.h>