From 158a620eba4e4cb4eff5a3bb1d773c4c59d4ac63 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Thu, 19 Aug 2021 19:34:58 -0400
Subject: [PATCH] small wrapper updates

---
 gtsam/base/base.i           | 21 +++++++--------------
 gtsam/nonlinear/nonlinear.i |  4 ++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/gtsam/base/base.i b/gtsam/base/base.i
index c24b04088..d9c51fbe8 100644
--- a/gtsam/base/base.i
+++ b/gtsam/base/base.i
@@ -33,13 +33,13 @@ class IndexPair {
   size_t j() const;
 };
 
-// template<KEY = {gtsam::IndexPair}>
-// class DSFMap {
-//   DSFMap();
-//   KEY find(const KEY& key) const;
-//   void merge(const KEY& x, const KEY& y);
-//   std::map<KEY, Set> sets();
-// };
+template<KEY = {gtsam::IndexPair}>
+class DSFMap {
+  DSFMap();
+  KEY find(const KEY& key) const;
+  void merge(const KEY& x, const KEY& y);
+  std::map<KEY, Set> sets();
+};
 
 class IndexPairSet {
   IndexPairSet();
@@ -81,13 +81,6 @@ class IndexPairSetMap {
   gtsam::IndexPairSet at(gtsam::IndexPair& key);
 };
 
-class DSFMapIndexPair {
-  DSFMapIndexPair();
-  gtsam::IndexPair find(const gtsam::IndexPair& key) const;
-  void merge(const gtsam::IndexPair& x, const gtsam::IndexPair& y);
-  gtsam::IndexPairSetMap sets();
-};
-
 #include <gtsam/base/Matrix.h>
 bool linear_independent(Matrix A, Matrix B, double tol);
 
diff --git a/gtsam/nonlinear/nonlinear.i b/gtsam/nonlinear/nonlinear.i
index 73eaef125..91525c5fd 100644
--- a/gtsam/nonlinear/nonlinear.i
+++ b/gtsam/nonlinear/nonlinear.i
@@ -572,8 +572,8 @@ virtual class GncOptimizer {
   gtsam::Values optimize();
 };
 
-typedef gtsam::GncOptimizer<gtsam::GncParams<gtsam::GaussNewtonParams> > GncGaussNewtonOptimizer;
-typedef gtsam::GncOptimizer<gtsam::GncParams<gtsam::LevenbergMarquardtParams> > GncLMOptimizer;
+typedef gtsam::GncOptimizer<gtsam::GncParams<gtsam::GaussNewtonParams>> GncGaussNewtonOptimizer;
+typedef gtsam::GncOptimizer<gtsam::GncParams<gtsam::LevenbergMarquardtParams>> GncLMOptimizer;
 
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 virtual class LevenbergMarquardtOptimizer : gtsam::NonlinearOptimizer {