nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

Add scalar operator overloads for vector

Browse Source
This commit is contained in:
Danny Robson 2012-05-22 14:13:34 +10:00
parent db6c603517
commit c9242467d8
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
vector.cpp
View File

@ -21,6 +21,7 @@
#include "debug.hpp" #include "debug.hpp"
#include "maths.hpp" #include "maths.hpp"
#include "random.hpp"
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
@ -38,16 +39,6 @@ util::vector<S>::vector ()
{ ; } { ; }
//template <size_t S>
//util::vector<S>::vector (const std::initializer_list<double> &_data) {
// CHECK (_data.size () == S);
//
// std::copy (std::begin (_data),
// std::end (_data),
// std::begin (this->data));
//}
template <size_t S> template <size_t S>
util::vector<S> util::vector<S>
util::vector<S>::operator* (double rhs) const { util::vector<S>::operator* (double rhs) const {
@ -132,6 +123,27 @@ util::vector<S>::operator-= (const util::vector<S> &rhs) {
} }
template <size_t S>
util::vector<S>
util::vector<S>::operator- (double rhs) const {
util::vector<S> out;
for (size_t i = 0; i < S; ++i)
out.data[i] = this->data[i] - rhs;
return out;
}
template <size_t S>
util::vector<S>&
util::vector<S>::operator-= (double rhs) {
for (size_t i = 0; i < S; ++i)
this->data[i] -= rhs;
return *this;
}
template <size_t S> template <size_t S>
util::vector<S>& util::vector<S>&
util::vector<S>::operator+= (const util::vector<S> &rhs) { util::vector<S>::operator+= (const util::vector<S> &rhs) {
@ -184,7 +196,7 @@ double
util::vector<S>::dot (const util::vector<S> &rhs) const { util::vector<S>::dot (const util::vector<S> &rhs) const {
double total = 0.0; double total = 0.0;
for (size_t i = 0; i < S; ++i) for (size_t i = 0; i < S; ++i)
total += this->data[i] + rhs.data[i]; total += this->data[i] * rhs.data[i];
return total; return total;
} }
@ -314,3 +326,11 @@ template const json::node& util::operator>> (const json::node&, util::vector<3>&
template struct util::vector<1>; template struct util::vector<1>;
template struct util::vector<2>; template struct util::vector<2>;
template struct util::vector<3>; template struct util::vector<3>;
namespace util {
template <> vector<1> random (void) { util::vector<1> out; randomise (out.data); return out; }
template <> vector<2> random (void) { util::vector<2> out; randomise (out.data); return out; }
template <> vector<3> random (void) { util::vector<3> out; randomise (out.data); return out; }
}

11
vector.hpp
View File

@ -39,6 +39,17 @@ namespace util {
util::vector<S> operator* (double) const; util::vector<S> operator* (double) const;
util::vector<S>& operator*=(double); util::vector<S>& operator*=(double);
util::vector<S> operator/ (double) const;
util::vector<S>& operator/=(double);
util::vector<S> operator+ (double) const;
util::vector<S>& operator+=(double);
util::vector<S> operator- (double) const;
util::vector<S>& operator-=(double);
util::vector<S> operator* (const util::vector<S>&) const; util::vector<S> operator* (const util::vector<S>&) const;
util::vector<S>& operator*=(const util::vector<S>&); util::vector<S>& operator*=(const util::vector<S>&);