Changeset 436

Timestamp:

07/28/09 15:07:47 (15 years ago)

Author:

vbarta

Message:

moved egiw_test to testsuite (partially converted to a configurable test); added public method clearing RVs

Location:

library

Files:

• bdm/base/bdmbase.cpp (modified) (1 diff)
• bdm/base/bdmbase.h (modified) (1 diff)
• tests/CMakeLists.txt (modified) (3 diffs)
• tests/egiw.cfg (added)
• tests/egiw_test.cpp (modified) (1 diff)
• tests/enorm_test.cpp (modified) (2 diffs)
• tests/epdf_harness.cpp (added)
• tests/epdf_harness.h (added)
• tests/test_util.cpp (modified) (3 diffs)
• tests/test_util.h (modified) (2 diffs)

library/bdm/base/bdmbase.cpp

@@ -12 +12 @@
 RV RV0=RV();
 
+void RV::clear_all()
+{
+    RV_MAP.clear();
+    RV_SIZES.clear();
+    RV_NAMES = Array<string>(RV_BUFFER_STEP);
+}
+  
 int RV::init ( const string &name, int size ) {
         //Refer

library/bdm/base/bdmbase.h

@@ -197 +197 @@
 
   // TODO dodelat void to_setting( Setting &set ) const;
+
+  //! Invalidate all named RVs. Use before initializing any RV instances, with care...
+  static void clear_all();
 };
 UIREGISTER(RV);

library/tests/CMakeLists.txt

@@ -7 +7 @@
 link_directories (./unittest-cpp)
 
-add_library(testutil mat_checks.cpp mat_checks.h test_util.cpp test_util.h)
+add_library(testutil epdf_harness.cpp epdf_harness.h mat_checks.cpp mat_checks.h test_util.cpp test_util.h)
 target_link_libraries(testutil bdm itpp unittest)
 
@@ -17 +17 @@
 
 EXEC(fsqmat_test)
-EXEC(egiw_test)
 EXEC(emix_test)
 EXEC(test0)
@@ -39 +38 @@
 
 # using UnitTest++
-add_executable(testsuite datalink_test.cpp enorm_test.cpp loggers_test.cpp rv_test.cpp square_mat_test.cpp testsuite.cpp test_user_info.cpp test_shared_ptr.cpp)
+add_executable(testsuite datalink_test.cpp egiw_test.cpp enorm_test.cpp loggers_test.cpp rv_test.cpp square_mat_test.cpp testsuite.cpp test_user_info.cpp test_shared_ptr.cpp)
 target_link_libraries(testsuite bdm itpp testutil unittest)
 

library/tests/egiw_test.cpp

@@ +1 @@
+#define BDMLIB // not an ideal way to prevent double registration of UI factories...
+#include "base/bdmbase.h"
+#include "base/user_info.h"
 #include "stat/exp_family.h"
+#include "itpp_ext.h"
+#include "epdf_harness.h"
+#include "mat_checks.h"
+#include "UnitTest++.h"
+
+const double epsilon = 0.00001;
+
+namespace UnitTest
+{
+
+inline void CheckClose(TestResults &results, const itpp::vec &expected,
+                       const itpp::vec &actual, double tolerance,
+                       TestDetails const &details) {
+    if (!AreClose(expected, actual, tolerance)) { 
+        MemoryOutStream stream;
+        stream << "Expected " << expected << " +/- " << tolerance << " but was " << actual;
+
+        results.OnTestFailure(details, stream.GetText());
+    }
+}
+
+}
+
 using namespace bdm;
 
-//These lines are needed for use of cout and endl
-using std::cout;
-using std::endl;
+template<>
+const ParticularUI<egiw> &ParticularUI<egiw>::factory(
+    ParticularUI<egiw>("egiw"));
 
