From 9cc47a05bd758bb27d09c7142a48f92104cb5297 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Tue, 18 Feb 2014 15:28:28 +1100
Subject: [PATCH] Add point::redim implementation

---
 Makefile.am      |  1 +
 point.hpp        |  6 +++---
 point.ipp        | 30 ++++++++++++++++++++++++++++++
 test/Makefile.am |  1 +
 test/point.cpp   | 16 ++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 point.ipp
 create mode 100644 test/point.cpp

diff --git a/Makefile.am b/Makefile.am
index 9a28af1f..b6a93ea6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ UTIL_FILES   =		\
     platform.hpp	\
     point.cpp		\
     point.hpp		\
+    point.ipp		\
     pool.cpp		\
     pool.hpp		\
     pool.ipp		\
diff --git a/point.hpp b/point.hpp
index e16399f6..e3e4d5e0 100644
--- a/point.hpp
+++ b/point.hpp
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with libgim.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Copyright 2011 Danny Robson <danny@nerdcruft.net>
+ * Copyright 2011-14 Danny Robson <danny@nerdcruft.net>
  */
 
 #ifndef __UTIL_POINT_HPP
@@ -53,7 +53,7 @@ namespace util {
 
         util::vector<S> to (const point<S>&) const;
 
-        template <size_t D> point<D> redim (void);
+        template <size_t D> point<D> redim (void) const;
 
         void sanity (void) const;
     };
@@ -68,6 +68,6 @@ namespace util {
     std::ostream& operator<< (std::ostream&, const util::point<S>&);
 }
 
-
+#include "point.ipp"
 
 #endif // __UTIL_POINT_HPP
diff --git a/point.ipp b/point.ipp
new file mode 100644
index 00000000..9ff1a486
--- /dev/null
+++ b/point.ipp
@@ -0,0 +1,30 @@
+/*
+ * This file is part of libgim.
+ *
+ * libgim is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * 
+ * libgim is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with libgim.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2014 Danny Robson <danny@nerdcruft.net>
+ */
+
+#include <algorithm>
+
+namespace util {
+    template<size_t S>
+    template<size_t D>
+    point<D> point<S>::redim (void) const {
+        point<D> out;
+        std::copy (std::begin (this->data), std::begin (this->data) + D, std::begin (out.data));
+        return out;
+    }
+}
diff --git a/test/Makefile.am b/test/Makefile.am
index 3ef75622..fc8a6937 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -15,6 +15,7 @@ TEST_BIN = 		\
 	md4		\
 	md5		\
 	options		\
+	point		\
 	pool		\
 	rand		\
 	range 		\
diff --git a/test/point.cpp b/test/point.cpp
new file mode 100644
index 00000000..e995d8cf
--- /dev/null
+++ b/test/point.cpp
@@ -0,0 +1,16 @@
+
+#include "point.hpp"
+
+#include "debug.hpp"
+#include "types.hpp"
+
+using namespace util;
+
+int
+main (int, char**) {
+    const point<3> p(0.0, 1.0, 2.0);
+    const point<2> q = p.redim<2> ();
+
+    CHECK_EQ (q.data[0], p.data[0]);
+    CHECK_EQ (q.data[1], p.data[1]);
+}