Changeset 766 for library/tests

Timestamp:

01/11/10 22:55:57 (14 years ago)

Author:

mido

Message:

abstract methods restored wherever they are meaningful
macros NOT_IMPLEMENTED and NOT_IMPLEMENTED_VOID defined to make sources shorter
emix::set_parameters and mmix::set_parameters removed, corresponding acces methods created and the corresponding validate methods improved appropriately
some compilator warnings were avoided
and also a few other things cleaned up

Location:

library/tests

Files:

• stresssuite/arx_stress.cpp (modified) (1 diff)
• stresssuite/mixtures_stress.cpp (modified) (1 diff)
• stresssuite/square_mat_stress.cpp (modified) (9 diffs)
• testsuite/emix_test.cpp (modified) (2 diffs)
• testsuite/square_mat_test.cpp (modified) (1 diff)

library/tests/stresssuite/arx_stress.cpp

@@ -24 +24 @@
         //Test constructor
         mat V0 = 0.00001 * eye ( ord + 1 );
-        V0 ( 0.0 ) = 1; //
+        V0 ( 0 ) = 1; //
         double nu0 = ord + 5.0;
 

library/tests/stresssuite/mixtures_stress.cpp

@@ -67 +67 @@
         emix Simul;
         Simul.set_rv ( x );
-        Simul.set_parameters ( "0.5 0.6", Sim );
+        Simul._w() = "0.5 0.6";
+        Simul._Coms() = Sim;
         Simul.validate();
 

library/tests/stresssuite/square_mat_stress.cpp

@@ -60 +60 @@
 
         tt.tic();
-        TMatrix sqmat ( A );
+        TMatrix sq_mat ( A );
         double elapsed = tt.toc();
         cout << "ctor(" << sz << " x " << sz << "): " << elapsed << " s" << endl;
 
         tt.tic();
-        mat res = sqmat.to_mat();
+        mat res = sq_mat.to_mat();
         elapsed = tt.toc();
 
@@ -76 +76 @@
         vec v = point->get_vector();
         double w = point->get_scalar();
-        TMatrix sqmat2 = sqmat;
-
-        tt.tic();
-        sqmat2.opupdt ( v, w );
+        TMatrix sq_mat2 = sq_mat;
+
+        tt.tic();
+        sq_mat2.opupdt ( v, w );
         elapsed = tt.toc();
 
         if ( !fast ) {
                 mat expA = A + w * outer_product ( v, v );
-                CHECK_CLOSE ( expA, sqmat2.to_mat(), epsilon );
+                CHECK_CLOSE ( expA, sq_mat2.to_mat(), epsilon );
         }
 
@@ -92 +92 @@
 
         tt.tic();
-        sqmat.inv ( invmat );
+        sq_mat.inv ( invmat );
         elapsed = tt.toc();
 
@@ -104 +104 @@
 
         tt.tic();
-        double ld = sqmat.logdet();
+        double ld = sq_mat.logdet();
         elapsed = tt.toc();
 
@@ -115 +115 @@
 
         tt.tic();
-        double q = sqmat.qform ( ones ( sz ) );
+        double q = sq_mat.qform ( ones ( sz ) );
         elapsed = tt.toc();
 
@@ -125 +125 @@
 
         tt.tic();
-        q = sqmat.qform ( v );
+        q = sq_mat.qform ( v );
         elapsed = tt.toc();
 
@@ -136 +136 @@
 
         tt.tic();
-        q = sqmat.invqform ( v );
+        q = sq_mat.invqform ( v );
         elapsed = tt.toc();
 
@@ -146 +146 @@
         cout << "invqform: " << elapsed << " s" << endl;
 
-        TMatrix twice = sqmat;
-
-        tt.tic();
-        twice += sqmat;
+        TMatrix twice = sq_mat;
+
+        tt.tic();
+        twice += sq_mat;
         elapsed = tt.toc();
 
@@ -159 +159 @@
         cout << "+=: " << elapsed << " s" << endl;
 
-        sqmat2 = sqmat;
-
-        tt.tic();
-        sqmat2.mult_sym ( A );
+        sq_mat2 = sq_mat;
+
+        tt.tic();
+        sq_mat2.mult_sym ( A );
         elapsed = tt.toc();
 
         if ( !fast ) {
                 res = ( A * A ) * A.T();
-                CHECK_CLOSE ( res, sqmat2.to_mat(), epsilon );
+                CHECK_CLOSE ( res, sq_mat2.to_mat(), epsilon );
         }
 

library/tests/testsuite/emix_test.cpp

