Diff for /imach/src/imach.c between versions 1.311 and 1.313

version 1.311, 2022/04/05 21:03:51 version 1.313, 2022/04/11 15:57:42
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.313  2022/04/11 15:57:42  brouard
     * imach.c (Module): Error in rewriting the 'r' file with yearsfproj or yearsbproj fixed
   
     Revision 1.312  2022/04/05 21:24:39  brouard
     *** empty log message ***
   
   Revision 1.311  2022/04/05 21:03:51  brouard    Revision 1.311  2022/04/05 21:03:51  brouard
   Summary: Fixed quantitative covariates    Summary: Fixed quantitative covariates
   
Line 4781  Title=%s <br>Datafile=%s Firstpass=%d La Line 4787  Title=%s <br>Datafile=%s Firstpass=%d La
       */        */
       for (z1=1; z1<= nqfveff; z1++) {        for (z1=1; z1<= nqfveff; z1++) {
         fprintf(ficlog,"Mean of fixed quantitative variable V%d on %.3g (weighted) individuals sum=%f", ncovcol+z1, idq[z1], meanq[z1]);          fprintf(ficlog,"Mean of fixed quantitative variable V%d on %.3g (weighted) individuals sum=%f", ncovcol+z1, idq[z1], meanq[z1]);
         fprintf(ficlog,", mean=%.3g",meanq[z1]/idq[z1]," stdeviation=%.3g\n",stdq[z1]);          fprintf(ficlog,", mean=%.3g\n",meanq[z1]/idq[z1]);
         if(weightopt==1){          if(weightopt==1){
           printf(" Weighted mean and standard deviation of");            printf(" Weighted mean and standard deviation of");
           fprintf(ficlog," Weighted mean and standard deviation of");            fprintf(ficlog," Weighted mean and standard deviation of");
Line 12509  Please run with mle=-1 to get a correct Line 12515  Please run with mle=-1 to get a correct
           prvforecast = 1;            prvforecast = 1;
         }           } 
         else if((num_filled=sscanf(line,"prevforecast=%d yearsfproj=%lf mobil_average=%d\n",&prevfcast,&yrfproj,&mobilavproj)) !=EOF){/* && (num_filled == 3))*/          else if((num_filled=sscanf(line,"prevforecast=%d yearsfproj=%lf mobil_average=%d\n",&prevfcast,&yrfproj,&mobilavproj)) !=EOF){/* && (num_filled == 3))*/
           printf("prevforecast=%d yearsfproj=%lf.2 mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);            printf("prevforecast=%d yearsfproj=%.2lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
           fprintf(ficlog,"prevforecast=%d yearsfproj=%lf.2 mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);            fprintf(ficlog,"prevforecast=%d yearsfproj=%.2lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
           fprintf(ficres,"prevforecast=%d yearsfproj=%lf.2 mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);            fprintf(ficres,"prevforecast=%d yearsfproj=%.2lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
           prvforecast = 2;            prvforecast = 2;
         }          }
         else {          else {
Line 12532  Please run with mle=-1 to get a correct Line 12538  Please run with mle=-1 to get a correct
           prvbackcast = 1;            prvbackcast = 1;
         }           } 
         else if((num_filled=sscanf(line,"prevbackcast=%d yearsbproj=%lf mobil_average=%d\n",&prevbcast,&yrbproj,&mobilavproj)) ==3){/* && (num_filled == 3))*/          else if((num_filled=sscanf(line,"prevbackcast=%d yearsbproj=%lf mobil_average=%d\n",&prevbcast,&yrbproj,&mobilavproj)) ==3){/* && (num_filled == 3))*/
           printf("prevbackcast=%d yearsbproj=%lf.2 mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);            printf("prevbackcast=%d yearsbproj=%.2lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
           fprintf(ficlog,"prevbackcast=%d yearsbproj=%lf.2 mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);            fprintf(ficlog,"prevbackcast=%d yearsbproj=%.2lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
           fprintf(ficres,"prevbackcast=%d yearsbproj=%lf.2 mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);            fprintf(ficres,"prevbackcast=%d yearsbproj=%.2lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
           prvbackcast = 2;            prvbackcast = 2;
         }          }
         else {          else {

Removed from v.1.311  
changed lines
  Added in v.1.313


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