Changeset 879

Timestamp:

09/30/07 15:06:38 (2 years ago)

Author:

luc

Message:

Fixed problem with prior_prob

Location:

luc/trunk

Files:

• calc_prob.cpp (modified) (1 diff)
• main.cpp (modified) (2 diffs)
• state.cpp (modified) (2 diffs)

luc/trunk/calc_prob.cpp

@@ -28 +28 @@
         double rateRtem = (1 - prevalence) * rateR;
 
-        double probtot = rateR + rateCcas + rateCtem + rateM + rateRcas + rateRtem;
+        double probtot = rateCcas + rateCtem + rateM + rateRcas + rateRtem;
 
         prob.prior.coal_cas = rateCcas / probtot;

luc/trunk/main.cpp

@@ -104 +104 @@
      environment variable GSL_RNG_TYPE */
 
-  gsl_rng *r = make_generator(27);
+  gsl_rng *r = make_generator(22);
 
   //  taux_rec_cas = rho*n_cas/2 ;
@@ -1208 +1208 @@
                 single_likelihood = my_state.get_likelihood() ;
                 average_likelihood += single_likelihood ;
+                cout << "single_likelihood : " << single_likelihood << endl ;
         }
 

luc/trunk/state.cpp

@@ -75 +75 @@
 
         likelihood(event) ;
-        //print_likelihood() ;
+        print_likelihood() ;
 
         // perform event (update container, compatibility table)
@@ -81 +81 @@
         adjust_container(event) ;
         adjust_compat_table(event) ;
-        //print_m_counts() ;
-        //print_n() ;
+        print_m_counts() ;
+        print_n() ;
 
         //print_compat_table() ;