Bug in ***movingaverage

diff --git a/src/imach.c b/src/imach.c
index 78fa65f2074aa95ca97df728abe656c7c50b3673..51a090213af151529768aec9da32787e2ac34108 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -60,7 +60,7 @@
 /*#define GNUPLOTPROGRAM "..\\gp37mgw\\wgnuplot"*/
 #define FILENAMELENGTH 80
 /*#define DEBUG*/
-#define unix
+#define windows
 #define        GLOCK_ERROR_NOPATH              -1      /* empty path */
 #define        GLOCK_ERROR_GETCWD              -2      /* cannot get cwd */
 
@@ -163,7 +163,7 @@ int estepm;
 int m,nb;
 int *num, firstpass=0, lastpass=4,*cod, *ncodemax, *Tage;
 double **agev,*moisnais, *annais, *moisdc, *andc,**mint, **anint;
-double **pmmij, ***probs, ***mobaverage;
+double **pmmij, ***probs;
 double dateintmean=0;
 
 double *weight;
@@ -1819,19 +1819,26 @@ void varevsij(char optionfilefiname[], double ***vareij, double **matcov, double
   double ***mobaverage;
   int theta;
   char digit[4];
-  char digitp[16];
+  char digitp[25];
 
   char fileresprobmorprev[FILENAMELENGTH];
 
-  if(popbased==1)
-    strcpy(digitp,"-populbased-");
-  else
+  if(popbased==1){
+    if(mobilav==1)
+      strcpy(digitp,"-populbased-mobilav-");
+    else strcpy(digitp,"-populbased-nomobil-");
+  }
+  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);
@@ -2087,11 +2094,10 @@ void varevsij(char optionfilefiname[], double ***vareij, double **matcov, double
   free_matrix(doldmp,nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);
   free_matrix(dnewmp,nlstate+1,nlstate+ndeath,1,npar);
   free_matrix(varppt,nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);
-  free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
+  if (mobilav!=0) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
   fclose(ficresprobmorprev);
   fclose(ficgp);
   fclose(fichtm);
-
 }
 
 /************ Variance of prevlim ******************/
@@ -2814,6 +2820,7 @@ prevforecast(char fileres[], double anproj1,double mproj1,double jproj1,double a
   double calagedate, agelim, kk1, kk2, yp,yp1,yp2,jprojmean,mprojmean,anprojmean;
   double *popeffectif,*popcount;
   double ***p3mat;
+  double ***mobaverage;
   char fileresf[FILENAMELENGTH];
 
  agelim=AGESUP;
@@ -2921,6 +2928,7 @@ populforecast(char fileres[], double anpyram,double mpyram,double jpyram,double
   double calagedate, agelim, kk1, kk2, yp,yp1,yp2,jprojmean,mprojmean,anprojmean;
   double *popeffectif,*popcount;
   double ***p3mat,***tabpop,***tabpopprev;
+  double ***mobaverage;
   char filerespop[FILENAMELENGTH];
 
   tabpop= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);