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.276 and 1.278

version 1.276, 2017/06/30 15:48:31	version 1.278, 2017/07/19 14:09:02
Line 1	Line 1
/* $Id$	/* $Id$
$State$	$State$
$Log$	$Log$
	Revision 1.278 2017/07/19 14:09:02 brouard
	Summary: Bug for mobil_average=0 and prevforecast fixed(?)

	Revision 1.277 2017/07/17 08:53:49 brouard
	Summary: BOM files can be read now

Revision 1.276 2017/06/30 15:48:31 brouard	Revision 1.276 2017/06/30 15:48:31 brouard
Summary: Graphs improvements	Summary: Graphs improvements

Line 7942 set ter svg size 640, 480\nunset log y\n	Line 7948 set ter svg size 640, 480\nunset log y\n
double agemingoodr, agemaxgoodr;	double agemingoodr, agemaxgoodr;


/* modcovmax=2cptcoveff;/\ Max number of modalities. We suppose */	/* modcovmax=2cptcoveff; Max number of modalities. We suppose /
/* a covariate has 2 modalities, should be equal to ncovcombmax \/ /	/* a covariate has 2 modalities, should be equal to ncovcombmax */

sumnewp = vector(1,ncovcombmax);	sumnewp = vector(1,ncovcombmax);
sumnewm = vector(1,ncovcombmax);	sumnewm = vector(1,ncovcombmax);
Line 8267 set ter svg size 640, 480\nunset log y\n	Line 8273 set ter svg size 640, 480\nunset log y\n
for(j=1; j<=nlstate+ndeath;j++) {	for(j=1; j<=nlstate+ndeath;j++) {
ppij=0.;	ppij=0.;
for(i=1; i<=nlstate;i++) {	for(i=1; i<=nlstate;i++) {
/* if (mobilav>=1) */	if (mobilav>=1)
ppij=ppij+p3mat[i][j][h]*prev[(int)agec][i][k];	ppij=ppij+p3mat[i][j][h]*prev[(int)agec][i][k];
/* else { / / even if mobilav==-1 we use mobaverage */	else { /* even if mobilav==-1 we use mobaverage, probs may not sums to 1 */
/* ppij=ppij+p3mat[i][j][h]probs[(int)(agec)][i][k]; /	ppij=ppij+p3mat[i][j][h]*probs[(int)(agec)][i][k];
/* } */	}
fprintf(ficresf," %.3f", p3mat[i][j][h]);	fprintf(ficresf," %.3f", p3mat[i][j][h]);
} /* end i */	} /* end i */
fprintf(ficresf," %.3f", ppij);	fprintf(ficresf," %.3f", ppij);
Line 10613 int main(int argc, char *argv[])	Line 10619 int main(int argc, char *argv[])
int vpopbased=0;	int vpopbased=0;
int nres=0;	int nres=0;
int endishere=0;	int endishere=0;
	int noffset=0;
int ncurrv=0; /* Temporary variable */	int ncurrv=0; /* Temporary variable */

char ca[32], cb[32];	char ca[32], cb[32];
Line 10839 int main(int argc, char *argv[])	Line 10845 int main(int argc, char *argv[])
fflush(ficlog);	fflush(ficlog);
goto end;	goto end;
}	}
	/-------- Rewriting parameter file ----------/
	strcpy(rfileres,"r"); /* "Rparameterfile */
	strcat(rfileres,optionfilefiname); /* Parameter file first name */
	strcat(rfileres,"."); /* */
	strcat(rfileres,optionfilext); /* Other files have txt extension */
	if((ficres =fopen(rfileres,"w"))==NULL) {
	printf("Problem writing new parameter file: %s\n", rfileres);goto end;
	fprintf(ficlog,"Problem writing new parameter file: %s\n", rfileres);goto end;
	fflush(ficlog);
	goto end;
	}
	fprintf(ficres,"#IMaCh %s\n",version);


/* Reads comments: lines beginning with '#' */	/* Reads comments: lines beginning with '#' */
numlinepar=0;	numlinepar=0;
	/* Is it a BOM UTF-8 Windows file? */
/* First parameter line */	/* First parameter line */
while(fgets(line, MAXLINE, ficpar)) {	while(fgets(line, MAXLINE, ficpar)) {
	noffset=0;
	if( line[0] == (char)0xEF && line[1] == (char)0xBB) /* EF BB BF */
	{
	noffset=noffset+3;
	printf("# File is an UTF8 Bom.\n"); // 0xBF
	}
	else if( line[0] == (char)0xFE && line[1] == (char)0xFF)
	{
	noffset=noffset+2;
	printf("# File is an UTF16BE BOM file\n");
	}
	else if( line[0] == 0 && line[1] == 0)
	{
	if( line[2] == (char)0xFE && line[3] == (char)0xFF){
	noffset=noffset+4;
	printf("# File is an UTF16BE BOM file\n");
	}
	} else{
	;/printf(" Not a BOM file\n");/
	}

/* If line starts with a # it is a comment */	/* If line starts with a # it is a comment */
if (line[0] == '#') {	if (line[noffset] == '#') {
numlinepar++;	numlinepar++;
fputs(line,stdout);	fputs(line,stdout);
fputs(line,ficparo);	fputs(line,ficparo);
	fputs(line,ficres);
fputs(line,ficlog);	fputs(line,ficlog);
continue;	continue;
}else	}else
Line 10870 int main(int argc, char *argv[])	Line 10911 int main(int argc, char *argv[])
numlinepar++;	numlinepar++;
fputs(line,stdout);	fputs(line,stdout);
fputs(line,ficparo);	fputs(line,ficparo);
	fputs(line,ficres);
fputs(line,ficlog);	fputs(line,ficlog);
continue;	continue;
}else	}else
Line 10892 int main(int argc, char *argv[])	Line 10934 int main(int argc, char *argv[])
numlinepar++;	numlinepar++;
fputs(line,stdout);	fputs(line,stdout);
fputs(line,ficparo);	fputs(line,ficparo);
	fputs(line,ficres);
fputs(line,ficlog);	fputs(line,ficlog);
continue;	continue;
}else	}else
Line 11153 Please run with mle=-1 to get a correct	Line 11196 Please run with mle=-1 to get a correct

fflush(ficlog);	fflush(ficlog);

/-------- Rewriting parameter file ----------/
strcpy(rfileres,"r"); /* "Rparameterfile */
strcat(rfileres,optionfilefiname); /* Parameter file first name*/
strcat(rfileres,"."); /* */
strcat(rfileres,optionfilext); /* Other files have txt extension */
if((ficres =fopen(rfileres,"w"))==NULL) {
printf("Problem writing new parameter file: %s\n", rfileres);goto end;
fprintf(ficlog,"Problem writing new parameter file: %s\n", rfileres);goto end;
}
fprintf(ficres,"#%s\n",version);
} /* End of mle != -3 */	} /* End of mle != -3 */

/* Main data	/* Main data

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

Removed from v.1.276
changed lines
	Added in v.1.278