-void Test ( const egiw &E ) {
+TEST(test_egiw) {
+    RV::clear_all();
+    UIFile in("egiw.cfg");
+    Array<epdf_harness *> input;
+    UI::get(input, in, "data");
+    int sz = input.size();
+    CHECK(sz > 0);
+    for (int i = 0; i < sz; ++i) {
+        input(i)->test();
+    }
 }
 
-int main() {
-        cout << "Testing eGiw(1,1)"<<endl;
-        {
-                // Setup model
-                double mu=1.1;
-                double s=0.1;
-
-                // TEST 1x1 EGIW
-                mat V ( 2,2 );
-                V ( 0,0 ) = pow ( mu,2 ) +s;
-                V ( 1,0 ) = mu;
-                V ( 0,1 ) = V ( 1,0 );
-                V ( 1,1 ) = 1.0;
-
-                double nu=10;
-
-                egiw E ( 1,nu*V,nu );
-                cout << "egiw mean value:" << E.mean() <<endl;
-                cout << "egiw normalizing constant:" << E.lognc() <<endl;
-
-                int n=100;
-                vec t_val ( 2 );
-
-                mat pdf ( 2*n,n );
-                vec Mu ( 2*n );
-                vec Si ( n );
-
-                for ( int i=0;i<2*n;i++ ) {
-                        Mu ( i ) = -2+i* ( 1.0/ ( n ) ) *3.0;
-                        t_val ( 0 ) = Mu ( i );
-                        for ( int j=0;j<n;j++ ) {
-                                Si ( j ) = ( j+1 ) * ( 1.0/n ) *2;
-                                t_val ( 1 ) = Si ( j );
-
-                                pdf ( i,j ) =E.evallog ( t_val );
-                        }
-                }
-
-                mat Pdf=exp ( pdf );
-                vec fm=sum ( Pdf,2 );
-                vec fs=sum ( Pdf,1 );
-                cout << "Numerical mean: " << vec_2 ( Mu*fm/sum ( fm ), Si*fs/sum ( fs ) ) <<endl;
-                cout << "Numerical integral of pdf: "<<sumsum ( Pdf/n/n*3*2 ) <<endl;
-        }
-        cout << "Testing Egiw(1,2)"<<endl;
-        {
-                // Setup model
-                double mu=1.1; //unit step parametr
-                double b=3.0; // sequence of <1 -1 1 -1...>
-                double s=0.1;
+TEST(test_egiw_1_2) {
+    // Setup model
+    double mu = 1.1; //unit step parametr
+    double b = 3.0; // sequence of <1 -1 1 -1...>
+    double s = 0.1;
 
 
-                // TEST 1x1 EGIW
-                mat V ( 3,3 );
-                V ( 0,0 ) = pow ( mu,2 ) +pow ( b ,2 )  +s;
-                V ( 1,0 ) = mu;
-                V ( 2,0 ) = b;
+    // TEST 1x1 EGIW
+    mat V(3, 3);
+    V(0, 0) = pow(mu, 2) + pow(b, 2) + s;
+    V(1, 0) = mu;
+    V(2, 0) = b;
 
-                V ( 0,1 ) = V ( 1,0 );
-                V ( 1,1 ) = 1.0;
-                V ( 2,1 ) = 0.0;
+    V(0, 1) = V(1, 0);
+    V(1, 1) = 1.0;
+    V(2, 1) = 0.0;
 
-                V ( 0,2 ) = V ( 2,0 );
-                V ( 1,2 ) = V ( 2,1 );
-                V ( 2,2 ) = 1.0;
+    V(0, 2) = V(2, 0);
+    V(1, 2) = V(2, 1);
+    V(2, 2) = 1.0;
 
+    double nu = 20;
 
-                double nu=20;
+    egiw E(1, nu * V, nu);    
+    CHECK_CLOSE(vec("1.1 3.0 0.142857"), E.mean(), epsilon);
+    CHECK_CLOSE(7.36731, E.lognc(), epsilon);
 
-                egiw E ( 1,nu*V,nu );
-                cout << "egiw mean value:" << E.mean() <<endl;
-                cout << "egiw normalizing constant:" << E.lognc() <<endl;
+    int n = 100;
+    vec rgr(3);
 
-                int n=100;
-                vec t_val ( 3 );
+    mat Tmp(2 * n, n);
 
-                mat Tmp= zeros ( 2*n,n );
+    double summ = 0.0;
+    for (int k = 0; k < n; k++) { // ALL b
+        rgr(1) = 1 + k * (1.0 / n) * 4.0;
+        for (int i = 0; i < 2*n; i++) { //ALL mu
+            rgr(0) = -2 + i * (1.0 / n) * 3.0;
+            for (int j = 0; j < n; j++) { // All sigma
+                rgr(2) = (j + 1) * (1.0 / n) * 2.0;
 
-                double summ=0.0;
-                for ( int k=0;k<n;k++ ) { // ALL b
-                        t_val ( 1 ) = 1 + k* ( 1.0/n ) * 4.0;
-                        for ( int i=0;i<2*n;i++ ) { //ALL mu
-                                t_val ( 0 ) = -2+i* ( 1.0/  n ) *3.0;
-                                for ( int j=0;j<n;j++ ) { // All sigma
-                                        t_val ( 2 ) = ( j+1 ) * ( 1.0/n ) *2.0;
+                Tmp(i, j) = E.evallog(rgr);
+            }
+        }
+        summ += sumsum(exp(Tmp)) / n / n / n * 3.0 * 2.0 * 4.0;
+    }
 
-                                        Tmp ( i,j ) = E.evallog ( t_val );
-                                }
-                        }
-                        summ += sumsum ( exp ( Tmp ) ) /n/n/n*3.0*2.0*4.0;
-                }
+    CHECK_CLOSE(1.0, summ, 0.1);
+}
 
-
-                cout << "Numerical integral of pdf: "<<summ <<endl;
-        }
-        
-        
-}

library/tests/enorm_test.cpp

@@ -3 +3 @@
 #include "stat/emix.h"
 #include "mat_checks.h"
+#include "test_util.h"
 #include "UnitTest++.h"
 
@@ -34 +35 @@
 }
 
