version 1.55, 2002/07/24 17:00:55
|
version 1.56, 2002/07/24 17:28:25
|
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) { |
======= |
|
if(mobilav!=0) |
|
strcat(digitp,"mobilav-"); |
|
else |
|
strcat(digitp,"nomobil-"); |
|
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); |