Changeset 507 for library/tests/merger_2d_test.cpp

Timestamp:

08/12/09 15:37:43 (15 years ago)

Author:

vbarta

Message:

removed class compositepdf; keeping mpdfs of mprod and merger_base in shared pointers

Files:

• library/tests/merger_2d_test.cpp (modified) (2 diffs)

library/tests/merger_2d_test.cpp

@@ -21 +21 @@
         xy.add ( y );
 
-        enorm<fsqmat> f1;
-        f1.set_rv ( xy );
-        enorm<fsqmat> f2;
-        f1.set_rv ( xy );
+        shared_ptr<enorm<fsqmat> > f1 = new enorm<fsqmat>();
+        f1->set_rv ( xy );
+        shared_ptr<enorm<fsqmat> > f2 = new enorm<fsqmat>();
+        f2->set_rv ( xy );
 
         mat R1 ( "0.5 0.48; 0.48 0.5" );
         mat R2 ( "0.5 0; 0 0.1" );
-        f1.set_parameters ( "1 1", R1 );
-        f2.set_parameters ( "1 1", mat ( "0.5 0; 0 0.1" ) );
+        f1->set_parameters ( "1 1", R1 );
+        f2->set_parameters ( "1 1", mat ( "0.5 0; 0 0.1" ) );
 
-        Array<mpdf* > A ( 2 );
-        mepdf A1 ( &f1 );
-        mepdf A2 ( &f2 );
-        A ( 0 ) = &A1;
-        A ( 1 ) = &A2;
+        Array<shared_ptr<mpdf> > A ( 2 );
+        shared_ptr<mepdf> A1 = new mepdf ( f1 );
+        shared_ptr<mepdf> A2 = new mepdf ( f2 );
+        A ( 0 ) = A1;
+        A ( 1 ) = A2;
 
         int Npoints = 100;
@@ -68 +68 @@
         it << Name ( "Res1" ) << Res1;
         it << Name ( "Res2" ) << Res2;
-        it << Name ( "S1" ) << f1.evallog_m ( Grid );
-        it << Name ( "S2" ) << f2.evallog_m ( Grid );
+        it << Name ( "S1" ) << f1->evallog_m ( Grid );
+        it << Name ( "S2" ) << f2->evallog_m ( Grid );
         cout << ( ( enorm<ldmat>* ) ( MP->_Coms ( 0 ).get() ) )->_R().to_mat() << endl;
 }