move discrete serialization tests to common file to remove export key…

… collision
borglab · varunagrawal · Jan 4, 2023 · Jan 3, 2023 · Jan 3, 2023 · Jan 3, 2023
commit 4cb910ce16abff1792c74f54b16f7dfc7b75e808
diff --git a/gtsam/discrete/tests/testDecisionTree.cpp b/gtsam/discrete/tests/testDecisionTree.cpp
@@ -528,35 +528,6 @@ TEST(DecisionTree, ApplyWithAssignment) {
   EXPECT_LONGS_EQUAL(5, count);
 }
 
-/* ****************************************************************************/
-using Tree = gtsam::DecisionTree<string, int>;
-
-BOOST_CLASS_EXPORT_GUID(Tree, "gtsam_DecisionTreeStringInt")
-BOOST_CLASS_EXPORT_GUID(Tree::Leaf, "gtsam_DecisionTree_Leaf")
-BOOST_CLASS_EXPORT_GUID(Tree::Choice, "gtsam_DecisionTree_Choice")
-
-// Test HybridBayesNet serialization.
-TEST(DecisionTree, Serialization) {
-  Tree tree({{"A", 2}}, std::vector<int>{1, 2});
-
-  using namespace serializationTestHelpers;
-
-  // Object roundtrip
-  Tree outputObj = create<Tree>();
-  roundtrip<Tree>(tree, outputObj);
-  EXPECT(tree.equals(outputObj));
-
-  // XML roundtrip
-  Tree outputXml = create<Tree>();
-  roundtripXML<Tree>(tree, outputXml);
-  EXPECT(tree.equals(outputXml));
-
-  // Binary roundtrip
-  Tree outputBinary = create<Tree>();
-  roundtripBinary<Tree>(tree, outputBinary);
-  EXPECT(tree.equals(outputBinary));
-}
-
 /* ************************************************************************* */
 int main() {
   TestResult tr;

diff --git a/gtsam/discrete/tests/testDecisionTreeFactor.cpp b/gtsam/discrete/tests/testDecisionTreeFactor.cpp
@@ -221,30 +221,6 @@ TEST(DecisionTreeFactor, htmlWithValueFormatter) {
   EXPECT(actual == expected);
 }
 
-/* ************************************************************************* */
-BOOST_CLASS_EXPORT_GUID(DecisionTreeFactor, "gtsam_DecisionTreeFactor");
-using ADT = AlgebraicDecisionTree<Key>;
-BOOST_CLASS_EXPORT_GUID(ADT, "gtsam_AlgebraicDecisionTree");
-BOOST_CLASS_EXPORT_GUID(ADT::Leaf, "gtsam_DecisionTree_Leaf")
-BOOST_CLASS_EXPORT_GUID(ADT::Choice, "gtsam_DecisionTree_Choice")
-
-// Check serialization for AlgebraicDecisionTree and the DecisionTreeFactor
-TEST(DecisionTreeFactor, Serialization) {
-  using namespace serializationTestHelpers;
-
-  DiscreteKey A(1, 2), B(2, 2), C(3, 2);
-
-  DecisionTreeFactor::ADT tree(A & B & C, "1 5 3 7 2 6 4 8");
-  EXPECT(equalsObj<ADT>(tree));
-  EXPECT(equalsXML<DecisionTreeFactor::ADT>(tree));
-  EXPECT(equalsBinary<DecisionTreeFactor::ADT>(tree));
-
-  DecisionTreeFactor f(A & B & C, "1 5 3 7 2 6 4 8");
-  EXPECT(equalsObj<DecisionTreeFactor>(f));
-  EXPECT(equalsXML<DecisionTreeFactor>(f));
-  EXPECT(equalsBinary<DecisionTreeFactor>(f));
-}
-
 /* ************************************************************************* */
 int main() {
   TestResult tr;

diff --git a/gtsam/discrete/tests/testDiscreteConditional.cpp b/gtsam/discrete/tests/testDiscreteConditional.cpp
@@ -368,23 +368,6 @@ TEST(DiscreteConditional, html) {
   EXPECT(actual == expected);
 }
 
-/* ************************************************************************* */
-using ADT = AlgebraicDecisionTree<Key>;
-BOOST_CLASS_EXPORT_GUID(ADT::Leaf, "gtsam_ADT_Leaf")
-BOOST_CLASS_EXPORT_GUID(ADT::Choice, "gtsam_ADT_Choice")
-
-// Check serialization for DiscreteConditional
-TEST(DiscreteConditional, Serialization) {
-  using namespace serializationTestHelpers;
-
-  DiscreteKey A(Symbol('x', 1), 3);
-  DiscreteConditional conditional(A % "1/2/2");
-
-  EXPECT(equalsObj<DiscreteConditional>(conditional));
-  EXPECT(equalsXML<DiscreteConditional>(conditional));
-  EXPECT(equalsBinary<DiscreteConditional>(conditional));
-}
-
 /* ************************************************************************* */
 int main() {
   TestResult tr;

diff --git a/gtsam/discrete/tests/testSerializationDiscrete.cpp b/gtsam/discrete/tests/testSerializationDiscrete.cpp
@@ -0,0 +1,105 @@
+/* ----------------------------------------------------------------------------
+
+ * GTSAM Copyright 2010, Georgia Tech Research Corporation,
+ * Atlanta, Georgia 30332-0415
+ * All Rights Reserved
+ * Authors: Frank Dellaert, et al. (see THANKS for the full author list)
+
+ * See LICENSE for the license information
+
+ * -------------------------------------------------------------------------- */
+
+/*
+ * testSerializtionDiscrete.cpp
+ *
+ *  @date January 2023
+ *  @author Varun Agrawal
+ */
+
+#include <CppUnitLite/TestHarness.h>
+#include <gtsam/base/serializationTestHelpers.h>
+#include <gtsam/discrete/DecisionTreeFactor.h>
+#include <gtsam/discrete/DiscreteDistribution.h>
+#include <gtsam/inference/Symbol.h>
+
+using namespace std;
+using namespace gtsam;
+
+using Tree = gtsam::DecisionTree<string, int>;
+
+BOOST_CLASS_EXPORT_GUID(Tree, "gtsam_DecisionTreeStringInt")
+BOOST_CLASS_EXPORT_GUID(Tree::Leaf, "gtsam_DecisionTreeStringInt_Leaf")
+BOOST_CLASS_EXPORT_GUID(Tree::Choice, "gtsam_DecisionTreeStringInt_Choice")
+
+BOOST_CLASS_EXPORT_GUID(DecisionTreeFactor, "gtsam_DecisionTreeFactor");
+
+using ADT = AlgebraicDecisionTree<Key>;
+BOOST_CLASS_EXPORT_GUID(ADT, "gtsam_AlgebraicDecisionTree");
+BOOST_CLASS_EXPORT_GUID(ADT::Leaf, "gtsam_AlgebraicDecisionTree_Leaf")
+BOOST_CLASS_EXPORT_GUID(ADT::Choice, "gtsam_AlgebraicDecisionTree_Choice")
+
+/* ****************************************************************************/
+// Test DecisionTree serialization.
+TEST(DiscreteSerialization, DecisionTree) {
+  Tree tree({{"A", 2}}, std::vector<int>{1, 2});
+
+  using namespace serializationTestHelpers;
+
+  // Object roundtrip
+  Tree outputObj = create<Tree>();
+  roundtrip<Tree>(tree, outputObj);
+  EXPECT(tree.equals(outputObj));
+
+  // XML roundtrip
+  Tree outputXml = create<Tree>();
+  roundtripXML<Tree>(tree, outputXml);
+  EXPECT(tree.equals(outputXml));
+
+  // Binary roundtrip
+  Tree outputBinary = create<Tree>();
+  roundtripBinary<Tree>(tree, outputBinary);
+  EXPECT(tree.equals(outputBinary));
+}
+
+/* ************************************************************************* */
+// Check serialization for AlgebraicDecisionTree and the DecisionTreeFactor
+TEST(DiscreteSerialization, DecisionTreeFactor) {
+  using namespace serializationTestHelpers;
+
+  DiscreteKey A(1, 2), B(2, 2), C(3, 2);
+
+  DecisionTreeFactor::ADT tree(A & B & C, "1 5 3 7 2 6 4 8");
+  EXPECT(equalsObj<DecisionTreeFactor::ADT>(tree));
+  EXPECT(equalsXML<DecisionTreeFactor::ADT>(tree));
+  EXPECT(equalsBinary<DecisionTreeFactor::ADT>(tree));
+
+  DecisionTreeFactor f(A & B & C, "1 5 3 7 2 6 4 8");
+  EXPECT(equalsObj<DecisionTreeFactor>(f));
+  EXPECT(equalsXML<DecisionTreeFactor>(f));
+  EXPECT(equalsBinary<DecisionTreeFactor>(f));
+}
+
+/* ************************************************************************* */
+// Check serialization for DiscreteConditional & DiscreteDistribution
+TEST(DiscreteSerialization, DiscreteConditional) {
+  using namespace serializationTestHelpers;
+
+  DiscreteKey A(Symbol('x', 1), 3);
+  DiscreteConditional conditional(A % "1/2/2");
+
+  EXPECT(equalsObj<DiscreteConditional>(conditional));
+  EXPECT(equalsXML<DiscreteConditional>(conditional));
+  EXPECT(equalsBinary<DiscreteConditional>(conditional));
+
+  DiscreteDistribution P(A % "3/2/1");
+  EXPECT(equalsObj<DiscreteDistribution>(P));
+  EXPECT(equalsXML<DiscreteDistribution>(P));
+  EXPECT(equalsBinary<DiscreteDistribution>(P));
+}
+
+/* ************************************************************************* */
+int main() {
+  TestResult tr;
+  return TestRegistry::runAllTests(tr);
+}
+/* ************************************************************************* */