Changeset 1052Tweet

Timestamp:

Nov 7, 2011, 1:36:25 AM (11 years ago)

Author:

sam

Message:

core: implement complex numbers and add unit tests for these.

Location:

trunk

Files:

• src/matrix.cpp (modified) (3 diffs)
• src/matrix.h (modified) (4 diffs)
• test/Makefile.am (modified) (1 diff)
• test/unit/cmplx.cpp (added)

trunk/src/matrix.cpp

@@ -108 +108 @@
 }
 
+template<> void cmplx::printf() const
+{
+    Log::Debug("[ %6.6f %6.6f ]\n", x, y);
+}
+
 template<> void vec3::printf() const
 {
@@ -153 +158 @@
 }
 
+template<> std::ostream &operator<<(std::ostream &stream, icmplx const &v)
+{
+    return stream << "(" << v.x << ", " << v.y << ")";
+}
+
 template<> std::ostream &operator<<(std::ostream &stream, ivec3 const &v)
 {
@@ -171 +181 @@
 
 template<> std::ostream &operator<<(std::ostream &stream, vec2 const &v)
+{
+    return stream << "(" << v.x << ", " << v.y << ")";
+}
+
+template<> std::ostream &operator<<(std::ostream &stream, cmplx const &v)
 {
     return stream << "(" << v.x << ", " << v.y << ")";

trunk/src/matrix.h

@@ -39 +39 @@
 
 VECTOR_TYPES(Vec2, vec2)
+VECTOR_TYPES(Cmplx, cmplx)
 VECTOR_TYPES(Vec3, vec3)
 VECTOR_TYPES(Vec4, vec4)
@@ -117 +118 @@
     \
     void printf() const;
+
+#define COMPLEX_OPS() \
+    inline type_t operator *(type_t const &val) const \
+    { \
+        return type_t(x * val.x - y * val.y, x * val.y + y * val.x); \
+    } \
+    \
+    inline type_t operator *=(type_t const &val) \
+    { \
+        return *this = (*this) * val; \
+    } \
+    \
+    inline type_t operator ~() const \
+    { \
+        return type_t(x, -y); \
+    } \
+    \
+    inline T norm() const { return len(); }
 
 #define QUATERNION_OPS() \
@@ -259 +278 @@
 
 /*
+ * 2-element complexes
+ */
+
+template <typename T> struct Cmplx
+{
+    typedef Cmplx<T> type_t;
+
+    inline Cmplx() { }
+    inline Cmplx(T val) : x(val), y(0) { }
+    inline Cmplx(T _x, T _y) : x(_x), y(_y) { }
+
+    LINEAR_OPS()
+    COMPLEX_OPS()
+
+#if !defined __ANDROID__
+    template<typename U>
+    friend std::ostream &operator<<(std::ostream &stream, Cmplx<U> const &v);
+#endif
+
+    T x, y;
+};
+
+template<typename T>
+static inline Cmplx<T> re(Cmplx<T> const &val)
+{
+    return ~val / val.sqlen();
+}
+
+template<typename T>
+static inline Cmplx<T> operator /(T x, Cmplx<T> const &y)
+{
+    return x * re(y);
+}
+
+template<typename T>
+static inline Cmplx<T> operator /(Cmplx<T> x, Cmplx<T> const &y)
+{
+    return x * re(y);
+}
+
+/*
  * 3-element vectors
  */
@@ -400 +460 @@
 
 GLOBALS(Vec2)
+GLOBALS(Cmplx)
 GLOBALS(Vec3)
 GLOBALS(Vec4)

trunk/test/Makefile.am

@@ -25 +25 @@
 testsuite_SOURCES = testsuite.cpp \
     unit/matrix.cpp unit/half.cpp unit/trig.cpp unit/build.cpp \
-    unit/real.cpp unit/image.cpp unit/quat.cpp
+    unit/real.cpp unit/image.cpp unit/quat.cpp unit/cmplx.cpp
 testsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
 testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@