|
|
|
|
/*
|
|
|
|
|
This file is part of Magnum.
|
|
|
|
|
|
|
|
|
|
Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš <mosra@centrum.cz>
|
|
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
|
copy of this software and associated documentation files (the "Software"),
|
|
|
|
|
to deal in the Software without restriction, including without limitation
|
|
|
|
|
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
|
and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
|
Software is furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included
|
|
|
|
|
in all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
|
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
|
|
|
DEALINGS IN THE SOFTWARE.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <TestSuite/Tester.h>
|
|
|
|
|
|
|
|
|
|
#include "Math/Algorithms/GaussJordan.h"
|
|
|
|
|
|
|
|
|
|
namespace Magnum { namespace Math { namespace Algorithms { namespace Test {
|
|
|
|
|
|
|
|
|
|
class GaussJordanTest: public Corrade::TestSuite::Tester {
|
|
|
|
|
public:
|
|
|
|
|
explicit GaussJordanTest();
|
|
|
|
|
|
|
|
|
|
void singular();
|
|
|
|
|
void invert();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef RectangularMatrix<4, 4, Float> Matrix4;
|
|
|
|
|
typedef Vector<4, Float> Vector4;
|
|
|
|
|
|
|
|
|
|
GaussJordanTest::GaussJordanTest() {
|
|
|
|
|
addTests({&GaussJordanTest::singular,
|
|
|
|
|
&GaussJordanTest::invert});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void GaussJordanTest::singular() {
|
Math: matrix/vector rework, part 2: matrix as array of column vectors.
Overall architecture is simplififed with this change and also it's not
needed to use reinterpret_cast in matrix internals anymore, thus there
is no need for operator() and [][] works now always as expected without
any risk of GCC misoptimizations.
On the other side, constructing matrix from list of elements is not
possible anymore. You have to specify the elements as list of
column vectors, which might be less convenient to write, but it helps to
distinguish what is column and what is row:
Matrix<2, int> a(1, 2, // before
3, 4);
Matrix<2, int> a(Vector<2, int>(1, 2), // now
Vector<2, int>(3, 4));
For some matrix specializations (i.e. Matrix3 and Matrix4) it is
possible to use list-initialization instead of explicit type
specification:
Matrix<3, int>({1, 2, 3},
{4, 5, 6},
{7, 8, 9});
I didn't yet figure out how to properly implement the general
(constexpr) constructor to also take lists, so it's a bit ugly for now.
Matrix operations are now done column-wise, which should help with
future SIMD implementations, documentation is also updated accordingly.
I also removed forgotten remains of matrix/matrix operator*=(), which
can be confusing, as the multiplication is not commutative. Why it is
not present is explained in d9c900f076f2f87c7b7ba3f37a3179c0c0e4a02c.
13 years ago
|
|
|
Matrix4 a(Vector4(1.0f, 2.0f, 3.0f, 4.0f),
|
|
|
|
|
Vector4(2.0f, 3.0f, -7.0f, 11.0f),
|
|
|
|
|
Vector4(2.0f, 4.0f, 6.0f, 8.0f),
|
|
|
|
|
Vector4(1.0f, 2.0f, 7.0f, 40.0f));
|
|
|
|
|
RectangularMatrix<4, 1, Float> t;
|
|
|
|
|
|
|
|
|
|
CORRADE_VERIFY(!gaussJordanInPlaceTransposed(a, t));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void GaussJordanTest::invert() {
|
Math: matrix/vector rework, part 2: matrix as array of column vectors.
Overall architecture is simplififed with this change and also it's not
needed to use reinterpret_cast in matrix internals anymore, thus there
is no need for operator() and [][] works now always as expected without
any risk of GCC misoptimizations.
On the other side, constructing matrix from list of elements is not
possible anymore. You have to specify the elements as list of
column vectors, which might be less convenient to write, but it helps to
distinguish what is column and what is row:
Matrix<2, int> a(1, 2, // before
3, 4);
Matrix<2, int> a(Vector<2, int>(1, 2), // now
Vector<2, int>(3, 4));
For some matrix specializations (i.e. Matrix3 and Matrix4) it is
possible to use list-initialization instead of explicit type
specification:
Matrix<3, int>({1, 2, 3},
{4, 5, 6},
{7, 8, 9});
I didn't yet figure out how to properly implement the general
(constexpr) constructor to also take lists, so it's a bit ugly for now.
Matrix operations are now done column-wise, which should help with
future SIMD implementations, documentation is also updated accordingly.
I also removed forgotten remains of matrix/matrix operator*=(), which
can be confusing, as the multiplication is not commutative. Why it is
not present is explained in d9c900f076f2f87c7b7ba3f37a3179c0c0e4a02c.
13 years ago
|
|
|
Matrix4 a(Vector4(3.0f, 5.0f, 8.0f, 4.0f),
|
|
|
|
|
Vector4(4.0f, 4.0f, 7.0f, 3.0f),
|
|
|
|
|
Vector4(7.0f, -1.0f, 8.0f, 0.0f),
|
|
|
|
|
Vector4(9.0f, 4.0f, 5.0f, 9.0f));
|
|
|
|
|
|
|
|
|
|
Matrix4 expectedInverse(Vector4(-60/103.0f, 71/103.0f, -4/103.0f, 3/103.0f),
|
|
|
|
|
Vector4(-66/103.0f, 109/103.0f, -25/103.0f, -7/103.0f),
|
|
|
|
|
Vector4(177/412.0f, -97/206.0f, 53/412.0f, -7/206.0f),
|
|
|
|
|
Vector4(259/412.0f, -185/206.0f, 31/412.0f, 27/206.0f));
|
|
|
|
|
|
|
|
|
|
Matrix4 a2(a);
|
|
|
|
|
Matrix4 inverse = Matrix4::fromDiagonal(Vector4(1.0f));
|
|
|
|
|
CORRADE_VERIFY(gaussJordanInPlace(a2, inverse));
|
|
|
|
|
|
|
|
|
|
CORRADE_COMPARE(inverse, expectedInverse);
|
|
|
|
|
CORRADE_COMPARE(a*inverse, Matrix4::fromDiagonal(Vector4(1.0f)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}}}}
|
|
|
|
|
|
|
|
|
|
CORRADE_TEST_MAIN(Magnum::Math::Algorithms::Test::GaussJordanTest)
|