From: N. Brouard <brouard@ined.fr>
Date: Wed, 14 Sep 2022 19:33:30 +0000 (+0000)
Subject: Summary: version 0.99r40
X-Git-Tag: imach-099s7~69
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=27dd0b79c3eb6a9463289541ef47652a736ab438;p=.git

Summary: version 0.99r40

* imach.c (Module): Fixing names of variables in T_ (thanks to Feinuo)
---

diff --git a/src/imach.c b/src/imach.c
index a3f5fb1..0984dba 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,13 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.343  2022/09/14 14:22:16  brouard
+  Summary: version 0.99r39
+
+  * imach.c (Module): Version 0.99r39 with colored dummy covariates
+  (fixed or time varying), using new last columns of
+  ILK_parameter.txt file.
+
   Revision 1.342  2022/09/11 19:54:09  brouard
   Summary: 0.99r38
 
@@ -6804,6 +6811,7 @@ void  concatwav(int wav[], int **dh, int **bh,  int **mw, int **s, double *agedc
    /*   fprintf(ficresprobmorprev," V%d=%f ",Tvqresult[nres][j],Tqresult[nres][resultmodel[nres][j]]); */
    /* } */
    for (j=1; j<= cptcovs; j++){ /* For each selected (single) quantitative value */ /* To be done*/
+     /* fprintf(ficresprobmorprev," V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][Tvresult[nres][j]]); */
      fprintf(ficresprobmorprev," V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][Tvresult[nres][j]]);
    }
    /* for(j=1;j<=cptcoveff;j++)  */
@@ -10957,7 +10965,7 @@ int decoderesult( char resultline[], int nres)
     /* k counting number of combination of single dummies in the equation model */
     /* k4 counting single dummies in the equation model */
     /* k4q counting single quantitatives in the equation model */
-    if( Dummy[k1]==0 && Typevar[k1]==0 ){ /* Dummy and Single, k1 is sorting according to MODEL, but k3 to resultline */
+    if( Dummy[k1]==0 && Typevar[k1]==0 ){ /* Dummy and Single, fixed or timevarying, k1 is sorting according to MODEL, but k3 to resultline */
        /* k4+1= (not always if quant in model) position in the resultline V(Tvarsel)=Tvalsel=Tresult[nres][pos](value); V(Tvresult[nres][pos] (variable): V(variable)=value) */
       /* modelresult[k3]=k1: k3th position in the result line corresponds to the k1 position in the model line (doesn't work with products)*/
       /* Value in the (current nres) resultline of the variable at the k1th position in the model equation resultmodel[nres][k1]= k3 */
@@ -14345,9 +14353,10 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
 	/*   printf("\n j=%d In computing T_ Dummy[modelresult[%d][%d]]=%d, modelresult[%d][%d]=%d cptcovs=%d, cptcoveff=%d Fixed[modelresult[nres][j]]=%d\n", j, nres, j, Dummy[modelresult[nres][j]],nres,j,modelresult[nres][j],cptcovs, cptcoveff,Fixed[modelresult[nres][j]]);  /\* end if dummy  or quanti *\/ */
 
 	if(Dummy[modelresult[nres][j]]==0){/* Dummy variable of the variable in position modelresult in the model corresponding to j in resultline  */
-	  printf("V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][j]); /* Output of each value for the combination TKresult[nres], ordere by the covariate values in the resultline  */
-	  fprintf(ficlog,"V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][j]); /* Output of each value for the combination TKresult[nres], ordere by the covariate values in the resultline  */
-	  fprintf(ficrest,"V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][j]); /* Output of each value for the combination TKresult[nres], ordere by the covariate values in the resultline  */
+	  /* printf("V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][j]); /\* Output of each value for the combination TKresult[nres], ordere by the covariate values in the resultline  *\/ */ /* TinvDoQresult[nres][Name of the variable] */
+	  printf("V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][Tvresult[nres][j]]); /* Output of each value for the combination TKresult[nres], ordered by the covariate values in the resultline  */
+	  fprintf(ficlog,"V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][Tvresult[nres][j]]); /* Output of each value for the combination TKresult[nres], ordere by the covariate values in the resultline  */
+	  fprintf(ficrest,"V%d=%lg ",Tvresult[nres][j],TinvDoQresult[nres][Tvresult[nres][j]]); /* Output of each value for the combination TKresult[nres], ordere by the covariate values in the resultline  */
 	  if(Fixed[modelresult[nres][j]]==0){ /* Fixed */
 	    printf("fixed ");fprintf(ficlog,"fixed ");fprintf(ficrest,"fixed ");
 	  }else{