imach/src/imach.c - diff

Return to imach.c CVS log

Up to [Local Repository] / imach / src

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

version 1.194, 2015/08/18 13:32:00	version 1.195, 2015/08/18 16:28:39
Line 1	Line 1
/* $Id$	/* $Id$
$State$	$State$
$Log$	$Log$
	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 5440 int readdata(char datafile[], int firsto	Line 5448 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 6297 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 6505 int main(int argc, char *argv[])	Line 6513 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 7861 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);
}	}
}	}

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

Removed from v.1.194
changed lines
	Added in v.1.195