From: N. Brouard <brouard@ined.fr>
Date: Tue, 23 May 2023 12:08:43 +0000 (+0000)
Subject: Summary: 0.99r46
X-Git-Tag: imach-099s7~44
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=41330d970c6eba5dc1ec872c5c46d844aeee258b;p=.git

Summary: 0.99r46

* imach.c (Module): Fixed PROB_r
---

diff --git a/src/imach.c b/src/imach.c
index b69bbdf..76a9ffb 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,12 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.355  2023/05/22 17:03:18  brouard
+  Summary: 0.99r46
+
+  * imach.c (Module): In the ILK....txt file, the number of columns
+  before the covariates values is dependent of the number of states (16+nlstate): 0.99r46
+
   Revision 1.354  2023/05/21 05:05:17  brouard
   Summary: Temporary change for imachprax
 
@@ -7623,7 +7629,7 @@ void varprob(char optionfilefiname[], double **matcov, double x[], double delti[
    double ***varpij;
 
    strcpy(fileresprob,"PROB_"); 
-   strcat(fileresprob,fileres);
+   strcat(fileresprob,fileresu);
    if((ficresprob=fopen(fileresprob,"w"))==NULL) {
      printf("Problem with resultfile: %s\n", fileresprob);
      fprintf(ficlog,"Problem with resultfile: %s\n", fileresprob);
@@ -8443,7 +8449,7 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
     kvar=Tvar[TvarFind[kf]]; /* variable name */
     /* k=18+Tvar[TvarFind[kf]];/\*offset because there are 18 columns in the ILK_ file but could be placed else where *\/ */
     /* k=18+kf;/\*offset because there are 18 columns in the ILK_ file *\/ */
-    /* k=19+nlstate+kf;/\*offset because there are 19 columns in the ILK_ file *\/ */
+    /* k=19+kf;/\*offset because there are 19 columns in the ILK_ file *\/ */
     k=16+nlstate+kf;/*offset because there are 19 columns in the ILK_ file, first cov Vn on col 21 with 4 living states */
     for (i=1; i<= nlstate ; i ++) {
       fprintf(ficgp,"\nset out \"%s-p%dj-%d.png\";set ylabel \"Probability for each individual/wave\";",subdirf2(optionfilefiname,"ILK_"),i,kvar);