Changeset 502

Timestamp:

08/11/09 15:27:34 (15 years ago)

Author:

vbarta

Message:

added tests of epdf::evallog_m methods, moved them out of line

Location:

library

Files:

• bdm/base/bdmbase.cpp (modified) (1 diff)
• bdm/base/bdmbase.h (modified) (1 diff)
• tests/epdf_harness.cpp (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -140 +140 @@
 }
 
+vec epdf::evallog_m (const mat &Val) const {
+        vec x (Val.cols());
+        for (int i = 0; i < Val.cols(); i++) {
+                x (i) = evallog ( Val.get_col (i) );
+        }
+
+        return x;
+}
+
+vec epdf::evallog_m (const Array<vec> &Avec) const {
+        vec x (Avec.size());
+        for (int i = 0; i < Avec.size(); i++) {
+                x (i) = evallog ( Avec (i) );
+        }
+
+        return x;
+}
 
 void mpdf::from_setting ( const Setting &set ) {

library/bdm/base/bdmbase.h

@@ -296 +296 @@
                 //! Returns a sample, \f$ x \f$ from density \f$ f_x()\f$
                 virtual vec sample() const {
-                        it_error ("not implemneted");
+                        it_error ("not implemented");
                         return vec (0);
-                };
+                }
+
                 //! Returns N samples, \f$ [x_1 , x_2 , \ldots \ \f$  from density \f$ f_x(rv)\f$
                 virtual mat sample_m (int N) const;
+
                 //! Compute log-probability of argument \c val
                 //! In case the argument is out of suport return -Infinity
                 virtual double evallog (const vec &val) const {
-                        it_error ("not implemneted");
+                        it_error ("not implemented");
                         return 0.0;
-                };
+                }
+
                 //! Compute log-probability of multiple values argument \c val
-                virtual vec evallog_m (const mat &Val) const {
-                        vec x (Val.cols());
-                        for (int i = 0; i < Val.cols(); i++) {
-                                x (i) = evallog (Val.get_col (i)) ;
-                        }
-                        return x;
-                }
+                virtual vec evallog_m (const mat &Val) const;
+
                 //! Compute log-probability of multiple values argument \c val
-                virtual vec evallog_m (const Array<vec> &Avec) const {
-                        vec x (Avec.size());
-                        for (int i = 0; i < Avec.size(); i++) {
-                                x (i) = evallog (Avec (i)) ;
-                        }
-                        return x;
-                }
+                virtual vec evallog_m (const Array<vec> &Avec) const;
+
                 //! Return conditional density on the given RV, the remaining rvs will be in conditioning
                 virtual mpdf* condition (const RV &rv) const  {

library/tests/epdf_harness.cpp

@@ -87 +87 @@
                 }
 
-                CHECK_CLOSE_EX ( hepdf->evallog ( zeron ), mEp.evallogcond ( zeron, zero ), tolerance );
+                double lpz = hepdf->evallog ( zeron );
+                CHECK_CLOSE_EX ( lpz, mEp.evallogcond ( zeron, zero ), tolerance );
+
+                vec lpzv(1);
+                lpzv(0) = lpz;
+
+                mat zero1n ( hepdf->dimension(), 1 );
+                for ( int i = 0; i < zero1n.rows(); ++i ) {
+                        zero1n ( i, 0 ) = 0;
+                }
+
+                vec lpzv_act = hepdf->evallog_m ( zero1n );
+                CHECK_CLOSE_EX ( lpzv, lpzv_act, tolerance );
+
+                Array<vec> zeroa(3);
+                lpzv = vec( zeroa.size() );
+                for ( int i = 0; i < zeroa.size(); ++i ) {
+                        zeroa(i) = zeron;
+                        lpzv(i) = lpz;
+                }
+
+                lpzv_act = hepdf->evallog_m ( zeroa );
+                CHECK_CLOSE_EX ( lpzv, lpzv_act, tolerance );
         }
 }