Changeset 557 for library/bdm/stat/discrete.h

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

Files:

• library/bdm/stat/discrete.h (modified) (3 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) {