Changeset 395 for library/bdm/stat/exp_family.cpp

Timestamp:

06/22/09 13:17:49 (15 years ago)

Author:

smidl

Message:

merging works for merger_mx

Files:

• library/bdm/stat/exp_family.cpp (modified) (3 diffs)

library/bdm/stat/exp_family.cpp

@@ -24 +24 @@
         if ( dimx==1 ) { //same as the following, just quicker.
                 double r = val ( vend ); //last entry!
+                if (r<0) return -1e+100;
                 vec Psi ( nPsi+dimx );
                 Psi ( 0 ) = -1.0;
@@ -34 +35 @@
                 mat Th= reshape ( val ( 0,nPsi*dimx-1 ),nPsi,dimx );
                 fsqmat R ( reshape ( val ( nPsi*dimx,vend ),dimx,dimx ) );
+                double ldetR=R.logdet();
+                if (ldetR) return -1e+100;
                 mat Tmp=concat_vertical ( -eye ( dimx ),Th );
                 fsqmat iR ( dimx );
                 R.inv ( iR );
 
-                return -0.5* ( nu*R.logdet() + trace ( iR.to_mat() *Tmp.T() *V.to_mat() *Tmp ) );
+                return -0.5* ( nu*ldetR + trace ( iR.to_mat() *Tmp.T() *V.to_mat() *Tmp ) );
         }
 }
@@ -187 +190 @@
         int i;
 
+        if (any(val<=0.)) return -1e100;
+        if (any(beta<=0.)) return -1e100;
         for ( i=0; i<dim; i++ ) {
                 res += ( alpha ( i ) - 1 ) *std::log ( val ( i ) ) - beta ( i ) *val ( i );