-}
-
-double normcoef ( const epdf* ep,const vec &xb, const vec &yb, int Ngr=100 ) {
-        mat PPdf ( Ngr+1,Ngr+1 );
-        vec rgr ( 2 );
-
-        int i=0,j=0;
-        double xstep= ( xb ( 1 )-xb ( 0 ) ) /Ngr;
-        double ystep= ( yb ( 1 )-yb ( 0 ) ) /Ngr;
-
-        for ( double x=xb ( 0 );x<=xb ( 1 );x+= xstep,i++ ) {
-                rgr ( 0 ) =x;j=0;
-                for ( double y=yb ( 0 );y<=yb ( 1 );y+=ystep,j++ ) {
-                        rgr ( 1 ) =y;
-                        PPdf ( i,j ) =exp ( ep->evallog ( rgr ) );
-                }
-        }
-        return sumsum ( PPdf ) *xstep*ystep;
 }
 

library/tests/test_util.cpp

@@ +1 @@
+#define BDMLIB // not an ideal way to prevent double registration of UI factories...
 #include "test_util.h"
+#include "stat/exp_family.h"
 #include <fstream>
 #include <stdexcept>
@@ -12 +14 @@
 
 namespace bdm {
+
+using itpp::vec;
+using itpp::mat;
 
 std::string load_test_file(const char *fname)
@@ -73 +78 @@
 }
 
+double normcoef(const epdf *ep, const vec &xb, const vec &yb,
+                int xn, int yn) {
+    mat Pdf(xn + 1, yn + 1);
+    vec rgr(2);
+
+    double xstep = (xb(1) - xb(0)) / xn;
+    double ystep = (yb(1) - yb(0)) / yn;
+
+    int i = 0;
+    for (double x = xb(0); x <= xb(1); x += xstep, i++) {
+        rgr(0) = x;
+        int j = 0;
+        for (double y = yb(0); y <= yb(1); y += ystep, j++) {
+            rgr(1) = y;
+            Pdf(i, j) = exp(ep->evallog(rgr));
+        }
+    }
+
+    return sumsum(Pdf) * xstep * ystep;
 }
+
+vec num_mean2(const epdf *ep, const vec &xb, const vec &yb,
+              int xn, int yn) {
+    mat Pdf(xn + 1, yn + 1);
+    vec rgr(2);
+
+    double xstep = (xb(1) - xb(0)) / xn;
+    double ystep = (yb(1) - yb(0)) / yn;
+
+    vec Mu(xn + 1);
+    vec Si(yn + 1);
+
+    int i = 0;
+    for (double x = xb(0); x <= xb(1); x += xstep, i++) {
+        Mu(i) = x;
+        rgr(0) = x;
+        int j = 0;
+        for (double y = yb(0); y <= yb(1); y += ystep, j++) {
+            Si(j) = y;
+            rgr(1) = y;
+            Pdf(i, j) = exp(ep->evallog(rgr));
+        }
+    }
+
+    vec fm = sum(Pdf, 2);
+    vec fs = sum(Pdf, 1);
+    return vec_2(Mu * fm / sum(fm), Si * fs / sum(fs));
+}
+
+}

library/tests/test_util.h

@@ -15 +15 @@
 
 #include <string>
+#include "itpp_ext.h"
 
 namespace bdm {
+
+class epdf;
 
 /*! \brief Non-general but simple file load.
@@ -34 +37 @@
 bool remove_all(const char *path);
 
+double normcoef(const epdf *ep, const itpp::vec &xb, const itpp::vec &yb,
+                int xn = 100, int yn = 100);
+
+itpp::vec num_mean2(const epdf *ep, const itpp::vec &xb, const itpp::vec &yb,
+                    int xn = 100, int yn = 100);
+
 }