From ebd15dbc0e486058f4d97b434c7c672e69c5651a Mon Sep 17 00:00:00 2001
From: Guillaume Bittoun <guillaume.bittoun@gmail.com>
Date: Mon, 19 Jan 2015 21:53:28 +0000
Subject: [PATCH] matrix: LU-decomposition, bug fixes + tests

---
 src/lol/math/matrix.h | 10 ++++-----
 src/t/math/matrix.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/lol/math/matrix.h b/src/lol/math/matrix.h
index 4df85e4f..48afa468 100644
--- a/src/lol/math/matrix.h
+++ b/src/lol/math/matrix.h
@@ -541,17 +541,17 @@ void lu_decomposition(mat_t<T, N, N> const &m, mat_t<T, N, N> & L, mat_t<T, N, N
         {
             T sum = 0;
             for (int k = 0 ; k < min(i, j) ; ++k)
-                sum += L[i][k] * U[k][j];
+                sum += L[k][j] * U[i][k];
 
             if (i < j)
             {
-                L[i][j] = 0;
-                U[i][j] = (m[i][j] - sum) / L[i][i];
+                U[i][j] = 0;
+                L[i][j] = (m[i][j] - sum) / U[i][i];
             }
             else /* if (i >= j) */
             {
-                U[i][j] = i == j ? 1 : 0;
-                L[i][j] = (m[i][j] - sum) / U[j][j];
+                L[i][j] = i == j ? 1 : 0;
+                U[i][j] = (m[i][j] - sum) / L[j][j];
             }
         }
     }
diff --git a/src/t/math/matrix.cpp b/src/t/math/matrix.cpp
index 3733da16..49a471b9 100644
--- a/src/t/math/matrix.cpp
+++ b/src/t/math/matrix.cpp
@@ -107,6 +107,58 @@ lolunit_declare_fixture(MatrixTest)
         lolunit_assert_equal(m2[1][1], 1.0f);
     }
 
+    lolunit_declare_test(LUDecomposition3x3)
+    {
+        mat3 m0 = inv3;
+
+        mat3 L, U;
+
+        lu_decomposition(inv3, L, U);
+
+        mat3 result = L * U;
+
+        for (int i = 0; i < 3; ++i)
+        {
+            for (int j = 0; j < 3; ++j)
+            {
+                if (i > j)
+                    lolunit_assert_equal(L[i][j], 0);
+                else if (i < j)
+                    lolunit_assert_equal(U[i][j], 0);
+                else
+                    lolunit_assert_equal(L[i][j], 1);
+
+                lolunit_assert_equal(result[i][j], inv3[i][j]);
+            }
+        }
+    }
+
+    lolunit_declare_test(LUDecomposition4x4)
+    {
+        mat4 m0 = inv4;
+
+        mat4 L, U;
+
+        lu_decomposition(inv4, L, U);
+
+        mat4 result = L * U;
+
+        for (int i = 0; i < 4; ++i)
+        {
+            for (int j = 0; j < 4; ++j)
+            {
+                if (i > j)
+                    lolunit_assert_equal(L[i][j], 0);
+                else if (i < j)
+                    lolunit_assert_equal(U[i][j], 0);
+                else
+                    lolunit_assert_equal(L[i][j], 1);
+
+                lolunit_assert_equal(result[i][j], inv4[i][j]);
+            }
+        }
+    }
+
     lolunit_declare_test(Inverse3x3)
     {
         mat3 m0 = inv3;