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

Distinguish writer from formatting

release/4.3a0
Frank Dellaert 2022-01-27 14:34:24 -05:00
parent 828abe2fc0
commit 34e92995e7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/nonlinear/nonlinear.i
View File

@ -98,11 +98,11 @@ class NonlinearFactorGraph {
string dot( string dot(
const gtsam::Values& values, const gtsam::Values& values,
const gtsam::KeyFormatter& keyFormatter = gtsam::DefaultKeyFormatter, const gtsam::KeyFormatter& keyFormatter = gtsam::DefaultKeyFormatter,
const GraphvizFormatting& writer = GraphvizFormatting()); const GraphvizFormatting& formatting = GraphvizFormatting());
void saveGraph( void saveGraph(
const string& s, const gtsam::Values& values, const string& s, const gtsam::Values& values,
const gtsam::KeyFormatter& keyFormatter = gtsam::DefaultKeyFormatter, const gtsam::KeyFormatter& keyFormatter = gtsam::DefaultKeyFormatter,
const GraphvizFormatting& writer = GraphvizFormatting()) const; const GraphvizFormatting& formatting = GraphvizFormatting()) const;
// enabling serialization functionality // enabling serialization functionality
void serialize() const; void serialize() const;

6
python/gtsam/tests/test_GraphvizFormatting.py
View File

@ -78,7 +78,7 @@ class TestGraphvizFormatting(GtsamTestCase):
graphviz_formatting.paperHorizontalAxis = gtsam.GraphvizFormatting.Axis.X graphviz_formatting.paperHorizontalAxis = gtsam.GraphvizFormatting.Axis.X
graphviz_formatting.paperVerticalAxis = gtsam.GraphvizFormatting.Axis.Y graphviz_formatting.paperVerticalAxis = gtsam.GraphvizFormatting.Axis.Y
self.assertEqual(self.graph.dot(self.values, self.assertEqual(self.graph.dot(self.values,
writer=graphviz_formatting), formatting=graphviz_formatting),
textwrap.dedent(expected_result)) textwrap.dedent(expected_result))
def test_factor_points(self): def test_factor_points(self):
@ -100,7 +100,7 @@ class TestGraphvizFormatting(GtsamTestCase):
graphviz_formatting.plotFactorPoints = False graphviz_formatting.plotFactorPoints = False
self.assertEqual(self.graph.dot(self.values, self.assertEqual(self.graph.dot(self.values,
writer=graphviz_formatting), formatting=graphviz_formatting),
textwrap.dedent(expected_result)) textwrap.dedent(expected_result))
def test_width_height(self): def test_width_height(self):
@ -127,7 +127,7 @@ class TestGraphvizFormatting(GtsamTestCase):
graphviz_formatting.figureHeightInches = 10 graphviz_formatting.figureHeightInches = 10
self.assertEqual(self.graph.dot(self.values, self.assertEqual(self.graph.dot(self.values,
writer=graphviz_formatting), formatting=graphviz_formatting),
textwrap.dedent(expected_result)) textwrap.dedent(expected_result))