@@ -38 +38 @@
         emix M1;
         M1.set_rv ( xy );
-        M1.set_parameters ( vec ( "1" ), A1 );
+        M1._Coms() = A1;
+        M1._w() = 1;
         M1.validate();
 
@@ -68 +69 @@
         emix M2;
         M2.set_rv ( xy );
-        M2.set_parameters ( vec ( "1" ), A2 );
+        M2._Coms() = A2;
+        M2._w() = 1;
         M2.validate();
 

library/tests/testsuite/square_mat_test.cpp

@@ -20 +20 @@
         mat A = A0 * A0.T();
 
-        TMatrix sqmat ( A );
-        CHECK_EQUAL ( sz, sqmat.rows() );
-        CHECK_EQUAL ( sz, sqmat.cols() );
+        TMatrix sq_mat ( A );
+        CHECK_EQUAL ( sz, sq_mat.rows() );
+        CHECK_EQUAL ( sz, sq_mat.cols() );
 
-        mat res = sqmat.to_mat();
+        mat res = sq_mat.to_mat();
         CHECK_CLOSE ( A, res, epsilon );
 
         vec v = randu ( sz );
         double w = randu();
-        TMatrix sqmat2 = sqmat;
-        sqmat2.opupdt ( v, w );
+        TMatrix sq_mat2 = sq_mat;
+        sq_mat2.opupdt ( v, w );
 
         res = A + w * outer_product ( v, v );
-        CHECK_CLOSE ( res, sqmat2.to_mat(), epsilon );
+        CHECK_CLOSE ( res, sq_mat2.to_mat(), epsilon );
 
         TMatrix invmat ( sz );
-        sqmat.inv ( invmat );
+        sq_mat.inv ( invmat );
         mat invA = inv ( A );
         CHECK_CLOSE ( invA, invmat.to_mat(), epsilon );
 
         double d = det ( A );
-        CHECK_CLOSE ( log ( d ), sqmat.logdet(), epsilon );
+        CHECK_CLOSE ( log ( d ), sq_mat.logdet(), epsilon );
 
-        double q = sqmat.qform ( ones ( sz ) );
+        double q = sq_mat.qform ( ones ( sz ) );
         CHECK_CLOSE ( sumsum ( A ), q, epsilon );
 
-        q = sqmat.qform ( v );
+        q = sq_mat.qform ( v );
         double r = ( A * v ) * v;
         CHECK_CLOSE ( r, q, epsilon );
 
-        q = sqmat.invqform ( v );
+        q = sq_mat.invqform ( v );
         r = ( invA * v ) * v;
         CHECK_CLOSE ( r, q, epsilon );
 
-        sqmat2 = sqmat;
-        sqmat2.clear();
-        CHECK_EQUAL ( 0, sqmat2.qform ( ones ( sz ) ) );
+        sq_mat2 = sq_mat;
+        sq_mat2.clear();
+        CHECK_EQUAL ( 0, sq_mat2.qform ( ones ( sz ) ) );
 
-        TMatrix twice = sqmat;
-        twice += sqmat;
+        TMatrix twice = sq_mat;
+        twice += sq_mat;
         res = 2 * A;
         CHECK_CLOSE ( res, twice.to_mat(), epsilon );
 
-        twice = sqmat;
+        twice = sq_mat;
         twice *= 2;
         CHECK_CLOSE ( res, twice.to_mat(), epsilon );
 
-        sqmat2 = sqmat;
+        sq_mat2 = sq_mat;
         mat B = randu ( sz, sz );
-        sqmat2.mult_sym ( B );
+        sq_mat2.mult_sym ( B );
         res = ( B * A ) * B.T();
-        CHECK_CLOSE ( res, sqmat2.to_mat(), epsilon );
+        CHECK_CLOSE ( res, sq_mat2.to_mat(), epsilon );
 
         mat C = randu ( sz, sz - 1 );
         TMatrix CAC ( sz - 1 );
-        sqmat.mult_sym_t ( C, CAC );
+        sq_mat.mult_sym_t ( C, CAC );
         res = ( C.T() * A ) * C;
         CHECK_CLOSE ( res, CAC.to_mat(), epsilon );
 
-        sqmat2 = sqmat;
-        sqmat2.mult_sym_t ( B );
+        sq_mat2 = sq_mat;
+        sq_mat2.mult_sym_t ( B );
         res = ( B.T() * A ) * B;
-        CHECK_CLOSE ( res, sqmat2.to_mat(), epsilon );
+        CHECK_CLOSE ( res, sq_mat2.to_mat(), epsilon );
 }