Changeset 378 for bdm/stat/emix.h

Timestamp:

06/17/09 23:53:08 (15 years ago)

Author:

smidl

Message:

details and compositepdf changes

Files:

• bdm/stat/emix.h (modified) (4 diffs)

bdm/stat/emix.h

@@ -234 +234 @@
         /*!\brief Constructor from list of mFacs,
         */
-        mprod ( Array<mpdf*> mFacs ) : compositepdf ( mFacs ), mpdf (), epdfs ( n ), dls ( n ) {
+        mprod (){};
+        mprod (Array<mpdf*> mFacs ){set_elements( mFacs );};
+        void set_elements(Array<mpdf*> mFacs ) {
+                
+                set_elements(mFacs);
+                
                 ep=&dummy;
                 RV rv=getrv ( true );
@@ -240 +245 @@
                 setrvc ( ep->_rv(),rvc );
                 // rv and rvc established = > we can link them with mpdfs
-                for ( int i = 0;i < n;i++ ) {
+                for ( int i = 0;i < mpdfs.length(); i++ ) {
                         dls ( i ) = new datalink_m2m;
                         dls(i)->set_connection( mpdfs ( i )->_rv(), mpdfs ( i )->_rvc(), _rv(), _rvc() );
                 }
 
-                for ( int i=0;i<n;i++ ) {
+                for ( int i=0; i<mpdfs.length(); i++ ) {
                         epdfs ( i ) =& ( mpdfs ( i )->_epdf() );
                 }
@@ -253 +258 @@
                 int i;
                 double res = 0.0;
-                for ( i = n - 1;i >= 0;i-- ) {
+                for ( i = mpdfs.length() - 1;i >= 0;i-- ) {
                         /*                      if ( mpdfs(i)->_rvc().count() >0) {
                                                         mpdfs ( i )->condition ( dls ( i )->get_cond ( val,cond ) );
@@ -272 +277 @@
                 vec smpi;
                 // Hard assumption here!!! We are going backwards, to assure that samples that are needed from smp are already generated!
-                for ( int i = ( n - 1 );i >= 0;i-- ) {
+                for ( int i = ( mpdfs.length() - 1 );i >= 0;i-- ) {
                         if ( mpdfs ( i )->dimensionc() ) {
                                 mpdfs ( i )->condition ( dls ( i )->get_cond ( smp ,cond ) ); // smp is val here!!