Changeset 301 for bdm

Timestamp:

03/19/09 15:39:00 (15 years ago)

Author:

smidl

Message:

TR merging 2D example

Location:

bdm

Files:

• estim/merger.cpp (modified) (1 diff)
• stat/libBM.h (modified) (1 diff)

bdm/estim/merger.cpp

@@ -88 +88 @@
 
                         // This will be active only later in iterations!!!
-                        if ( ( !fix_smp ) & ( 1./sum_sqr ( w ) <0.5*Ns ) )
+                        if ( ( !fix_smp ) & ( 1./sum_sqr ( w ) <0.9*Ns ) )
                         {
                                 // Generate new samples

bdm/stat/libBM.h

@@ -531 +531 @@
 public:
         //!Default constructor
-        mepdf ( const epdf* em ) :mpdf ( ) {ep=const_cast<epdf*> ( em );};
+        mepdf ( epdf* em ) :mpdf ( ) {ep= em ;};
+        mepdf (const epdf* em ) :mpdf ( ) {ep=const_cast<epdf*>( em );};
         void condition ( const vec &cond ) {}
 };