Changeset 698

Timestamp:

11/03/09 00:03:42 (14 years ago)

Author:

smidl

Message:

arx straux passes more tests

Location:

library/tests

Files:

• arx_straux_test.cfg (added)
• arx_straux_test.cpp (modified) (1 diff)

library/tests/arx_straux_test.cpp

@@ -4 +4 @@
 using namespace bdm;
 
-TEST(arx_straux_test){
-mat A="0.8147    0.9134    0.2785;"
-    "0.9058    0.6324    0.5469;"
-    "0.1270    0.0975    0.9575";
+TEST ( arx_straux_test ) {
 
-mat B="0.9649    0.9572    0.1419;"
-    "0.1576    0.4854    0.4218;"
-    "0.9706    0.8003    0.9157";
+        UIFile F ( "arx_straux_test.cfg" );
+
+        Setting &tests=F.getRoot() ["tests"];
+        for ( int i=0;i<tests.getLength(); i++ ) {
+                mat A;
+                mat B;
+                ivec o1_ok;
+                UI::get ( A,tests[i],"A",UI::compulsory );
+                UI::get ( B,tests[i],"B",UI::compulsory );
+                UI::get ( o1_ok,tests[i],"o1",UI::compulsory );
+
 //when updateing matrices do not forget to update CHECK_EQUAL below!!!
-        
-ldmat Ld0(3); Ld0.ldform(A,ones(3));
-ldmat Ld1(3); Ld1.ldform(A+B,ones(3));
+
+                ldmat Ld0 ( 3 ); Ld0.ldform ( A,ones ( A.rows() ) );
+                ldmat Ld1 ( 3 ); Ld1.ldform ( A+B,ones ( A.rows() ) );
 
 
-ivec belief = vec_1(2);           // default belief
-int nbest = 3;           // nbest: how many regressors are returned
-int nrep = 5;         // nrep: number of random repetions of structure estimation
-double lambda   = 0.9; 
-int k=2;
+                ivec belief = vec_1 ( 2 );        // default belief
+                int nbest = 3;           // nbest: how many regressors are returned
+                int nrep = 5;         // nrep: number of random repetions of structure estimation
+                double lambda   = 0.9;
+                int k=2;
 
-//[strout, rgrsout, statistics] = 
+//[strout, rgrsout, statistics] =
 //          straux1(L, d, nu, L0, d0, nu0, belief, nbest, max_nrep, lambda,
 //          order_k);
-Array<str_aux> o2;
-ivec o1 = straux1(Ld1,20, Ld0, 10,  belief, nbest, nrep, lambda, k, o2);
+                Array<str_aux> o2;
+                ivec o1 = straux1 ( Ld1,20, Ld0, 10,  belief, nbest, nrep, lambda, k, o2 );
 
-
-CHECK_EQUAL(ivec("2 3"), o1);
+//o1 is messed up in matlab's straux
+                sort ( o1_ok );
+                sort ( o1 );
+                CHECK_EQUAL ( o1_ok, o1 );
+        }
 
 }