Changeset 886 for library/tests

Timestamp:

03/29/10 23:01:49 (14 years ago)

Author:

smidl

Message:

epdf and emix now have _base classes

Location:

library/tests

Files:

• stresssuite/merger_2d_stress.cpp (modified) (1 diff)
• stresssuite/mixtures_stress.cpp (modified) (1 diff)
• testsuite/epdf_test.cpp (modified) (2 diffs)

library/tests/stresssuite/merger_2d_stress.cpp

@@ -67 +67 @@
         it << Name ( "S1" ) << f1->evallog_mat ( Grid );
         it << Name ( "S2" ) << f2->evallog_mat ( Grid );
-        cout << ( ( enorm<ldmat>* ) ( MP->_Coms ( 0 ).get() ) )->_R().to_mat() << endl;
+//      cout << ( ( enorm<ldmat>* ) ( MP->_Coms ( 0 ).get() ) )->_R().to_mat() << endl;
 }

library/tests/stresssuite/mixtures_stress.cpp

@@ -15 +15 @@
         mat Var ( 2, 2 ), M ( 1, 2 );
         for ( i = 0; i < ep._rv().length() - 1; i++ ) { // -1 => last one is the weight
-                ( ( egiw* ) ep ( i ) )->mean_mat ( M, Var );
+                ( ( egiw* ) ep.factor ( i ) )->mean_mat ( M, Var );
                 cout << "Mean: " << M << endl << "Variance: " << endl << Var << endl;
         }
-        cout << "Weights: " << ep ( i )->mean() << endl;
+        cout << "Weights: " << ep.factor ( i )->mean() << endl;
 }
 

library/tests/testsuite/epdf_test.cpp

@@ -36 +36 @@
         g1->set_rv ( b );
         
-        Array<const epdf*> coms ( 2 );
-        coms ( 0 ) = g0.get();
-        coms ( 1 ) = g1.get();
+        Array<shared_ptr<epdf> > coms ( 2 );
+        coms ( 0 ) = g0;
+        coms ( 1 ) = g1;
         
         eprod p;
@@ -44 +44 @@
         // pointers in the array to outlast the eprod instance...
         p.set_parameters ( coms );
+        p.validate();
         
         CHECK_EQUAL ( vec ( "1 10 10" ), p.mean() );