Changeset 177

Timestamp:

10/09/08 11:32:13 (16 years ago)

Author:

smidl

Message:

Simple merger test

Files:

• bdm/estim/merger.h (modified) (1 diff)
• bdm/estim/mixef.h (modified) (1 diff)
• tests/merger_test.cpp (modified) (1 diff)

bdm/estim/merger.h

@@ -43 +43 @@
         { beta=2.0; Ns=100; Nc=10;}
         //! Set internal parameters used in approximation
-        void setparameters ( double beta0, int Ns0, int Nc0 ) { beta=beta0;Ns=Ns0;Nc=Nc0;}
+        void set_parameters ( double beta0, int Ns0, int Nc0 ) {        beta=beta0;Ns=Ns0;Nc=Nc0;}
         //!Initialize the proposal density. This function must be called before merge()!
         void init() {

bdm/estim/mixef.h

@@ -66 +66 @@
                         BM ( RV() ), n ( Coms0.length() ), Coms ( n ),
                         weights ( RV ( "{w }", vec_1 ( n ) ),alpha0 ) {
-                it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
+        //      it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
 
                 for ( int i=0;i<n;i++ ) {Coms ( i ) = ( BMEF* ) Coms0 ( i )->_copy_();}

tests/merger_test.cpp

@@ -35 +35 @@
 
         merger M ( A );
-        cout << M.lognorm_merge(lW)<<endl;
-//      eEmp res=M.merge(100);
-
-
+        vec m2 = M.lognorm_merge(lW);
+        M.set_parameters(31.0/30.0,10,100);
+        vec m1 = M.lognorm_merge(lW);
+        M.set_parameters(3.0,10,100);
+        vec m3 = M.lognorm_merge(lW);
+        
+        
+        it_file it("merger_test.it");
+        it << Name("lf1") << l_f1;
+        it << Name("lf2") << l_f2;
+        it << Name("m1") << m1;
+        it << Name("m2") << m2;
+        it << Name("m3") << m3;
 }