(Module): sump fixed, loop imx fixed, and simplifications.

diff --git a/src/imach.c b/src/imach.c
index 262493d430933069b3117efabe2ab3c3b9adf3dd..4051c0e912f8107eecc6099b58fe32cab0ec41c2 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.102  2004/09/15 17:31:30  brouard
+  Add the possibility to read data file including tab characters.
+
   Revision 1.101  2004/09/15 10:38:38  brouard
   Fix on curr_time
 
@@ -3918,24 +3921,22 @@ double gompertz(double x[])
   int i,n=0; /* n is the size of the sample */
   for (i=0;i<=imx-1 ; i++) {
     sump=sump+weight[i];
-    sump=sump+1;
+    /*    sump=sump+1;*/
     num=num+1;
   }
  
  
-  /* for (i=1; i<=imx; i++) 
+  /* for (i=0; i<=imx; i++) 
      if (wav[i]>0) printf("i=%d ageex=%lf agecens=%lf agedc=%lf cens=%d %d\n" ,i,ageexmed[i],agecens[i],agedc[i],cens[i],wav[i]);*/
 
-  for (i=0;i<=imx-1 ; i++)
+  for (i=1;i<=imx ; i++)
     {
       if (cens[i]==1 & wav[i]>1)
-       A=-x[1]/(x[2])*
-         (exp(x[2]/YEARM*(agecens[i]*12-agegomp*12))-exp(x[2]/YEARM*(ageexmed[i]*12-agegomp*12)));
+       A=-x[1]/(x[2])*(exp(x[2]*(agecens[i]-agegomp))-exp(x[2]*(ageexmed[i]-agegomp)));
       
       if (cens[i]==0 & wav[i]>1)
-       A=-x[1]/(x[2])*
-             (exp(x[2]/YEARM*(agedc[i]*12-agegomp*12))-exp(x[2]/YEARM*(ageexmed[i]*12-agegomp*12)))
-         +log(x[1]/YEARM)+x[2]/YEARM*(agedc[i]*12-agegomp*12)+log(YEARM);      
+       A=-x[1]/(x[2])*(exp(x[2]*(agedc[i]-agegomp))-exp(x[2]*(ageexmed[i]-agegomp)))
+            +log(x[1]/YEARM)+x[2]*(agedc[i]-agegomp)+log(YEARM);  
       
       if (wav[i]>1 & agecens[i]>15) {
        L=L+A*weight[i];