Changeset 185

Timestamp:

10/17/08 13:34:40 (16 years ago)

Author:

smidl

Message:

correction in merger

Location:

bdm

Files:

• estim/merger.cpp (modified) (1 diff)
• stat/libEF.h (modified) (2 diffs)

bdm/estim/merger.cpp

@@ -93 +93 @@
                                         // Make marginal on rvc_i
                                         epdf* tmp_marg = Mpred->marginal ( mpdfs ( i )->_rvc() );
-                                        lw_src += tmp_marg->evalpdflog_m ( get_vec(Smp(i), irv_rvcs(i) ) );
+                                        for(int k=0;k<Ns;k++){
+                                        lw_src(k) += tmp_marg->evalpdflog ( get_vec(Smp(i), irv_rvcs(i) ) );}
                                         delete tmp_marg;
                                 }

bdm/stat/libEF.h

@@ -387 +387 @@
         void condition (const vec &cond );
         
-/*      template<class sq_M>
-        friend std::ostream &operator<< ( std::ostream &os, const mlnorm<sq_M> &ml );*/
+        template<class sq_M>
+        friend std::ostream &operator<< ( std::ostream &os,  mlnorm<sq_M> &ml );
 };
 
@@ -641 +641 @@
 ///////////
 
-// template<class sq_T>
-// std::ostream &operator<< ( std::ostream &os, const mlnorm<sq_T> &ml ){
-//      os << "A:"<< ml.A<<endl;
-//      os << "mu:"<< ml.mu_const<<endl;
-//      os << "R:" << ml.est._R().to_mat() <<endl;
-//      return os;
-// }
-// ;
+template<class sq_T>
+std::ostream &operator<< ( std::ostream &os,  mlnorm<sq_T> &ml ){
+        os << "A:"<< ml.A<<endl;
+        os << "mu:"<< ml.mu_const<<endl;
+        os << "R:" << ml.epdf._R().to_mat() <<endl;
+        return os;
+};
 
 #endif //EF_H