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

Diff for /imach/src/imach.c between versions 1.55 and 1.57

version 1.55, 2002/07/24 17:00:55 version 1.57, 2002/07/25 07:37:44
Line 1830  void varevsij(char optionfilefiname[], d Line 1830  void varevsij(char optionfilefiname[], d
   }    }
   else     else 
     strcpy(digitp,"-stablbased-");      strcpy(digitp,"-stablbased-");
 <<<<<<< imach.c  
   if (mobilav!=0) {  
 =======  
   if(mobilav!=0)  
     strcat(digitp,"mobilav-");  
   else  
     strcat(digitp,"nomobil-");  
   if (mobilav!=0) {    if (mobilav!=0) {
 >>>>>>> 1.54  
     mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);      mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
     if (movingaverage(probs, bage, fage, mobaverage,mobilav)!=0){      if (movingaverage(probs, bage, fage, mobaverage,mobilav)!=0){
       fprintf(ficlog," Error in movingaverage mobilav=%d\n",mobilav);        fprintf(ficlog," Error in movingaverage mobilav=%d\n",mobilav);
Line 3733  printf("Total number of individuals= %d, Line 3726  printf("Total number of individuals= %d,
    ungetc(c,ficpar);     ungetc(c,ficpar);
       
    fscanf(ficpar,"begin-prev-date=%lf/%lf/%lf end-prev-date=%lf/%lf/%lf mov_average=%d\n",&jprev1, &mprev1,&anprev1,&jprev2, &mprev2,&anprev2,&mobilav);     fscanf(ficpar,"begin-prev-date=%lf/%lf/%lf end-prev-date=%lf/%lf/%lf mov_average=%d\n",&jprev1, &mprev1,&anprev1,&jprev2, &mprev2,&anprev2,&mobilav);
    fprintf(ficparo,"begin-prev-date=%.lf/%.lf/%.lf end-prev-date=%.lf/%.lf/%.lf mov_average=%d\n",jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,&mobilav);     fprintf(ficparo,"begin-prev-date=%.lf/%.lf/%.lf end-prev-date=%.lf/%.lf/%.lf mov_average=%d\n",jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,mobilav);
    fprintf(ficres,"begin-prev-date=%.lf/%.lf/%.lf end-prev-date=%.lf/%.lf/%.lf mov_average=%d\n",jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,&mobilav);     fprintf(ficres,"begin-prev-date=%.lf/%.lf/%.lf end-prev-date=%.lf/%.lf/%.lf mov_average=%d\n",jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,mobilav);
         
    while((c=getc(ficpar))=='#' && c!= EOF){     while((c=getc(ficpar))=='#' && c!= EOF){
      ungetc(c,ficpar);       ungetc(c,ficpar);
Removed from v.1.55  
changed lines
  Added in v.1.57

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