From 2422e113ca99a834c66baf642c1871b4a3916827 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sat, 25 Dec 2021 09:26:07 -0500 Subject: [PATCH] replace _repr_markdown_ with markdown --- gtsam/discrete/DecisionTreeFactor.cpp | 2 +- gtsam/discrete/DecisionTreeFactor.h | 2 +- gtsam/discrete/DiscreteConditional.cpp | 2 +- gtsam/discrete/DiscreteConditional.h | 2 +- gtsam/discrete/discrete.i | 4 ++-- gtsam/discrete/tests/testDecisionTreeFactor.cpp | 2 +- gtsam/discrete/tests/testDiscreteConditional.cpp | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gtsam/discrete/DecisionTreeFactor.cpp b/gtsam/discrete/DecisionTreeFactor.cpp index ff4c0694e..50b21fc76 100644 --- a/gtsam/discrete/DecisionTreeFactor.cpp +++ b/gtsam/discrete/DecisionTreeFactor.cpp @@ -135,7 +135,7 @@ namespace gtsam { } /* ************************************************************************* */ - std::string DecisionTreeFactor::_repr_markdown_( + std::string DecisionTreeFactor::markdown( const KeyFormatter& keyFormatter) const { std::stringstream ss; diff --git a/gtsam/discrete/DecisionTreeFactor.h b/gtsam/discrete/DecisionTreeFactor.h index 841f90fe2..27ee67cf2 100644 --- a/gtsam/discrete/DecisionTreeFactor.h +++ b/gtsam/discrete/DecisionTreeFactor.h @@ -167,7 +167,7 @@ namespace gtsam { /// @{ /// Render as markdown table. - std::string _repr_markdown_( + std::string markdown( const KeyFormatter& keyFormatter = DefaultKeyFormatter) const override; /// @} diff --git a/gtsam/discrete/DiscreteConditional.cpp b/gtsam/discrete/DiscreteConditional.cpp index b02d09575..dc5b52e5e 100644 --- a/gtsam/discrete/DiscreteConditional.cpp +++ b/gtsam/discrete/DiscreteConditional.cpp @@ -223,7 +223,7 @@ size_t DiscreteConditional::sample(const DiscreteValues& parentsValues) const { } /* ************************************************************************* */ -std::string DiscreteConditional::_repr_markdown_( +std::string DiscreteConditional::markdown( const KeyFormatter& keyFormatter) const { std::stringstream ss; diff --git a/gtsam/discrete/DiscreteConditional.h b/gtsam/discrete/DiscreteConditional.h index b76e4f65f..a8000f486 100644 --- a/gtsam/discrete/DiscreteConditional.h +++ b/gtsam/discrete/DiscreteConditional.h @@ -171,7 +171,7 @@ public: /// @{ /// Render as markdown table. - std::string _repr_markdown_( + std::string markdown( const KeyFormatter& keyFormatter = DefaultKeyFormatter) const override; /// @} diff --git a/gtsam/discrete/discrete.i b/gtsam/discrete/discrete.i index a2377dc59..2bdd0af2c 100644 --- a/gtsam/discrete/discrete.i +++ b/gtsam/discrete/discrete.i @@ -39,7 +39,7 @@ virtual class DecisionTreeFactor: gtsam::DiscreteFactor { gtsam::DefaultKeyFormatter) const; bool equals(const gtsam::DecisionTreeFactor& other, double tol = 1e-9) const; string dot(bool showZero = false) const; - string _repr_markdown_(const gtsam::KeyFormatter& keyFormatter = + string markdown(const gtsam::KeyFormatter& keyFormatter = gtsam::DefaultKeyFormatter) const; }; @@ -67,7 +67,7 @@ virtual class DiscreteConditional : gtsam::DecisionTreeFactor { size_t sample(const gtsam::DiscreteValues& parentsValues) const; void solveInPlace(gtsam::DiscreteValues@ parentsValues) const; void sampleInPlace(gtsam::DiscreteValues@ parentsValues) const; - string _repr_markdown_(const gtsam::KeyFormatter& keyFormatter = + string markdown(const gtsam::KeyFormatter& keyFormatter = gtsam::DefaultKeyFormatter) const; }; diff --git a/gtsam/discrete/tests/testDecisionTreeFactor.cpp b/gtsam/discrete/tests/testDecisionTreeFactor.cpp index 75d5efa9f..ad8e9bd2a 100644 --- a/gtsam/discrete/tests/testDecisionTreeFactor.cpp +++ b/gtsam/discrete/tests/testDecisionTreeFactor.cpp @@ -97,7 +97,7 @@ TEST(DecisionTreeFactor, markdown) { "|2|0|5|\n" "|2|1|6|\n"; auto formatter = [](Key key) { return key == 12 ? "A" : "B"; }; - string actual = f1._repr_markdown_(formatter); + string actual = f1.markdown(formatter); EXPECT(actual == expected); } diff --git a/gtsam/discrete/tests/testDiscreteConditional.cpp b/gtsam/discrete/tests/testDiscreteConditional.cpp index 964a33926..f42792e71 100644 --- a/gtsam/discrete/tests/testDiscreteConditional.cpp +++ b/gtsam/discrete/tests/testDiscreteConditional.cpp @@ -119,7 +119,7 @@ TEST(DiscreteConditional, markdown_prior) { "|0|0.2|\n" "|1|0.4|\n" "|2|0.4|\n"; - string actual = conditional._repr_markdown_(); + string actual = conditional.markdown(); EXPECT(actual == expected); } @@ -138,7 +138,7 @@ TEST(DiscreteConditional, markdown_multivalued) { "|2|0.33|0.33|0.34|\n" "|3|0.33|0.33|0.34|\n" "|4|0.95|0.02|0.03|\n"; - string actual = conditional._repr_markdown_(); + string actual = conditional.markdown(); EXPECT(actual == expected); } @@ -159,7 +159,7 @@ TEST(DiscreteConditional, markdown) { "|1|2|1|0|\n"; vector names{"C", "B", "A"}; auto formatter = [names](Key key) { return names[key]; }; - string actual = conditional._repr_markdown_(formatter); + string actual = conditional.markdown(formatter); EXPECT(actual == expected); }