From 13dcc977f20bbedea2ca564ed5ee4065e0f2ea41 Mon Sep 17 00:00:00 2001
From: dellaert <dellaert@cc.gatech.edu>
Date: Sun, 3 May 2015 17:31:08 -0700
Subject: [PATCH] Moved Point2Vector wrapper from gtsam_unstable.h to gtsam.h

---
 gtsam.h                                | 26 +++++++++++++++++++++++++
 gtsam/geometry/Point2.h                |  4 +++-
 gtsam_unstable/geometry/SimPolygon2D.h |  1 -
 gtsam_unstable/gtsam_unstable.h        | 27 +-------------------------
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/gtsam.h b/gtsam.h
index 1aee996dc..f6a2ed631 100644
--- a/gtsam.h
+++ b/gtsam.h
@@ -288,6 +288,32 @@ class Point2 {
   void serialize() const;
 };
 
+// std::vector<gtsam::Point2>
+class Point2Vector
+{
+  // Constructors
+  Point2Vector();
+  Point2Vector(const gtsam::Point2Vector& v);
+
+  //Capacity
+  size_t size() const;
+  size_t max_size() const;
+  void resize(size_t sz);
+  size_t capacity() const;
+  bool empty() const;
+  void reserve(size_t n);
+
+  //Element access
+  gtsam::Point2 at(size_t n) const;
+  gtsam::Point2 front() const;
+  gtsam::Point2 back() const;
+
+  //Modifiers
+  void assign(size_t n, const gtsam::Point2& u);
+  void push_back(const gtsam::Point2& x);
+  void pop_back();
+};
+
 class StereoPoint2 {
   // Standard Constructors
   StereoPoint2();
diff --git a/gtsam/geometry/Point2.h b/gtsam/geometry/Point2.h
index b6f1eca4f..5e8b0695c 100644
--- a/gtsam/geometry/Point2.h
+++ b/gtsam/geometry/Point2.h
@@ -192,9 +192,11 @@ private:
   }
 
   /// @}
-
 };
 
+// For MATLAB wrapper
+typedef std::vector<Point2> Point2Vector;
+
 /// multiply with scalar
 inline Point2 operator*(double s, const Point2& p) {return p*s;}
 
diff --git a/gtsam_unstable/geometry/SimPolygon2D.h b/gtsam_unstable/geometry/SimPolygon2D.h
index 02892c519..835bb4083 100644
--- a/gtsam_unstable/geometry/SimPolygon2D.h
+++ b/gtsam_unstable/geometry/SimPolygon2D.h
@@ -128,7 +128,6 @@ public:
 };
 
 typedef std::vector<SimPolygon2D> SimPolygon2DVector;
-typedef std::vector<Point2> Point2Vector;
 
 } //\namespace gtsam
 
diff --git a/gtsam_unstable/gtsam_unstable.h b/gtsam_unstable/gtsam_unstable.h
index 9aa32e1c3..6b57bfcd0 100644
--- a/gtsam_unstable/gtsam_unstable.h
+++ b/gtsam_unstable/gtsam_unstable.h
@@ -8,6 +8,7 @@ class gtsam::Vector6;
 class gtsam::LieScalar;
 class gtsam::LieVector;
 class gtsam::Point2;
+class gtsam::Point2Vector;
 class gtsam::Rot2;
 class gtsam::Pose2;
 class gtsam::Point3;
@@ -159,32 +160,6 @@ class BearingS2 {
   void serializable() const; // enabling serialization functionality
 };
 
-// std::vector<gtsam::Point2>
-class Point2Vector
-{
-  // Constructors
-  Point2Vector();
-  Point2Vector(const gtsam::Point2Vector& v);
-
-  //Capacity
-  size_t size() const;
-  size_t max_size() const;
-  void resize(size_t sz);
-  size_t capacity() const;
-  bool empty() const;
-  void reserve(size_t n);
-
-  //Element access
-  gtsam::Point2 at(size_t n) const;
-  gtsam::Point2 front() const;
-  gtsam::Point2 back() const;
-
-  //Modifiers
-  void assign(size_t n, const gtsam::Point2& u);
-  void push_back(const gtsam::Point2& x);
-  void pop_back();
-};
-
 #include <gtsam_unstable/geometry/SimWall2D.h>
 class SimWall2D {
   SimWall2D();