From f5da8522221b6d6e2e5f7de0eeec890f08074a5c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Mon, 31 Jan 2022 12:49:06 -0500
Subject: [PATCH] remove KeyVector

---
 gtsam/gtsam.i                        | 54 ----------------------------
 python/gtsam/preamble/gtsam.h        |  5 ---
 python/gtsam/specializations/gtsam.h |  8 -----
 3 files changed, 67 deletions(-)

diff --git a/gtsam/gtsam.i b/gtsam/gtsam.i
index d4e959c3d..45bd61d0b 100644
--- a/gtsam/gtsam.i
+++ b/gtsam/gtsam.i
@@ -66,27 +66,6 @@ class KeySet {
   void serialize() const;
 };
 
-// Actually a vector<Key>
-class KeyVector {
-  KeyVector();
-  KeyVector(const gtsam::KeyVector& other);
-
-  // Note: no print function
-
-  // common STL methods
-  size_t size() const;
-  bool empty() const;
-  void clear();
-
-  // structure specific methods
-  size_t at(size_t i) const;
-  size_t front() const;
-  size_t back() const;
-  void push_back(size_t key) const;
-
-  void serialize() const;
-};
-
 // Actually a FastMap<Key,int>
 class KeyGroupMap {
   KeyGroupMap();
@@ -104,39 +83,6 @@ class KeyGroupMap {
   bool insert2(size_t key, int val);
 };
 
-// Actually a FastSet<FactorIndex>
-class FactorIndexSet {
-  FactorIndexSet();
-  FactorIndexSet(const gtsam::FactorIndexSet& set);
-
-  // common STL methods
-  size_t size() const;
-  bool empty() const;
-  void clear();
-
-  // structure specific methods
-  void insert(size_t factorIndex);
-  bool erase(size_t factorIndex);        // returns true if value was removed
-  bool count(size_t factorIndex) const;  // returns true if value exists
-};
-
-// Actually a vector<FactorIndex>
-class FactorIndices {
-  FactorIndices();
-  FactorIndices(const gtsam::FactorIndices& other);
-
-  // common STL methods
-  size_t size() const;
-  bool empty() const;
-  void clear();
-
-  // structure specific methods
-  size_t at(size_t i) const;
-  size_t front() const;
-  size_t back() const;
-  void push_back(size_t factorIndex) const;
-};
-
 //*************************************************************************
 // Utilities
 //*************************************************************************
diff --git a/python/gtsam/preamble/gtsam.h b/python/gtsam/preamble/gtsam.h
index ec39c410a..d07a75f6f 100644
--- a/python/gtsam/preamble/gtsam.h
+++ b/python/gtsam/preamble/gtsam.h
@@ -10,8 +10,3 @@
  * Without this they will be automatically converted to a Python object, and all
  * mutations on Python side will not be reflected on C++.
  */
-#ifdef GTSAM_ALLOCATOR_TBB
-PYBIND11_MAKE_OPAQUE(std::vector<gtsam::Key, tbb::tbb_allocator<gtsam::Key>>);
-#else
-PYBIND11_MAKE_OPAQUE(std::vector<gtsam::Key>);
-#endif
diff --git a/python/gtsam/specializations/gtsam.h b/python/gtsam/specializations/gtsam.h
index 490d71902..da8842eaf 100644
--- a/python/gtsam/specializations/gtsam.h
+++ b/python/gtsam/specializations/gtsam.h
@@ -10,11 +10,3 @@
  * with `PYBIND11_MAKE_OPAQUE` this allows the types to be modified with Python,
  * and saves one copy operation.
  */
-
-#ifdef GTSAM_ALLOCATOR_TBB
-py::bind_vector<std::vector<gtsam::Key, tbb::tbb_allocator<gtsam::Key> > >(m_, "KeyVector");
-py::implicitly_convertible<py::list, std::vector<gtsam::Key, tbb::tbb_allocator<gtsam::Key> > >();
-#else
-py::bind_vector<std::vector<gtsam::Key> >(m_, "KeyVector");
-py::implicitly_convertible<py::list, std::vector<gtsam::Key> >();
-#endif