--- trunk/OOPSE-3.0/test/math/RectMatrixTestCase.cpp	2004/10/13 22:27:58	1565
+++ trunk/OOPSE-3.0/test/math/RectMatrixTestCase.cpp	2004/12/01 19:10:51	1816
@@ -55,7 +55,96 @@ void RectMatrixTestCase::setUp(){
     b(2, 0) = 0.0;
     b(2, 1) = 0.0;
 
-    
+    c(0, 0) = 1.0;
+    c(0, 1) = 0.0;
+    c(1, 0) = 0.0;
+    c(1, 1) = 1.0;       
+
+    d(0, 0) = 1.0;
+    d(0, 1) = 0.0;
+    d(0, 2) = 0.0;
+    d(1, 0) = 0.0;
+    d(1, 1) = 0.0;
+    d(1, 2) = 1.0;    
+    d(2, 0) = 0.0;
+    d(2, 1) = 1.0;
+    d(2, 2) = 0.0;  
+
+    e(0, 0) = 2.0;
+    e(0, 1) = 4.0;
+    e(0, 2) = 1.0;
+    e(1, 0) = 0.0;
+    e(1, 1) = 0.0;
+    e(1, 2) = 3.0;    
+    e(2, 0) = 0.0;
+    e(2, 1) = 6.0;
+    e(2, 2) = 5.0;  
+
+    f(0, 0) = 2.0;
+    f(0, 1) = 4.0;
+    f(0, 2) = 1.0;
+    f(1, 0) = 0.0;
+    f(1, 1) = 6.0;
+    f(1, 2) = 5.0;    
+    f(2, 0) = 0.0;
+    f(2, 1) = 0.0;
+    f(2, 2) = 3.0;  
+
+    f(0, 0) = 2.0;
+    f(0, 1) = 4.0;
+    f(0, 2) = 1.0;
+    f(1, 0) = 0.0;
+    f(1, 1) = 6.0;
+    f(1, 2) = 5.0;    
+    f(2, 0) = 0.0;
+    f(2, 1) = 0.0;
+    f(2, 2) = 3.0;  
+
+    g(0, 0) = 1.0;
+    g(0, 1) = 0.0;
+    g(0, 2) = 0.0;
+    g(1, 0) = -2.0;
+    g(1, 1) = 1.0;
+    g(1, 2) = 0.0;    
+    g(2, 0) = 0.0;
+    g(2, 1) = 0.0;
+    g(2, 2) = 1.0;  
+
+    h(0, 0) = 2.0;
+    h(0, 1) = 4.0;
+    h(0, 2) = -2.0;
+    h(0, 3) = 2.0;
+    h(1, 0) = 4.0;
+    h(1, 1) = 9.0;
+    h(1, 2) = -3.0;
+    h(1, 3) = 8.0;
+    h(2, 0) = -2.0;
+    h(2, 1) = -3.0;
+    h(2, 2) = 7.0;
+    h(2, 3) = 10.0;
+
+    i(0, 0) = 2.0;
+    i(0, 1) = 4.0;
+    i(0, 2) = -2.0;
+    i(0, 3) = 2.0;
+    i(1, 0) = 0.0;
+    i(1, 1) = 1.0;
+    i(1, 2) = 1.0;
+    i(1, 3) = 4.0;
+    i(2, 0) = -2.0;
+    i(2, 1) = -3.0;
+    i(2, 2) = 7.0;
+    i(2, 3) = 10.0;    
+
+
+    v1(0) = 2.0;
+    v1(1) = 4.0;
+    v1(2) = -2.0;
+
+    v2(0) = 2.0;
+    v2(1) = 0.0;
+    v2(2) = -2.0;
+
 }
 
 void RectMatrixTestCase::testConstructor(){
@@ -77,11 +166,22 @@ void RectMatrixTestCase::testConstructor(){
     tmp4 = tmp4;
     CPPUNIT_ASSERT(tmp4 == m2);
     
+    double tmp5[4];
+    tmp5[0] = 1.0;
+    tmp5[1] = 1.0;
+    tmp5[2] = 3.0;
+    tmp5[3] = 1.0; 
+
+    RMat2x2 tmp6(tmp5);
+    CPPUNIT_ASSERT(tmp6 == m1);
+   
     
 }
 
 void RectMatrixTestCase::testEqual() {
     CPPUNIT_ASSERT(m2 == m3);
+    CPPUNIT_ASSERT(m2 != m3);
+    
 }
 
 void RectMatrixTestCase::testNegate() {
@@ -129,7 +229,15 @@ void RectMatrixTestCase::testMul() {
     CPPUNIT_ASSERT(m1 * 1.0 == m1);
     CPPUNIT_ASSERT(m1 * 0.0 == zero);
     CPPUNIT_ASSERT(2.0 *m1 == m1 + m1);
-    
+
+    //test matrix multiplication
+    CPPUNIT_ASSERT(a * b == c);
+    CPPUNIT_ASSERT(d  * e == f);
+    CPPUNIT_ASSERT(g  * h == i);
+
+    //test matrix vector multiplication
+    CPPUNIT_ASSERT(g  * v1 == v2);
+
 }
 
 void RectMatrixTestCase::testDiv() {
@@ -138,15 +246,112 @@ void RectMatrixTestCase::testDiv() {
 
     CPPUNIT_ASSERT(m1 / 2.0 * 2.0 == m1);
 
+
 }
 
 void RectMatrixTestCase::testAccessEntries(){
-    CPPUNIT_ASSERT(m1(1, 0) == 3.0);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(m1(1, 0), 3.0, oopse::epsilon);
 }
 
-void RectMatrixTestCase::testTranspose(){
+void RectMatrixTestCase::testRowColOperations() {
+    Vec3 row;
+    Vec3 col;
+    RMat3x3 m;
+    
+    //test getRow
+    row = e.getRow(0);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(row[0], 2.0, oopse::epsilon);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(row[1], 4.0, oopse::epsilon);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(row[2], 1.0, oopse::epsilon);
+    //test setRow
+    row[0] = 2.0;    
+    row[1] = 4.0;    
+    row[2] = 1.0;    
+    m.setRow(0, row);
+    row[0] = 0.0;    
+    row[1] = 0.0;    
+    row[2] = 3.0;    
+    m.setRow(1, row);
+    row[0] = 0.0;    
+    row[1] = 6.0;    
+    row[2] = 5.0;    
+    m.setRow(2, row);
+    CPPUNIT_ASSERT(m == e);
+    
+    //test getCol
+    col = e.getColumn(1);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(col[0], 4.0, oopse::epsilon);    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(col[1], 0.0, oopse::epsilon);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(col[2], 6.0, oopse::epsilon);
+    //test setCol
+    col[0] = 2.0;    
+    col[1] = 0.0;    
+    col[2] = 0.0;    
+    m.setColumn(0, col);
+    col[0] = 4.0;    
+    col[1] = 0.0;    
+    col[2] = 6.0;    
+    m.setColumn(1, col);
+    col[0] = 1.0;    
+    col[1] = 3.0;    
+    col[2] = 5.0;    
+    m.setColumn(2, col);
+    CPPUNIT_ASSERT(m == e);
 
+    //test swapRow
+    RMat2x3 r;
+    r(0, 0) = 0.0;
+    r(0, 1) = 1.0;
+    r(0, 2) = 0.0;
+    r(1, 0) = 1.0;
+    r(1, 1) = 0.0;
+    r(1, 2) = 0.0;
+    r.swapRow(0, 1);
+    CPPUNIT_ASSERT(r == a);
+
+    //test swapCol
+    RMat3x3 s;
+    s(0, 0) = 4.0;
+    s(0, 1) = 2.0;
+    s(0, 2) = 1.0;
+    s(1, 0) = 0.0;    
+    s(1, 1) = 0.0;
+    s(1, 2) = 3.0;    
+    s(2, 0) = 6.0;
+    s(2, 1) = 0.0;
+    s(2, 2) = 5.0;
+
+    s.swapColumn(0, 1);
+    CPPUNIT_ASSERT(s == e);
+
+    double* p = s.getArrayPointer();
+
+    p[0] = 2.0;
+    p[1] = 4.0;
+    p[2] = 1.0;
+    p[3] = 0.0;
+    p[4] = 6.0;
+    p[5] = 5.0;    
+    p[6] = 0.0;
+    p[7] = 0.0;
+    p[8] = 3.0;  
+
+    CPPUNIT_ASSERT(s == f);    
+}    
+
+void RectMatrixTestCase::testOtherMemberFunctions(){
+    //test transpose
     CPPUNIT_ASSERT((a.transpose()).transpose() == a);
     
     CPPUNIT_ASSERT(a.transpose() == b);
+
+    //test getArray
+
+    double tmp[4];
+    m4.getArray(tmp);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[0], -1.0, oopse::epsilon);    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[1], -1.0, oopse::epsilon);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[2], -3.0, oopse::epsilon);    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[3], -1.0, oopse::epsilon);    
+    
 }