--- imach/src/imach.c	2022/09/14 14:22:16	1.343
+++ imach/src/imach.c	2022/09/14 19:33:30	1.344
@@ -1,6 +1,11 @@
-/* $Id: imach.c,v 1.343 2022/09/14 14:22:16 brouard Exp $
+/* $Id: imach.c,v 1.344 2022/09/14 19:33:30 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.344  2022/09/14 19:33:30  brouard
+  Summary: version 0.99r40
+
+  * imach.c (Module): Fixing names of variables in T_ (thanks to Feinuo)
+
   Revision 1.343  2022/09/14 14:22:16  brouard
   Summary: version 0.99r39
 
@@ -1339,12 +1344,12 @@ double gnuplotversion=GNUPLOTVERSION;
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.343 2022/09/14 14:22:16 brouard Exp $ */
+/* $Id: imach.c,v 1.344 2022/09/14 19:33:30 brouard Exp $ */
 /* $State: Exp $ */
 #include "version.h"
 char version[]=__IMACH_VERSION__;
 char copyright[]="September 2022,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2020, Nihon University 2021-202, INED 2000-2022";
-char fullversion[]="$Revision: 1.343 $ $Date: 2022/09/14 14:22:16 $"; 
+char fullversion[]="$Revision: 1.344 $ $Date: 2022/09/14 19:33:30 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -6811,6 +6816,7 @@ void  concatwav(int wav[], int **dh, int
    /*   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++)  */
@@ -10964,7 +10970,7 @@ int decoderesult( char resultline[], int
     /* 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 */
@@ -14352,9 +14358,10 @@ Please run with mle=-1 to get a correct
 	/*   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{