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.64 and 1.65

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

version 1.64, 2002/11/21 08:46:21	version 1.65, 2002/12/11 16:58:19
Line 1131 void mlikeli(FILE *ficres,double p[], in	Line 1131 void mlikeli(FILE *ficres,double p[], in
powell(p,xi,npar,ftol,&iter,&fret,func);	powell(p,xi,npar,ftol,&iter,&fret,func);

printf("\n#Number of iterations = %d, -2 Log likelihood = %.12f\n",iter,func(p));	printf("\n#Number of iterations = %d, -2 Log likelihood = %.12f\n",iter,func(p));
fprintf(ficlog,"#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));	fprintf(ficlog,"\n#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));
fprintf(ficres,"#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));	fprintf(ficres,"#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));

}	}
Line 4010 Interval (in months) between two waves:	Line 4010 Interval (in months) between two waves:
free_imatrix(mw,1,lastpass-firstpass+1,1,imx);	free_imatrix(mw,1,lastpass-firstpass+1,1,imx);
free_ivector(num,1,n);	free_ivector(num,1,n);
free_vector(agedc,1,n);	free_vector(agedc,1,n);
free_matrix(covar,0,NCOVMAX,1,n);	/free_matrix(covar,0,NCOVMAX,1,n);/
/free_matrix(covar,1,NCOVMAX,1,n);/	/free_matrix(covar,1,NCOVMAX,1,n);/
fclose(ficparo);	fclose(ficparo);
fclose(ficres);	fclose(ficres);
Line 4293 Interval (in months) between two waves:	Line 4293 Interval (in months) between two waves:
free_matrix(oldms, 1,nlstate+ndeath,1,nlstate+ndeath);	free_matrix(oldms, 1,nlstate+ndeath,1,nlstate+ndeath);
free_matrix(newms, 1,nlstate+ndeath,1,nlstate+ndeath);	free_matrix(newms, 1,nlstate+ndeath,1,nlstate+ndeath);
free_matrix(savms, 1,nlstate+ndeath,1,nlstate+ndeath);	free_matrix(savms, 1,nlstate+ndeath,1,nlstate+ndeath);

	free_matrix(covar,0,NCOVMAX,1,n);
free_matrix(matcov,1,npar,1,npar);	free_matrix(matcov,1,npar,1,npar);
free_vector(delti,1,npar);	free_vector(delti,1,npar);
free_matrix(agev,1,maxwav,1,imx);	free_matrix(agev,1,maxwav,1,imx);

Removed from v.1.64
changed lines
	Added in v.1.65