Trying a linear interpolation extrapolation in the computing of

likelihood for large stepm.

diff --git a/src/imach.c b/src/imach.c
index 2597f59ac231a52b0b07820cf5a89d1407292b7f..b871ef5ef7af3b52b921303a0d41348027617b93 100644 (file)
--- 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)*/