X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Freal.h;h=2be3fdd44bd0e7ca45865c8fd3980595a52564a6;hp=ecd3852c2189bba85de43295ae1d7aab3bdddced;hb=d272af0f7f981cea9d1024b6a730be73dd22276a;hpb=612d71e94fa4a4ca394fb1f566926392e95a2fa8 diff --git a/src/real.h b/src/real.h index ecd3852..2be3fdd 100644 --- a/src/real.h +++ b/src/real.h @@ -2,6 +2,7 @@ #define _REAL_H #include "common.h" +#include #define REAL_SINGLE 0 @@ -40,7 +41,7 @@ namespace IPDF #elif REAL == REAL_LONG_DOUBLE typedef long double Real; #elif REAL == REAL_VFPU - typedef VFPU::Float Real; + typedef VFPU::VFloat Real; inline float Float(const Real & r) {return r.m_value;} inline double Double(const Real & r) {return r.m_value;} #elif REAL == REAL_RATIONAL @@ -67,6 +68,7 @@ namespace IPDF inline double Double(float f) {return (double)f;} inline double Double(double f) {return (double)f;} inline double Double(long double f) {return (double)(f);} + inline double Sqrt(double f) {return sqrt(f);} inline Real Power(const Real & a, int n) { @@ -80,6 +82,32 @@ namespace IPDF return r; } + struct Vec2 + { + Real x; + Real y; + Vec2() : x(0), y(0) {} + Vec2(Real _x, Real _y) : x(_x), y(_y) {} + + bool operator==(const Vec2& other) const { return (x == other.x) && (y == other.y); } + bool operator!=(const Vec2& other) const { return !(*this == other); } + + Vec2& operator=(const Vec2& other) { x = other.x; y = other.y; return *this; } + Vec2& operator+=(const Vec2& other) { x += other.x; y += other.y; return *this; } + Vec2& operator-=(const Vec2& other) { x -= other.x; y -= other.y; return *this; } + Vec2& operator*=(const Real& lambda) { x *= lambda; y *= lambda; return *this; } + Vec2& operator/=(const Real& lambda) { x /= lambda; y /= lambda; return *this; } + + Vec2 operator+(const Vec2& other) const { return Vec2(x + other.x, y + other.y); } + Vec2 operator-(const Vec2& other) const { return Vec2(x - other.x, y - other.y); } + Vec2 operator*(const Real& lambda) const { return Vec2(x * lambda, y * lambda); } + Vec2 operator/(const Real& lambda) const { return Vec2(x / lambda, y / lambda); } + + const Real SquareLength() const { return (x*x + y*y); } + + }; + + } #endif //_REAL_H