Changeset 311 for bdm/estim/mixef.cpp

Timestamp:

04/09/09 14:33:10 (15 years ago)

Author:

smidl

Message:

merger

Files:

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

bdm/estim/mixef.cpp

@@ -66 +66 @@
                 Wlast = W;
                 //
+                //#pragma omp parallel for
                 for ( t=0;t<ndat;t++ ) {
+                        //#pragma omp parallel for
                         for ( i=0;i<n;i++ ) {
                                 ll ( i ) =Coms ( i )->logpred ( data.get_col ( t ) );
@@ -89 +91 @@
 
                 // copy initial statistics
+                //#pragma omp parallel for
                 for ( i=0;i<n;i++ ) {
                         Coms ( i )-> set_statistics ( Coms0 ( i ) );
@@ -98 +101 @@
                 // !!!!    For typical cases wData=1.
                 for ( t=0;t<ndat;t++ ) {
+                        //#pragma omp parallel for
                         for ( i=0;i<n;i++ ) {
                                 Coms ( i )-> bayes ( data.get_col ( t ),W ( i,t ) * wData ( t ) );
@@ -106 +110 @@
                 niter++;
                 //TODO better convergence rule.
-                converged = ( sumsum ( abs ( W-Wlast ) ) /n<0.001 );
+                converged = (niter>10);//( sumsum ( abs ( W-Wlast ) ) /n<0.1 );
         }