Changeset 1072 for library/tests

Timestamp:

06/10/10 12:29:54 (15 years ago)

Author:

smidl

Message:

new merger

Location:

library/tests/testsuite

Files:

• datasource_test.cpp (modified) (2 diffs)
• merger_test.cpp (modified) (1 diff)

library/tests/testsuite/datasource_test.cpp

@@ -3 +3 @@
 #include "../mat_checks.h"
 #include "UnitTest++.h"
+#include "../bdm/stat/emix.h"
 
 using namespace bdm;
@@ -60 +61 @@
     OM->validate();
 
-    StateDS sds;
-    sds.set_parameters ( IM, OM );
-    sds.validate();
+        PdfDS pds;      
+        Array<shared_ptr<pdf> > Arr(2);
+        Arr(0) = OM;
+        Arr(1)= IM;
+        
+        shared_ptr<mprod> mp;
+        mp->set_elements(Arr);
+        
+        pds.ipdf=mp;
+        pds.validate();
 
     for ( int t = 1; t < 10; t++ ) {
-        sds.write ( vec_1 ( double ( t ) ) );
+                pds.write ( vec_1 ( double ( t ) ) );
         // TODO ZDE TO SPADNE
-        sds.step();
+                pds.step();
     }
 
     vec dt;
-    sds.getdata ( dt );
+        pds.getdata ( dt );
     CHECK_CLOSE ( vec ( "94.5, 94.5, 13.5, 9" ), dt, 1e-2 );
 }

library/tests/testsuite/merger_test.cpp

@@ -7 +7 @@
 
 using namespace bdm;
+
+TEST (ENormMerger_test){
+        ENormMerger<ldmat> m1;
+        m1.sources.set_length(2);
+        m1.sources(0) = new enorm<ldmat>(vec_2(1.0, 1.0), mat_2x2(1.0, 0.0, 0.0, 2.0));
+        m1.sources(1) = new enorm<ldmat>(vec_2(2.0, 2.0), mat_2x2(2.0, 1.0, 1.0, 2.0));
+        m1.validate();
+        m1.merge();
+        
+        cout << "mean: " << m1.merger().mean() << endl;
+        cout << "var: " << m1.merger().covariance() << endl;
+}
 
 TEST ( merger_base_test ) {