[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.194 and 1.196

version 1.194, 2015/08/18 13:32:00 version 1.196, 2015/08/18 23:17:52
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.196  2015/08/18 23:17:52  brouard
     Summary: 0.98q5
   
     Revision 1.195  2015/08/18 16:28:39  brouard
     Summary: Adding a hack for testing purpose
   
     After reading the title, ftol and model lines, if the comment line has
     a q, starting with #q, the answer at the end of the run is quit. It
     permits to run test files in batch with ctest. The former workaround was
     $ echo q | imach foo.imach
   
   Revision 1.194  2015/08/18 13:32:00  brouard    Revision 1.194  2015/08/18 13:32:00  brouard
   Summary:  Adding error when the covariance matrix doesn't contain the exact number of lines required by the model line.    Summary:  Adding error when the covariance matrix doesn't contain the exact number of lines required by the model line.
   
Line 702  typedef struct { Line 713  typedef struct {
   
 /* $Id$ */  /* $Id$ */
 /* $State$ */  /* $State$ */
   #include "version.h"
 char version[]="Imach version 0.98q5, August 2015,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015";  char version[]=__IMACH_VERSION__;
   char copyright[]="August 2015,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015";
 char fullversion[]="$Revision$ $Date$";   char fullversion[]="$Revision$ $Date$"; 
 char strstart[80];  char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];  char optionfilext[10], optionfilefiname[FILENAMELENGTH];
Line 2898  void lubksb(double **a, int n, int *indx Line 2910  void lubksb(double **a, int n, int *indx
   
 void pstamp(FILE *fichier)  void pstamp(FILE *fichier)
 {  {
   fprintf(fichier,"# %s.%s\n#%s\n#%s\n# %s", optionfilefiname,optionfilext,version,fullversion,strstart);    fprintf(fichier,"# %s.%s\n#IMaCh version %s, %s\n#%s\n# %s", optionfilefiname,optionfilext,version,copyright, fullversion, strstart);
 }  }
   
 /************ Frequencies ********************/  /************ Frequencies ********************/
Line 5440  int readdata(char datafile[], int firsto Line 5452  int readdata(char datafile[], int firsto
   
   
   if((fic=fopen(datafile,"r"))==NULL)    {    if((fic=fopen(datafile,"r"))==NULL)    {
     printf("Problem while opening datafile: %s\n", datafile);return 1;      printf("Problem while opening datafile: %s\n", datafile);fflush(stdout);
     fprintf(ficlog,"Problem while opening datafile: %s\n", datafile);return 1;      fprintf(ficlog,"Problem while opening datafile: %s\n", datafile);fflush(ficlog);return 1;
   }    }
   
   i=1;    i=1;
Line 6289  int main(int argc, char *argv[]) Line 6301  int main(int argc, char *argv[])
   char pathr[MAXLINE], pathimach[MAXLINE];     char pathr[MAXLINE], pathimach[MAXLINE]; 
   char *tok, *val; /* pathtot */    char *tok, *val; /* pathtot */
   int firstobs=1, lastobs=10;    int firstobs=1, lastobs=10;
   int c,  h , cpt;    int c,  h , cpt, c2;
   int jl=0;    int jl=0;
   int i1, j1, jk, stepsize=0;    int i1, j1, jk, stepsize=0;
   int count=0;    int count=0;
Line 6365  int main(int argc, char *argv[]) Line 6377  int main(int argc, char *argv[])
   getcwd(pathcd, size);    getcwd(pathcd, size);
 #endif  #endif
   syscompilerinfo(0);    syscompilerinfo(0);
   printf("\n%s\n%s",version,fullversion);    printf("\nIMaCh version %s, %s\n%s",version, copyright, fullversion);
   if(argc <=1){    if(argc <=1){
     printf("\nEnter the parameter file name: ");      printf("\nEnter the parameter file name: ");
     fgets(pathr,FILENAMELENGTH,stdin);      fgets(pathr,FILENAMELENGTH,stdin);
Line 6505  int main(int argc, char *argv[]) Line 6517  int main(int argc, char *argv[])
     ungetc(c,ficpar);      ungetc(c,ficpar);
     fgets(line, MAXLINE, ficpar);      fgets(line, MAXLINE, ficpar);
     numlinepar++;      numlinepar++;
       if(line[1]=='q'){ /* This #q will quit imach (the answer is q) */
         z[0]=line[1];
       }
       /* printf("****line [1] = %c \n",line[1]); */
     fputs(line, stdout);      fputs(line, stdout);
     //puts(line);      //puts(line);
     fputs(line,ficparo);      fputs(line,ficparo);
Line 7849  Please run with mle=-1 to get a correct Line 7865  Please run with mle=-1 to get a correct
   }    }
   end:    end:
   while (z[0] != 'q') {    while (z[0] != 'q') {
     printf("\nType  q for exiting: ");      printf("\nType  q for exiting: "); fflush(stdout);
     scanf("%s",z);      scanf("%s",z);
   }    }
 }  }
Removed from v.1.194  
changed lines
  Added in v.1.196

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>