Changeset 715

Timestamp:

11/10/09 16:07:56 (15 years ago)

Author:

mido

Message:

patch of the previous commits

Location:

library

Files:

• bdm/stat/emix.h (modified) (5 diffs)
• tests/merger_2d_test.cpp (modified) (1 diff)
• tests/merger_iter_test.cpp (modified) (1 diff)

library/bdm/stat/emix.h

@@ -159 +159 @@
                 return tmp;
         };
+
         vec evallog_mat ( const mat &Val ) const {
                 vec x = zeros ( Val.cols() );
@@ -166 +167 @@
                 return log ( x );
         };
-        /*
+
         //! Auxiliary function that returns pdflog for each component
-        mat evallog_mat ( const mat &Val ) const {
+        mat evallog_coms ( const mat &Val ) const {
                 mat X ( w.length(), Val.cols() );
                 for ( int i = 0; i < w.length(); i++ ) {
@@ -175 +176 @@
                 return X;
         };
-        */
 
         shared_ptr<epdf> marginal ( const RV &rv ) const;
@@ -215 +215 @@
                         int len = Coms.length();
                         w.set_length( len );
-                        double default_weight = 1.0 / len;
-                        for( int i=0; i < len; i++)
-                                w(i) = default_weight;
+                        w = 1.0 / len;
                 }
         }
@@ -535 +533 @@
                         int len = Coms.length();
                         w.set_length( len );
-                        double default_weight = 1.0 / len;
-                        for( int i=0; i < len; i++)
-                                w(i) = default_weight;
+                        w = 1.0 / len;
                 }
         }
 };
+SHAREDPTR( mmix );
 UIREGISTER ( mmix );
 

library/tests/merger_2d_test.cpp

@@ -59 +59 @@
 
         vec Res1 = M.evallog_mat ( Grid );
-        mat Res2 = ( MP )->evallog_mat ( Grid );
+        mat Res2 = ( MP )->evallog_coms ( Grid );
 
         it_file it ( "merger_2d_test.it" );

library/tests/merger_iter_test.cpp

@@ -61 +61 @@
 
         vec Res1 = M.evallog_mat ( Grid );
-        mat Res2 = ( ( emix* ) MP )->evallog_mat ( Grid );
+        mat Res2 = ( ( emix* ) MP )->evallog_coms ( Grid );
 
         it_file it ( "merger_iter_test.it" );