Changeset 190 for bdm/estim/merger.cpp

Timestamp:

10/22/08 10:46:38 (16 years ago)

Author:

smidl

Message:

adaptation of merger for changes and creation of datalink class

Files:

• bdm/estim/merger.cpp (modified) (4 diffs)

bdm/estim/merger.cpp

@@ -33 +33 @@
         vec &w = eSmp._w(); //aux
 
-        mat Smp_ex =ones ( rv.count() +1,Ns ); // Extended samples The last row is ones for the ARX model
+        mat Smp_ex =ones ( rv.count() +1,Ns ); // Extended samples for the ARX model - the last row is ones 
         for ( int i=0;i<Ns;i++ ) {      set_col_part ( Smp_ex,i,Smp ( i ) );}
 
@@ -49 +49 @@
                  V0, rv.count() *rv.count() +3.0 ); //initial guess of Mix: zero mean, large variance
 
-
-
         // ============= MAIN LOOP ==================
         bool converged=false;
@@ -62 +60 @@
                 //Re-Initialize Mixture model
                 Mix.init ( &A0, Smp_ex, Nc );
-                Mix.bayesB ( Smp_ex );
+                Mix.bayesB ( Smp_ex, ones(Ns));//w*Ns );
                 Mpred = Mix.predictor(rv); // Allocation => must be deleted at the end!!
         
@@ -152 +150 @@
                 // ==== stopping rule ===
                 niter++;
-                converged = ( niter>6);
+                converged = ( niter>20);
         }