X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flinal%2Fvector.h;h=610ac2103a21ab83e0b58f88905e6d07c6962d2d;hb=291c11cf66e7083dc21fffea1afbdeaaad96077d;hp=11292f7441dae7e7f69cefb58aadb73572f687e4;hpb=aa47cdf95914ae706b99a48d528260b3261f9882;p=libs%2Fmath.git

diff --git a/source/linal/vector.h b/source/linal/vector.h
index 11292f7..610ac21 100644
--- a/source/linal/vector.h
+++ b/source/linal/vector.h
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <ostream>
 
 namespace Msp {
 namespace LinAl {
@@ -53,6 +54,20 @@ public:
 	const T &operator[](unsigned i) const { return *(&x+i); }
 };
 
+template<typename T>
+class VectorComponents<T, 4>
+{
+public:
+	T x, y, z, w;
+
+protected:
+	VectorComponents() { }
+
+public:
+	T &operator[](unsigned i) { return *(&x+i); }
+	const T &operator[](unsigned i) const { return *(&x+i); }
+};
+
 /**
 A general mathematical vector.
 */
@@ -60,13 +75,26 @@ template<typename T, unsigned N>
 class Vector: public VectorComponents<T, N>
 {
 public:
+	typedef T ElementType;
+
 	Vector();
 	Vector(const T *);
-	Vector(T, T);
-	Vector(T, T, T);
+
+	/** Constructs a vector from an array of interleaved values.  Intended for
+	use by Matrix row accessor. */
+	Vector(const T *, unsigned);
+
+	template<typename... Args>
+	Vector(T, Args...);
+
 	template<typename U>
 	Vector(const Vector<U, N> &);
 
+	unsigned size() const { return N; }
+
+	template<unsigned M>
+	Vector<T, M> slice(unsigned) const;
+
 	Vector &operator*=(T);
 	Vector &operator/=(T);
 	Vector &operator+=(const Vector &);
@@ -91,21 +119,22 @@ inline Vector<T, N>::Vector(const T *d)
 		(*this)[i] = d[i];
 }
 
-/* The compiler won't instantiate these unless they are used.  Trying to use
-them on the wrong class results in an error. */
 template<typename T, unsigned N>
-inline Vector<T, N>::Vector(T x_, T y_)
+inline Vector<T, N>::Vector(const T *d, unsigned stride)
 {
-	this->VectorComponents<T, 2>::x = x_;
-	this->VectorComponents<T, 2>::y = y_;
+	for(unsigned i=0; i<N; ++i)
+		(*this)[i] = d[i*stride];
 }
 
 template<typename T, unsigned N>
-inline Vector<T, N>::Vector(T x_, T y_, T z_)
+template<typename... Args>
+inline Vector<T, N>::Vector(T x_, Args... v)
 {
-	this->VectorComponents<T, 3>::x = x_;
-	this->VectorComponents<T, 3>::y = y_;
-	this->VectorComponents<T, 3>::z = z_;
+	static_assert(1+sizeof...(v)==N, "Incorrect number of arguments in Vector constructor");
+	(*this)[0] = x_;
+	unsigned i = 1;
+	for(auto c: std::initializer_list<T> { static_cast<T>(v)... })
+		(*this)[i++] = c;
 }
 
 template<typename T, unsigned N>
@@ -116,6 +145,47 @@ inline Vector<T, N>::Vector(const Vector<U, N> &v)
 		(*this)[i] = v[i];
 }
 
+template<typename T, unsigned N>
+inline Vector<T, N+1> compose(const Vector<T, N> &v, T s)
+{
+	Vector<T, N+1> r;
+	for(unsigned i=0; i<N; ++i)
+		r[i] = v[i];
+	r[N] = s;
+	return r;
+}
+
+template<typename T, unsigned N>
+inline Vector<T, N+1> compose(T s, const Vector<T, N> &v)
+{
+	Vector<T, N+1> r;
+	r[0] = s;
+	for(unsigned i=0; i<N; ++i)
+		r[i+1] = v[i];
+	return r;
+}
+
+template<typename T, unsigned N, unsigned M>
+inline Vector<T, N+M> compose(const Vector<T, N> &v1, const Vector<T, M> &v2)
+{
+	Vector<T, N+M> r;
+	for(unsigned i=0; i<N; ++i)
+		r[i] = v1[i];
+	for(unsigned i=0; i<M; ++i)
+		r[N+i] = v2[i];
+	return r;
+}
+
+template<typename T, unsigned N>
+template<unsigned M>
+inline Vector<T, M> Vector<T, N>::slice(unsigned j) const
+{
+	Vector<T, M> r;
+	for(unsigned i=0; i<M; ++i)
+		r[i] = (*this)[j+i];
+	return r;
+}
+
 template<typename T, unsigned N>
 inline Vector<T, N> &Vector<T, N>::operator*=(T s)
 {
@@ -212,6 +282,7 @@ inline T inner_product(const Vector<T, N> &v1, const Vector<T, N> &v2)
 template<typename T, unsigned N>
 inline T Vector<T, N>::norm() const
 {
+	using std::sqrt;
 	return sqrt(inner_product(*this, *this));
 }
 
@@ -240,6 +311,20 @@ inline Vector<T, 3> cross(const Vector<T, 3> &v1, const Vector<T, 3> &v2)
 	return Vector<T, 3>(v1.y*v2.z-v1.z*v2.y, v1.z*v2.x-v1.x*v2.z, v1.x*v2.y-v1.y*v2.x);
 }
 
+template<typename T, unsigned N>
+inline std::ostream &operator<<(std::ostream &s, const Vector<T, N> &v)
+{
+	s << "Vector" << N << '(';
+	for(unsigned i=0; i<N; ++i)
+	{
+		if(i)
+			s << ", ";
+		s << v[i];
+	}
+	s << ')';
+	return s;
+}
+
 } // namespace LinAl
 } // namespace Msp