Summary: Version 0.99r23

* imach.c (Module): Still bugs in the result loop. Thank to Holly Benett

diff --git a/src/imach.c b/src/imach.c
index b97664aa1b3835983f852a3d5852aa63753a7d2e..5661d5b54a4f0d110957ef730a7c209f751592d3 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.307  2021/03/08 18:11:32  brouard
+  Summary: 0.99r22 fixed bug on result:
+
   Revision 1.306  2021/02/20 15:44:02  brouard
   Summary: Version 0.99r21
 
@@ -1145,7 +1148,7 @@ typedef struct {
 /* $State$ */
 #include "version.h"
 char version[]=__IMACH_VERSION__;
-char copyright[]="Feb 2021,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2020, INED 2000-2021";
+char copyright[]="March 2021,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2020, Nihon University 2021, INED 2000-2021";
 char fullversion[]="$Revision$ $Date$"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
@@ -12417,9 +12420,11 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
     /* Results */
     endishere=0;
     nresult=0;
+    parameterline=0;
     do{
       if(!fgets(line, MAXLINE, ficpar)){
        endishere=1;
+       parameterline=15;
       }else if (line[0] == '#') {
        /* If line starts with a # it is a comment */
        numlinepar++;
@@ -12438,7 +12443,7 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
       else{
        parameterline=14;
       }
-      switch (parameterline){ 
+      switch (parameterline){ /* =0 only if only comments */
       case 11:
        if((num_filled=sscanf(line,"prevforecast=%d starting-proj-date=%lf/%lf/%lf final-proj-date=%lf/%lf/%lf mobil_average=%d\n",&prevfcast,&jproj1,&mproj1,&anproj1,&jproj2,&mproj2,&anproj2,&mobilavproj)) !=EOF && (num_filled == 8)){
                  fprintf(ficparo,"prevforecast=%d starting-proj-date=%.lf/%.lf/%.lf final-proj-date=%.lf/%.lf/%.lf mobil_average=%d\n",prevfcast,jproj1,mproj1,anproj1,jproj2,mproj2,anproj2,mobilavproj);
@@ -12508,11 +12513,14 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
        }
        /* goto end; */
        break;
-      default:
+      case 15:
+       printf("End of resultlines.\n");
+       fprintf(ficlog,"End of resultlines.\n");
+       break;
+      default: /* parameterline =0 */
        nresult=1;
        decoderesult(".",nresult ); /* No covariate */
       } /* End switch parameterline */
-      parameterline=0;
     }while(endishere==0); /* End do */
     
     /* freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvaraff,nbcode, ncodemax,mint,anint); */