Changeset 507 for library/tests/merger_iter_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_iter_test.cpp (modified) (1 diff)

library/tests/merger_iter_test.cpp

@@ -21 +21 @@
         xy.add ( y );
 
-        enorm<fsqmat> f1;
-        f1.set_rv ( xy );
-        enorm<fsqmat> f2;
-        f2.set_rv ( xy );
-        enorm<fsqmat> f3;
-        f3.set_rv ( y );
+        shared_ptr<enorm<fsqmat> > f1 = new enorm<fsqmat>();
+        f1->set_rv ( xy );
+        shared_ptr<enorm<fsqmat> > f2 = new enorm<fsqmat>();
+        f2->set_rv ( xy );
+        shared_ptr<enorm<fsqmat> > f3 = new enorm<fsqmat>();
+        f3->set_rv ( y );
 
-        f1.set_parameters ( "4 3", mat ( "0.4 0.3; 0.3 0.4" ) );
-        f2.set_parameters ( "1 3", mat ( "0.3 -0.2; -0.2 0.3" ) );
-        f3.set_parameters ( "2", mat ( "0.4" ) );
+        f1->set_parameters ( "4 3", mat ( "0.4 0.3; 0.3 0.4" ) );
+        f2->set_parameters ( "1 3", mat ( "0.3 -0.2; -0.2 0.3" ) );
+        f3->set_parameters ( "2", mat ( "0.4" ) );
 
-        Array<mpdf* > A ( 3 );
-        mepdf A1 ( &f1 );
-        mepdf A2 ( &f2 );
-        mepdf A3 ( &f3 );
-        A ( 0 ) = &A1;
-        A ( 1 ) = &A2;
-        A ( 2 ) = &A3;
+        Array<shared_ptr<mpdf> > A ( 3 );
+        A ( 0 ) = new mepdf ( f1 );
+        A ( 1 ) = new mepdf ( f2 );
+        A ( 2 ) = new mepdf ( f3 );
 
         int Npoints = 100;