Changeset 395 for library/bdm/stat/merger.h

Timestamp:

06/22/09 13:17:49 (15 years ago)

Author:

smidl

Message:

merging works for merger_mx

Files:

• library/bdm/stat/merger.h (modified) (7 diffs)

library/bdm/stat/merger.h

@@ -132 +132 @@
                         }
                         // fill samples
-                        int act_dim=0; //active dimension
                         for (int i = 0; i < Npoints; i++) {
                                 // copy 
@@ -139 +138 @@
                                 for (int j = 0;j < dim;j++) {
                                         if (ind (j) == gridsize (j) - 1) { //j-th index is full
-//                                              ind (j) = 0; //shift back
+                                                ind (j) = 0; //shift back
                                                 smpi(j) = XYZ(j)(0);
                                                 
-//                                              ind (j + 1) ++; //increase the next dimension;
-                                                smpi(j+1) += steps(j+1);
+                                                if (i<Npoints-1) {
+                                                        ind (j + 1) ++; //increase the next dimension;
+                                                        smpi(j+1) += steps(j+1);
+                                                        break;
+                                                }
                                                 
-                                                if (ind (j + 1) < gridsize (j + 1) - 1) break;
                                         } else {
-//                                              ind (j) ++; 
+                                                ind (j) ++; 
                                                 smpi(j) +=steps(j);
                                                 break;
@@ -185 +186 @@
 
                 //!Merge given sources in given points
-                void merge () {
+                virtual void merge () {
                         validate();
 
@@ -205 +206 @@
                                 }
 
-                                vec wtmp = exp (merge_points (lW));
+                                vec w_nn=merge_points (lW);
+                                vec wtmp = exp (w_nn-max(w_nn));
                                 //renormalize
                                 eSmp._w() = wtmp / sum (wtmp);
@@ -277 +279 @@
                                 }
                         }
+                        if (set.exists("dbg_file")){ 
+                                string dbg_file;
+                                UI::get<string> (dbg_file, set, "dbg_file");
+                                set_debug_file(dbg_file);
+                        }
+                        //validate() - not used
                 }
 
@@ -295 +303 @@
                 //!Number of components in a mixture
                 int Ncoms;
-                //! coefficient of resampling
+                //! coefficient of resampling [0,1]
                 double effss_coef;
+                //! stop after niter iterations
+                int stop_niter;
 
         public:
@@ -338 +348 @@
                 emix* proposal() {emix* tmp = Mix.epredictor(); tmp->set_rv (rv); return tmp;}
                 //! from_settings
-                void from_settings(const Setting& set){
+                void from_setting(const Setting& set){
                         merger_base::from_setting(set);
                         set.lookupValue("ncoms",Ncoms);
+                        set.lookupValue("effss_coef",effss_coef);
+                        set.lookupValue("stop_niter",stop_niter);
                 }