[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.307 and 1.308

version 1.307, 2021/03/08 18:11:32 version 1.308, 2021/03/31 13:11:57
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.308  2021/03/31 13:11:57  brouard
     Summary: Version 0.99r23
   
   
     * imach.c (Module): Still bugs in the result loop. Thank to Holly Benett
   
   Revision 1.307  2021/03/08 18:11:32  brouard    Revision 1.307  2021/03/08 18:11:32  brouard
   Summary: 0.99r22 fixed bug on result:    Summary: 0.99r22 fixed bug on result:
   
Line 1148  typedef struct { Line 1154  typedef struct {
 /* $State$ */  /* $State$ */
 #include "version.h"  #include "version.h"
 char version[]=__IMACH_VERSION__;  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 fullversion[]="$Revision$ $Date$"; 
 char strstart[80];  char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];  char optionfilext[10], optionfilefiname[FILENAMELENGTH];
Line 12420  Please run with mle=-1 to get a correct Line 12426  Please run with mle=-1 to get a correct
     /* Results */      /* Results */
     endishere=0;      endishere=0;
     nresult=0;      nresult=0;
       parameterline=0;
     do{      do{
       if(!fgets(line, MAXLINE, ficpar)){        if(!fgets(line, MAXLINE, ficpar)){
         endishere=1;          endishere=1;
           parameterline=15;
       }else if (line[0] == '#') {        }else if (line[0] == '#') {
         /* If line starts with a # it is a comment */          /* If line starts with a # it is a comment */
         numlinepar++;          numlinepar++;
Line 12441  Please run with mle=-1 to get a correct Line 12449  Please run with mle=-1 to get a correct
       else{        else{
         parameterline=14;          parameterline=14;
       }        }
       switch (parameterline){         switch (parameterline){ /* =0 only if only comments */
       case 11:        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)){          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);                    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);
Line 12511  Please run with mle=-1 to get a correct Line 12519  Please run with mle=-1 to get a correct
         }          }
         /* goto end; */          /* goto end; */
         break;          break;
       default:        case 15:
           printf("End of resultlines.\n");
           fprintf(ficlog,"End of resultlines.\n");
           break;
         default: /* parameterline =0 */
         nresult=1;          nresult=1;
         decoderesult(".",nresult ); /* No covariate */          decoderesult(".",nresult ); /* No covariate */
       } /* End switch parameterline */        } /* End switch parameterline */
       parameterline=0;  
     }while(endishere==0); /* End do */      }while(endishere==0); /* End do */
           
     /* freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvaraff,nbcode, ncodemax,mint,anint); */      /* freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvaraff,nbcode, ncodemax,mint,anint); */
Removed from v.1.307  
changed lines
  Added in v.1.308

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>