Changeset 693 for library/tests

Timestamp:

11/02/09 17:27:29 (15 years ago)

Author:

mido

Message:

mpdf renamed to pdf in the whole library

Location:

library/tests

Files:

• CMakeLists.txt (modified) (2 diffs)
• datasource_test.cpp (modified) (1 diff)
• emix_test.cpp (modified) (2 diffs)
• epdf_harness.cpp (modified) (1 diff)
• mepdf.cfg (modified) (1 diff)
• merger_2d_test.cpp (modified) (1 diff)
• merger_iter_test.cpp (modified) (1 diff)
• merger_test.cpp (modified) (3 diffs)
• mgamma.cfg (modified) (2 diffs)
• mlnorm.cfg (modified) (2 diffs)
• mprod.cfg (modified) (2 diffs)
• pdf_harness.cpp (moved) (moved from library/tests/mpdf_harness.cpp) (7 diffs)
• pdf_harness.h (moved) (moved from library/tests/mpdf_harness.h) (6 diffs)
• pdf_test.cpp (moved) (moved from library/tests/mpdf_test.cpp) (5 diffs)
• pdfds.cfg (moved) (moved from library/tests/mpdfds.cfg) (1 diff)

library/tests/CMakeLists.txt

@@ -8 +8 @@
 
 SET(testutil_src epdf_harness.cpp epdf_harness.h mat_checks.cpp mat_checks.h 
-        mpdf_harness.cpp mpdf_harness.h square_mat_point.cpp square_mat_point.h test_util.cpp test_util.h)
+        pdf_harness.cpp pdf_harness.h square_mat_point.cpp square_mat_point.h test_util.cpp test_util.h)
 
 add_library(testutil ${testutil_src})
@@ -41 +41 @@
 # using UnitTest++
 
-SET(unit_test_configurations  mepdf.cfg egiw.cfg mlnorm.cfg edirich.cfg mprod.cfg generator.cfg epdfds.cfg mpdfds.cfg test_user_info_input.cfg merger.cfg erroneous.cfg egamma.cfg test_user_info_external.cfg merger_error.cfg mgamma.cfg enorm.cfg)
+SET(unit_test_configurations  mepdf.cfg egiw.cfg mlnorm.cfg edirich.cfg mprod.cfg generator.cfg epdfds.cfg pdfds.cfg test_user_info_input.cfg merger.cfg erroneous.cfg egamma.cfg test_user_info_external.cfg merger_error.cfg mgamma.cfg enorm.cfg)
 
 add_executable(testsuite arx_straux_test.cpp datalink_test.cpp  datasource_test.cpp egiw_test.cpp emix_test.cpp epdf_test.cpp logger_test.cpp LQG_test.cpp merger_test.cpp 
-        mpdf_test.cpp randun_test.cpp rectangular_support_test.cpp rv_test.cpp shared_ptr_test.cpp square_mat_test.cpp testsuite.cpp user_info_test.cpp  ${unit_test_configurations} )
+        pdf_test.cpp randun_test.cpp rectangular_support_test.cpp rv_test.cpp shared_ptr_test.cpp square_mat_test.cpp testsuite.cpp user_info_test.cpp  ${unit_test_configurations} )
 
 set_source_files_properties(${unit_test_configurations} PROPERTIES HEADER_FILE_ONLY TRUE)

library/tests/datasource_test.cpp

@@ -20 +20 @@
 }
 
