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.54 and 1.55

version 1.54, 2002/07/24 09:07:45	version 1.55, 2002/07/24 17:00:55
Line 60	Line 60
/#define GNUPLOTPROGRAM "..\\gp37mgw\\wgnuplot"/	/#define GNUPLOTPROGRAM "..\\gp37mgw\\wgnuplot"/
#define FILENAMELENGTH 80	#define FILENAMELENGTH 80
/#define DEBUG/	/#define DEBUG/
#define unix	#define windows
#define GLOCK_ERROR_NOPATH -1 /* empty path */	#define GLOCK_ERROR_NOPATH -1 /* empty path */
#define GLOCK_ERROR_GETCWD -2 /* cannot get cwd */	#define GLOCK_ERROR_GETCWD -2 /* cannot get cwd */

Line 163 int estepm;	Line 163 int estepm;
int m,nb;	int m,nb;
int num, firstpass=0, lastpass=4,cod, ncodemax, Tage;	int num, firstpass=0, lastpass=4,cod, ncodemax, Tage;
double *agev,moisnais, annais, moisdc, andc,mint, *anint;	double *agev,moisnais, annais, moisdc, andc,mint, *anint;
double pmmij, probs, **mobaverage;	double pmmij, *probs;
double dateintmean=0;	double dateintmean=0;

double *weight;	double *weight;
Line 1819 void varevsij(char optionfilefiname[], d	Line 1819 void varevsij(char optionfilefiname[], d
double ***mobaverage;	double ***mobaverage;
int theta;	int theta;
char digit[4];	char digit[4];
char digitp[16];	char digitp[25];

char fileresprobmorprev[FILENAMELENGTH];	char fileresprobmorprev[FILENAMELENGTH];

if(popbased==1)	if(popbased==1){
strcpy(digitp,"-populbased-");	if(mobilav==1)
else	strcpy(digitp,"-populbased-mobilav-");
	else strcpy(digitp,"-populbased-nomobil-");
	}
	else
strcpy(digitp,"-stablbased-");	strcpy(digitp,"-stablbased-");
	<<<<<<< imach.c
	if (mobilav!=0) {
	=======
if(mobilav!=0)	if(mobilav!=0)
strcat(digitp,"mobilav-");	strcat(digitp,"mobilav-");
else	else
strcat(digitp,"nomobil-");	strcat(digitp,"nomobil-");
if (mobilav!=0) {	if (mobilav!=0) {
	>>>>>>> 1.54
mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);	mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
if (movingaverage(probs, bage, fage, mobaverage,mobilav)!=0){	if (movingaverage(probs, bage, fage, mobaverage,mobilav)!=0){
fprintf(ficlog," Error in movingaverage mobilav=%d\n",mobilav);	fprintf(ficlog," Error in movingaverage mobilav=%d\n",mobilav);
Line 2087 void varevsij(char optionfilefiname[], d	Line 2094 void varevsij(char optionfilefiname[], d
free_matrix(doldmp,nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);	free_matrix(doldmp,nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);
free_matrix(dnewmp,nlstate+1,nlstate+ndeath,1,npar);	free_matrix(dnewmp,nlstate+1,nlstate+ndeath,1,npar);
free_matrix(varppt,nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);	free_matrix(varppt,nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);
free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);	if (mobilav!=0) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
fclose(ficresprobmorprev);	fclose(ficresprobmorprev);
fclose(ficgp);	fclose(ficgp);
fclose(fichtm);	fclose(fichtm);

}	}

/********** Variance of prevlim ****************/	/********** Variance of prevlim ****************/
Line 2814 prevforecast(char fileres[], double anpr	Line 2820 prevforecast(char fileres[], double anpr
double calagedate, agelim, kk1, kk2, yp,yp1,yp2,jprojmean,mprojmean,anprojmean;	double calagedate, agelim, kk1, kk2, yp,yp1,yp2,jprojmean,mprojmean,anprojmean;
double popeffectif,popcount;	double popeffectif,popcount;
double ***p3mat;	double ***p3mat;
	double ***mobaverage;
char fileresf[FILENAMELENGTH];	char fileresf[FILENAMELENGTH];

agelim=AGESUP;	agelim=AGESUP;
Line 2921 populforecast(char fileres[], double anp	Line 2928 populforecast(char fileres[], double anp
double calagedate, agelim, kk1, kk2, yp,yp1,yp2,jprojmean,mprojmean,anprojmean;	double calagedate, agelim, kk1, kk2, yp,yp1,yp2,jprojmean,mprojmean,anprojmean;
double popeffectif,popcount;	double popeffectif,popcount;
double *p3mat,tabpop,**tabpopprev;	double *p3mat,tabpop,**tabpopprev;
	double ***mobaverage;
char filerespop[FILENAMELENGTH];	char filerespop[FILENAMELENGTH];

tabpop= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);	tabpop= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);

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

Removed from v.1.54
changed lines
	Added in v.1.55