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

Timestamp:

06/19/09 17:57:53 (15 years ago)

Author:

smidl

Message:

compilation fixes - UI_build use exceptions now!!!!

Files:

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

library/bdm/stat/merger.h

@@ -81 +81 @@
                 void set_sources (const Array<mpdf*> &Sources, bool own) {
                         compositepdf::set_elements (Sources,own);
+                        Nsources=mpdfs.length();
                         //set sizes
                         dls.set_size (Sources.length());
@@ -128 +129 @@
                                 smpi (j) = XYZ (j) (0); /* beginning of the interval*/ 
                                 it_assert(gridsize(j)!=0.0,"Zeros in gridsize!");
-                                steps (j) = (smpi(j) - XYZ(j)(1))/gridsize(j);
+                                steps (j) = ( XYZ(j)(1)-smpi(j) )/gridsize(j);
                         }
                         // fill samples
@@ -138 +139 @@
                                 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;
+//                                              ind (j + 1) ++; //increase the next dimension;
                                                 smpi(j+1) += steps(j+1);
                                                 
                                                 if (ind (j + 1) < gridsize (j + 1) - 1) break;
                                         } else {
-                                                ind (j) ++; 
+//                                              ind (j) ++; 
                                                 smpi(j) +=steps(j);
                                                 break;
@@ -272 +273 @@
                                         set_method (GEOMETRIC);
                                 else if (!strcmp (meth_str.c_str(), "lognormal")) {
-                                        set_method (GEOMETRIC);
+                                        set_method (LOGNORMAL);
                                         set.lookupValue( "beta",beta);
                                 }
                         }
-                        validate();
                 }