--- imach/src/imach.c	2002/07/24 17:00:55	1.55
+++ imach/src/imach.c	2002/07/25 07:37:44	1.57
@@ -1,4 +1,4 @@
-/* $Id: imach.c,v 1.55 2002/07/24 17:00:55 lievre Exp $
+/* $Id: imach.c,v 1.57 2002/07/25 07:37:44 lievre Exp $
    Interpolated Markov Chain
 
   Short summary of the programme:
@@ -1830,15 +1830,8 @@ void varevsij(char optionfilefiname[], d
   }
   else 
     strcpy(digitp,"-stablbased-");
-<<<<<<< imach.c
-  if (mobilav!=0) {
-=======
-  if(mobilav!=0)
-    strcat(digitp,"mobilav-");
-  else
-    strcat(digitp,"nomobil-");
+
   if (mobilav!=0) {
->>>>>>> 1.54
     mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
     if (movingaverage(probs, bage, fage, mobaverage,mobilav)!=0){
       fprintf(ficlog," Error in movingaverage mobilav=%d\n",mobilav);
@@ -3733,8 +3726,8 @@ printf("Total number of individuals= %d,
    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);
-   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(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);
    
    while((c=getc(ficpar))=='#' && c!= EOF){
      ungetc(c,ficpar);