From: Agnès Lièvre <agnes.lievre@education.gouv.fr>
Date: Wed, 20 Nov 2002 17:35:59 +0000 (+0000)
Subject: Trying a linear interpolation extrapolation in the computing of
X-Git-Tag: imach-099s7~652
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=fdddea19e3421cd2c4effa4a62cd6d3ace00be2b;p=.git

Trying a linear interpolation extrapolation in the computing of
likelihood for large stepm.
---

diff --git a/src/imach.c b/src/imach.c
index 2597f59..b871ef5 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -969,7 +969,11 @@ double func( double *x)
 	s1=s[mw[mi][i]][i];
 	s2=s[mw[mi+1][i]][i];
 	bbh=(double)bh[mi][i]/(double)stepm;
-	lli= (savm[s1][s2]>(double)1.e-8 ?(1.+bbh)*log(out[s1][s2])- bbh*log(savm[s1][s2]):log((1.+bbh)*out[s1][s2]));
+
+	/*	lli= (savm[s1][s2]>(double)1.e-8 ?(1.+bbh)*log(out[s1][s2])- bbh*log(savm[s1][s2]):log((1.+bbh)*out[s1][s2]));*/
+
+	lli= (savm[s1][s2]>(double)1.e-8 ?log((1.+bbh)*out[s1][s2]- bbh*(savm[s1][s2])):log((1.+bbh)*out[s1][s2])); /* linear interpolation */
+
 	/*lli= (savm[s1][s2]>1.e-8 ?(1.+bbh)*log(out[s1][s2])- bbh*log(savm[s1][s2]):log((1.-bbh)*out[s1][s2]));*/
 	/*lli=(1.+bbh)*log(out[s1][s2])- bbh*log(savm[s1][s2]);*/
 	/*if(lli ==000.0)*/