Changeset 557

Timestamp:

08/19/09 01:41:23 (15 years ago)

Author:

smidl

Message:

egiw_1_2 test reimplemented using rectangular_support - similar can be done for general epdf_harness

Location:

library

Files:

• bdm/stat/discrete.h (modified) (3 diffs)
• tests/egiw_test.cpp (modified) (2 diffs)

library/bdm/stat/discrete.h

@@ -59 +59 @@
                                 
                                 //precompute steps
+                                steps.set_size(dim);
                                 for ( int j = 0; j < dim; j++ ) {
                                         steps ( j ) = ( ranges ( j ) ( 1 ) - ranges(j)(0) ) / gridsizes ( j );
@@ -80 +81 @@
                                         if ( actvec_ind ( j ) == gridsizes ( j ) - 1 ) { //j-th index is full
                                                 actvec_ind ( j ) = 0; //shift back
-                                                actvec ( j ) = ranges ( j ) ( 0 );
+                                                actvec ( j ) = ranges ( j ) ( 0 ) + 0.5*steps(j);
 
-                                                if ( j+1<dim) {
-                                                        actvec_ind ( j + 1 ) ++; //increase the next dimension;
-                                                        actvec ( j + 1 ) += steps ( j + 1 );
-                                                        break;
-                                                }
+                                                //! 
+                                                if ( j+1<dim)
+                                                        if (actvec_ind ( j + 1 )<gridsizes(j+1)-1){
+                                                                actvec_ind ( j + 1 ) ++; //increase the next dimension;
+                                                                actvec ( j + 1 ) += steps ( j + 1 );
+                                                                break;
+                                                        }
 
                                         } else {
@@ -95 +98 @@
                                 }
                                 return actvec;
-                        }
-
+                        } 
+                        //! Access function
                         int points() const {return Npoints;}
+                        
+                        //! access function
+                        const vec& _steps() const {return steps;}
                         
                         void from_setting (const Setting &set) {

library/tests/egiw_test.cpp

@@ -2 +2 @@
 #include "base/user_info.h"
 #include "stat/exp_family.h"
+#include "stat/discrete.h"
 #include "itpp_ext.h"
 #include "epdf_harness.h"
@@ -44 +45 @@
 
         int n = 100;
-        vec rgr ( 3 );
-
-        mat Tmp ( 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;
-
-                                Tmp ( i, j ) = E.evallog ( rgr );
-                        }
-                }
-                summ += sumsum ( exp ( Tmp ) ) / n / n / n * 3.0 * 2.0 * 4.0;
+        rectangular_support Sup;
+        Sup.set_parameters("{[-2.,4.], [1.,5.], [0.,2.]} ", n*ones_i(E.dimension()));
+        
+        double summ = exp(E.evallog(Sup.first_vec()));
+        // sum all likelihood at all points of support
+        for ( int k = 1; k < Sup.points(); k++ ) { // ALL b
+                summ += exp (E.evallog(Sup.next_vec()));
         }
 
-        CHECK_CLOSE ( 1.0, summ, 0.1 );
+        CHECK_CLOSE ( 1.0, summ*prod(Sup._steps()), 0.01 );
 }