Summary: Bug fixed by providing frequencies only for non missing covariates

diff --git a/src/imach.c b/src/imach.c
index c25e618f86c72fb0268a640d1db4cbf31b94cbe3..a8d4bc74974182995e54489fc11f86e3e2ed1114 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.286  2018/04/27 14:27:04  brouard
+  Summary: some minor bugs
+
   Revision 1.285  2018/04/21 21:02:16  brouard
   Summary: Some bugs fixed, valgrind tested
 
@@ -5363,7 +5366,6 @@ void  concatwav(int wav[], int **dh, int **bh,  int **mw, int **s, double *agedc
        nbcode[k][j]=0; /* Valgrind */
 
    /* Loop on covariates without age and products and no quantitative variable */
-   /* for (j=1; j<=(cptcovs); j++) { /\* From model V1 + V2*age+ V3 + V3*V4 keeps V1 + V3 = 2 only *\/ */
    for (k=1; k<=cptcovt; k++) { /* From model V1 + V2*age + V3 + V3*V4 keeps V1 + V3 = 2 only */
      for (j=-1; (j < maxncov); j++) Ndum[j]=0;
      if(Dummy[k]==0 && Typevar[k] !=1){ /* Dummy covariate and not age product */ 
@@ -5381,7 +5383,11 @@ void  concatwav(int wav[], int **dh, int **bh,  int **mw, int **s, double *agedc
             modmaxcovj=ij; 
           else if (ij < modmincovj) 
             modmincovj=ij; 
-          if ((ij < -1) && (ij > NCOVMAX)){
+          if (ij <0 || ij >1 ){
+            printf("Information, IMaCh doesn't treat covariate with missing values (-1), individual %d will be skipped.\n",i);
+            fprintf(ficlog,"Information, currently IMaCh doesn't treat covariate with missing values (-1), individual %d will be skipped.\n",i);
+          }
+          if ((ij < -1) || (ij > NCOVMAX)){
             printf( "Error: minimal is less than -1 or maximal is bigger than %d. Exiting. \n", NCOVMAX );
             exit(1);
           }else
@@ -5427,12 +5433,18 @@ void  concatwav(int wav[], int **dh, int **bh,  int **mw, int **s, double *agedc
         /* nbcode[Tvar[j]][3]=2; */
         /* To be continued (not working yet). */
         ij=0; /* ij is similar to i but can jump over null modalities */
-        for (i=modmincovj; i<=modmaxcovj; i++) { /* i= 1 to 2 for dichotomous, or from 1 to 3 or from -1 or 0 to 1 currently*/
+
+        /* for (i=modmincovj; i<=modmaxcovj; i++) { */ /* i= 1 to 2 for dichotomous, or from 1 to 3 or from -1 or 0 to 1 currently*/
+        /* Skipping the case of missing values by reducing nbcode to 0 and 1 and not -1, 0, 1 */
+        /* model=V1+V2+V3, if V2=-1, 0 or 1, then nbcode[2][1]=0 and nbcode[2][2]=1 instead of
+         * nbcode[2][1]=-1, nbcode[2][2]=0 and nbcode[2][3]=1 */
+        /*, could be restored in the future */
+        for (i=0; i<=1; i++) { /* i= 1 to 2 for dichotomous, or from 1 to 3 or from -1 or 0 to 1 currently*/
           if (Ndum[i] == 0) { /* If nobody responded to this modality k */
             break;
           }
           ij++;
-          nbcode[Tvar[k]][ij]=i;  /* stores the original value of modality i in an array nbcode, ij modality from 1 to last non-nul modality. nbcode[1][1]=0 nbcode[1][2]=1*/
+          nbcode[Tvar[k]][ij]=i;  /* stores the original value of modality i in an array nbcode, ij modality from 1 to last non-nul modality. nbcode[1][1]=0 nbcode[1][2]=1 . Could be -1*/
           cptcode = ij; /* New max modality for covar j */
         } /* end of loop on modality i=-1 to 1 or more */
         break;
@@ -5448,21 +5460,7 @@ void  concatwav(int wav[], int **dh, int **bh,  int **mw, int **s, double *agedc
         break;
        } /* end switch */
      } /* end dummy test */
-    
-     /*   for (k=0; k<= cptcode; k++) { /\* k=-1 ? k=0 to 1 *\//\* Could be 1 to 4 *\//\* cptcode=modmaxcovj *\/ */
-     /*        /\*recode from 0 *\/ */
-     /*                                     k is a modality. If we have model=V1+V1*sex  */
-     /*                                     then: nbcode[1][1]=0 ; nbcode[1][2]=1; nbcode[2][1]=0 ; nbcode[2][2]=1; */
-     /*                                  But if some modality were not used, it is recoded from 0 to a newer modmaxcovj=cptcode *\/ */
-     /*        } */
-     /*        /\* cptcode = ij; *\/ /\* New max modality for covar j *\/ */
-     /*        if (ij > ncodemax[j]) { */
-     /*          printf( " Error ij=%d > ncodemax[%d]=%d\n", ij, j, ncodemax[j]);  */
-     /*          fprintf(ficlog, " Error ij=%d > ncodemax[%d]=%d\n", ij, j, ncodemax[j]); */
-     /*          break; */
-     /*        } */
-     /*   }  /\* end of loop on modality k *\/ */
-   } /* end of loop on model-covariate j. nbcode[Tvarj][1]=0 and nbcode[Tvarj][2]=1 sets the value of covariate j*/  
+   } /* end of loop on model-covariate k. nbcode[Tvark][1]=-1, nbcode[Tvark][1]=0 and nbcode[Tvark][2]=1 sets the value of covariate k*/  
   
    for (k=-1; k< maxncov; k++) Ndum[k]=0; 
    /* Look at fixed dummy (single or product) covariates to check empty modalities */