Changeset 637 for library/bdm/stat/exp_family.cpp

Timestamp:

09/27/09 00:58:02 (15 years ago)

Author:

smidl

Message:

new Dirichlet random walk + numerics in egiw

Files:

• library/bdm/stat/exp_family.cpp (modified) (4 diffs)

library/bdm/stat/exp_family.cpp

@@ -81 +81 @@
                      - 0.5 * dimx * ( m * log2 + 0.5 * ( dimx - 1 ) * log2pi )  - lg;
 
-        bdm_assert_debug ( ( ( -nkG - nkW ) > -Inf ) && ( ( -nkG - nkW ) < Inf ), "ARX improper" );
+//      bdm_assert_debug ( ( ( -nkG - nkW ) > -Inf ) && ( ( -nkG - nkW ) < Inf ), "ARX improper" );
+if (-nkG - nkW==Inf){
+        cout << "??" <<endl;
+}
         return -nkG - nkW;
 }
@@ -260 +263 @@
 }
 
-ivec eEmp::resample ( RESAMPLING_METHOD method ) {
-        ivec ind = zeros_i ( n );
+void eEmp::resample ( ivec &ind, RESAMPLING_METHOD method ) {
+        ind = zeros_i ( n );
         ivec N_babies = zeros_i ( n );
         vec cumDist = cumsum ( w );
@@ -334 +337 @@
         }
 
-        // copy the internals according to ind
+// copy the internals according to ind
         for ( i = 0; i < n; i++ ) {
                 if ( ind ( i ) != i ) {
@@ -341 +344 @@
                 w ( i ) = 1.0 / n;
         }
-
-        return ind;
 }