-TEST ( MpdfDS_test ) {
-        UIFile uif("mpdfds.cfg");
+TEST ( PdfDS_test ) {
+        UIFile uif("pdfds.cfg");
 
-        shared_ptr<MpdfDS> ds=UI::build<MpdfDS>(uif, "ds", UI::compulsory);
+        shared_ptr<PdfDS> ds=UI::build<PdfDS>(uif, "ds", UI::compulsory);
         
         vec dt = zeros(2);

library/tests/emix_test.cpp

@@ -37 +37 @@
         epdf_ptr Mm = M1.marginal ( y );
         epdf_ptr Am = E1->marginal ( y );
-        mpdf_ptr Mc = M1.condition ( y );
-        mpdf_ptr Ac = E1->condition ( y );
+        pdf_ptr Mc = M1.condition ( y );
+        pdf_ptr Ac = E1->condition ( y );
 
         mlnorm<ldmat> *wacnd = dynamic_cast<mlnorm<ldmat> *>( Ac.get() );
@@ -81 +81 @@
         epdf_ptr Mg = M2.marginal ( y );
         CHECK ( Mg.get() );
-        mpdf_ptr Cn = M2.condition ( x );
+        pdf_ptr Cn = M2.condition ( x );
         CHECK ( Cn.get() );
 

library/tests/epdf_harness.cpp

@@ -67 +67 @@
                 RV crv = hepdf->_rv().subt ( *mrv );
                 epdf_ptr m = hepdf->marginal ( *mrv );
-                mpdf_ptr c = hepdf->condition ( crv );
-
-                mpdf_array aa ( 2 );
+                pdf_ptr c = hepdf->condition ( crv );
+
+                pdf_array aa ( 2 );
                 aa ( 0 ) = c;
                 aa ( 1 ) = m;

library/tests/mepdf.cfg

@@ -1 +1 @@
 data = (
 {
-  class = "mpdf_harness";
-  mpdf = {
+  class = "pdf_harness";
+  pdf = {
       class = "enorm<ldmat>";
       mu = [ 1.1, -1.0 ];

library/tests/merger_2d_test.cpp

@@ -31 +31 @@
         f2->set_parameters ( "1 1", mat ( "0.5 0; 0 0.1" ) );
 
-        mpdf_array A ( 2 );
+        pdf_array A ( 2 );
         A ( 0 ) = f1;
         A ( 1 ) = f2;

library/tests/merger_iter_test.cpp

@@ -32 +32 @@
         f3->set_parameters ( "2", mat ( "0.4" ) );
 
-        mpdf_array A ( 3 );
+        pdf_array A ( 3 );
         A ( 0 ) = f1;
         A ( 1 ) = f2;

library/tests/merger_test.cpp

@@ -21 +21 @@
         f2->set_parameters ( "5", mat ( "10" ) );
 
-        mpdf_array A ( 2 );
+        pdf_array A ( 2 );
         A ( 0 ) = f1;
         A ( 1 ) = f2;
@@ -144 +144 @@
                 UI::build<merger_base> ( in, "Merger", UI::compulsory );
 
-        mpdf_array sources;
+        pdf_array sources;
         UI::get ( sources, in, "Sources", UI::compulsory );
         mb->set_sources ( sources );
@@ -160 +160 @@
         UIFile in ( "merger_error.cfg" );
 
-        mpdf_array sources;
+        pdf_array sources;
         try {
                 UI::get ( sources, in, "Sources", UI::compulsory );

library/tests/mgamma.cfg

@@ -1 +1 @@
 data = (
 {
-  class = "mpdf_harness";
-  mpdf = {
+  class = "pdf_harness";
+  pdf = {
     class = "mgamma";
     beta = [ 1.5, 1.7 ];
@@ -24 +24 @@
 },
 {
-  class = "mpdf_harness";
-  mpdf = {
+  class = "pdf_harness";
+  pdf = {
     class = "mgamma";
     beta = [ 1.5, 1.7 ];

library/tests/mlnorm.cfg

@@ -1 +1 @@
 data = (
 {
-  class = "mpdf_harness";
-  mpdf = {
+  class = "pdf_harness";
+  pdf = {
     class = "mlnorm<ldmat>";
     A = ( "matrix", 2, 2, [ 1.0, 0.0, 0.0, 1.0 ] );
@@ -15 +15 @@
 },
 {
-  class = "mpdf_harness";
-  mpdf = {
+  class = "pdf_harness";
+  pdf = {
     class = "mlnorm<chmat>";
     A = ( "matrix", 2, 2, [ 1.0, 0.0, 0.0, 1.0 ] );

library/tests/mprod.cfg

@@ -1 +1 @@
 data = (
 {
-  class = "mpdf_harness";
-  mpdf = {
+  class = "pdf_harness";
+  pdf = {
     class = "mprod";
-    mpdfs = ( 
+    pdfs = ( 
     {
       class = "mgamma";
@@ -37 +37 @@
 },
 {
-  class = "mpdf_harness";
-  mpdf = {
+  class = "pdf_harness";
+  pdf = {
     class = "mprod";
-    mpdfs = ( 
+    pdfs = ( 
     {
         class = "enorm<ldmat>";

library/tests/pdf_harness.cpp

@@ -1 @@
-#include "mpdf_harness.h"
+#include "pdf_harness.h"
 #include "base/bdmbase.h"
 #include "base/user_info.h"
@@ -9 +9 @@
 namespace bdm {
 
-void mpdf_harness::test_config ( const char *config_file_name ) {
+void pdf_harness::test_config ( const char *config_file_name ) {
         RV::clear_all();
 
         UIFile in ( config_file_name );
-        Array<shared_ptr<mpdf_harness> > input;
+        Array<shared_ptr<pdf_harness> > input;
         UI::get ( input, in, "data", UI::compulsory );
         int sz = input.size();
@@ -22 +22 @@
 }
 
-void mpdf_harness::from_setting ( const Setting &set ) {
-        hmpdf = UI::build<mpdf> ( set, "mpdf", UI::compulsory );
+void pdf_harness::from_setting ( const Setting &set ) {
+        hpdf = UI::build<pdf> ( set, "pdf", UI::compulsory );
         UI::get ( mean, set, "mean", UI::compulsory );
         UI::get ( variance, set, "variance", UI::compulsory );
 
         if ( !UI::get ( cond, set, "cond", UI::optional ) ) {
-                cond = zeros ( hmpdf->dimensionc() );
+                cond = zeros ( hpdf->dimensionc() );
         }
 
@@ -36 +36 @@
 }
 
-void mpdf_harness::test ( const char *config_name, int idx ) {
+void pdf_harness::test ( const char *config_name, int idx ) {
         CurrentContext cc ( config_name, idx );
         check_mean();
@@ -44 +44 @@
 }
 
-void mpdf_harness::check_mean() {
+void pdf_harness::check_mean() {
         vec delta = make_close_tolerance ( variance, nsamples );
 
@@ -50 +50 @@
         Array<vec> actual(CurrentContext::max_trial_count);
         do {
-                mat smp = hmpdf->samplecond_m ( cond, nsamples );
+                mat smp = hpdf->samplecond_m ( cond, nsamples );
                 vec emu = smp * ones ( nsamples ) / nsamples;
                 actual( tc ) = emu;
@@ -67 +67 @@
 }
 
-void mpdf_harness::check_covariance() {
+void pdf_harness::check_covariance() {
         int tc = 0;
         Array<mat> actual(CurrentContext::max_trial_count);
         do {
-                mat smp = hmpdf->samplecond_m ( cond, nsamples );
+                mat smp = hpdf->samplecond_m ( cond, nsamples );
                 vec emu = smp * ones ( nsamples ) / nsamples;
                 mat er = ( smp * smp.T() ) / nsamples - outer_product ( emu, emu );

library/tests/pdf_harness.h

@@ -1 +1 @@
 /*!
   \file
-  \brief Support for testing descendants of mpdf.
+  \brief Support for testing descendants of pdf.
   \author Vaclav Barta.
 
@@ -11 +11 @@
 */
 
-#ifndef MPDF_HARNESS_H
-#define MPDF_HARNESS_H
+#ifndef pdf_HARNESS_H
+#define pdf_HARNESS_H
 
 #include "bdmroot.h"
@@ -22 +22 @@
 namespace bdm {
 
-class mpdf_harness : public root {
+class pdf_harness : public root {
 private:
-        shared_ptr<mpdf> hmpdf;
+        shared_ptr<pdf> hpdf;
         vec cond;
         vec mean;
@@ -35 +35 @@
         static void test_config ( const char *config_file_name );
 
-        mpdf_harness() : nsamples ( 1000 ), tolerance ( 0.1 ) { }
+        pdf_harness() : nsamples ( 1000 ), tolerance ( 0.1 ) { }
 
         virtual void test ( const char *config_name, int idx );
@@ -42 +42 @@
 
 protected:
-        mpdf *get_mpdf() {
-                return hmpdf.get();
+        pdf *get_pdf() {
+                return hpdf.get();
         }
 
@@ -52 +52 @@
         void check_covariance();
 };
-UIREGISTER(mpdf_harness);
+UIREGISTER(pdf_harness);
 
 }

library/tests/pdf_test.cpp

@@ -3 +3 @@
 #include "stat/emix.h"
 #include "itpp_ext.h"
-#include "mpdf_harness.h"
+#include "pdf_harness.h"
 #include "mat_checks.h"
 #include "UnitTest++.h"
@@ -9 +9 @@
 using namespace bdm;
 
-static void check_mean(mpdf &distrib_obj, const vec &mu0, int nsamples, const vec &mean, double tolerance);
+static void check_mean(pdf &distrib_obj, const vec &mu0, int nsamples, const vec &mean, double tolerance);
 
 static void check_covariance(mmix &distrib_obj, const vec &mu0, int nsamples, const mat &R, double tolerance);
 
 TEST ( mepdf_test ) {
-        mpdf_harness::test_config ( "mepdf.cfg" );
+        pdf_harness::test_config ( "mepdf.cfg" );
 }
 
 TEST ( mgamma_test ) {
-        mpdf_harness::test_config ( "mgamma.cfg" );
+        pdf_harness::test_config ( "mgamma.cfg" );
 }
 
 TEST ( mlnorm_test ) {
-        mpdf_harness::test_config ( "mlnorm.cfg" );
+        pdf_harness::test_config ( "mlnorm.cfg" );
 }
 
 TEST ( mprod_test ) {
-        mpdf_harness::test_config ( "mprod.cfg" );
+        pdf_harness::test_config ( "mprod.cfg" );
 }
 
-// not using mpdf_harness because mmix isn't configurable (yet?)
+// not using pdf_harness because mmix isn't configurable (yet?)
 TEST ( mmix_test ) {
         RV x ( "{mmixx }", "2" );
@@ -46 +46 @@
 
         mmix mMix;
-        mpdf_array mComs ( 2 );
+        pdf_array mComs ( 2 );
 
-        // mmix::set_parameters requires the first mpdf to be named
+        // mmix::set_parameters requires the first pdf to be named
         mG->set_rv(x);
         mG->set_rvc(y);
@@ -65 +65 @@
 }
 
-// not using mpdf_harness because emix isn't configurable (yet?)
+// not using pdf_harness because emix isn't configurable (yet?)
 TEST ( mepdf_emix_test ) {
         int N = 10000; //number of samples
@@ -89 +89 @@
 }
 
-static void check_mean(mpdf &distrib_obj, const vec &mu0, int nsamples, const vec &mean, double tolerance) {
+static void check_mean(pdf &distrib_obj, const vec &mu0, int nsamples, const vec &mean, double tolerance) {
         int tc = 0;
         Array<vec> actual(CurrentContext::max_trial_count);

library/tests/pdfds.cfg

@@ -1 +1 @@
 ds={
-class = "MpdfDS";
-mpdf = {
+class = "PdfDS";
+pdf = {
   class = "mlnorm<ldmat>";
   A = ( "matrix", 1, 2, [ 0.5, -0.1 ] );