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

Merge pull request #996 from borglab/fix/example_issues

release/4.3a0
Frank Dellaert 2021-12-30 12:09:02 -05:00 committed by GitHub
parent 03e932dbdc 92744d13c6
commit 2f7ebb4d0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/UGM_small.cpp
View File

@ -50,8 +50,7 @@ int main(int argc, char** argv) {
// Print the UGM distribution // Print the UGM distribution
cout << "\nUGM distribution:" << endl; cout << "\nUGM distribution:" << endl;
vector<DiscreteFactor::Values> allPosbValues = cartesianProduct( auto allPosbValues = cartesianProduct(Cathy & Heather & Mark & Allison);
Cathy & Heather & Mark & Allison);
for (size_t i = 0; i < allPosbValues.size(); ++i) { for (size_t i = 0; i < allPosbValues.size(); ++i) {
DiscreteFactor::Values values = allPosbValues[i]; DiscreteFactor::Values values = allPosbValues[i];
double prodPot = graph(values); double prodPot = graph(values);

8
gtsam/nonlinear/NonlinearFactorGraph.h
View File

@ -269,10 +269,10 @@ namespace gtsam {
dot(os, values, keyFormatter, graphvizFormatting); dot(os, values, keyFormatter, graphvizFormatting);
} }
/** \deprecated */ /** \deprecated */
void GTSAM_DEPRECATED saveGraph( void GTSAM_DEPRECATED
const std::string& filename, const Values& values, saveGraph(const std::string& filename, const Values& values,
const GraphvizFormatting& graphvizFormatting = GraphvizFormatting(), const GraphvizFormatting& graphvizFormatting,
const KeyFormatter& keyFormatter = DefaultKeyFormatter) const { const KeyFormatter& keyFormatter = DefaultKeyFormatter) const {
saveGraph(filename, values, keyFormatter, graphvizFormatting); saveGraph(filename, values, keyFormatter, graphvizFormatting);
} }
#endif #endif