Changeset 190 for tests/merger_iter_test.cpp

Timestamp:

10/22/08 10:46:38 (16 years ago)

Author:

smidl

Message:

adaptation of merger for changes and creation of datalink class

Files:

• tests/merger_iter_test.cpp (modified) (4 diffs)

tests/merger_iter_test.cpp

@@ -11 +11 @@
 int main() {
 
+        RNG_randomize();
+        
         RV x ( "{x }","1" );
         RV y ( "{y }","1" );
@@ -16 +18 @@
         RV xy=x; xy.add(y);
         
-//      enorm<fsqmat> f1 ( xy );
-//      enorm<fsqmat> f2 ( x );
-
-        enorm<ldmat> f(xy);
-        f.set_parameters ( "1 1",mat ( "1.2 1; 1 1.2" ) );
-        
-        mpdf* f1=f.condition(x);
-        mpdf* f2=f.condition(y);
-        cout << *(mlnorm<ldmat>*)f1 <<endl;
-        cout << *(mlnorm<ldmat>*)f2 <<endl;
-        
-//      f1.set_parameters ( "1 1",mat ( "1.2 1; 1 1.2" ) );
-//      f2.set_parameters ( "2",mat ( "20" ) );
+        enorm<fsqmat> f1 ( xy );
+        enorm<fsqmat> f2 ( x );
+                
+        f1.set_parameters ( "0 0",mat ( "0.5 0; 0 0.5" ) );
+        f2.set_parameters ( "3",mat ( "0.5" ) );
         
         Array<mpdf* > A ( 2 );
-/*      mepdf A1(f1);
-        mepdf A2(f2);*/
-        A ( 0 ) =f1;
-        A ( 1 ) =f2;
+        mepdf A1(f1);
+        mepdf A2(f2);
+        A ( 0 ) =&A1;
+        A ( 1 ) =&A2;
         
         int Npoints=100;
@@ -48 +42 @@
         merger M ( A );
         enorm<fsqmat> g0(xy);
-        g0.set_parameters(vec("1 1"),mat("100 0; 0 100"));
+        g0.set_parameters(vec("1 1"),mat("1 0; 0 1"));
         
-        M.set_parameters(1.2,200,1);
+        M.set_parameters(1.2,200,2);
         M.merge(&g0);
         
@@ -57 +51 @@
         
         vec Res1 = M.evalpdflog_m(Grid);
-        vec Res2 = MP->evalpdflog_m(Grid);
+        mat Res2 = ((emix*)MP)->evalpdflog_M(Grid);
         
         it_file it("merger_iter_test.it");