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.247 and 1.248

version 1.247, 2016/09/02 11:11:21	version 1.248, 2016/09/07 14:10:18
Line 1	Line 1
/* $Id$	/* $Id$
$State$	$State$
$Log$	$Log$
	Revision 1.248 2016/09/07 14:10:18 brouard
	* empty log message *

Revision 1.247 2016/09/02 11:11:21 brouard	Revision 1.247 2016/09/02 11:11:21 brouard
* empty log message *	* empty log message *

Line 8843 Dummy[k] 0=dummy (0 1), 1 quantitative (	Line 8846 Dummy[k] 0=dummy (0 1), 1 quantitative (
}	}

int calandcheckages(int imx, int maxwav, double agemin, double agemax, int nberr, int nbwarn )	int calandcheckages(int imx, int maxwav, double agemin, double agemax, int nberr, int nbwarn )
{	{/* Check ages at death */
int i, m;	int i, m;
int firstone=0;	int firstone=0;

Line 9901 int main(int argc, char *argv[])	Line 9904 int main(int argc, char *argv[])
fclose (ficlog);	fclose (ficlog);
goto end;	goto end;
exit(0);	exit(0);
	} else if(mle==-2) { /* Guessing from means */
	prwizard(ncovmodel, nlstate, ndeath, model, ficparo);
	printf(" You chose mle=-2, look at file %s for a template of covariance matrix \n",filereso);
	fprintf(ficlog," You chose mle=-2, look at file %s for a template of covariance matrix \n",filereso);

} else if(mle==-5) { /* Main Wizard */	} else if(mle==-5) { /* Main Wizard */
prwizard(ncovmodel, nlstate, ndeath, model, ficparo);	prwizard(ncovmodel, nlstate, ndeath, model, ficparo);
printf(" You chose mle=-3, look at file %s for a template of covariance matrix \n",filereso);	printf(" You chose mle=-3, look at file %s for a template of covariance matrix \n",filereso);
Line 10224 Please run with mle=-1 to get a correct	Line 10232 Please run with mle=-1 to get a correct
*/	*/

concatwav(wav, dh, bh, mw, s, agedc, agev, firstpass, lastpass, imx, nlstate, stepm);	concatwav(wav, dh, bh, mw, s, agedc, agev, firstpass, lastpass, imx, nlstate, stepm);
/* */	/* Concatenates waves */

free_vector(moisdc,1,n);	free_vector(moisdc,1,n);
free_vector(andc,1,n);	free_vector(andc,1,n);
Line 10427 Interval (in months) between two waves:	Line 10435 Interval (in months) between two waves:
/* For mortality only */	/* For mortality only */
if (mle==-3){	if (mle==-3){
ximort=matrix(1,NDIM,1,NDIM);	ximort=matrix(1,NDIM,1,NDIM);
for(i=1;i<=NDIM;i++)	for(i=1;i<=NDIM;i++)
for(j=1;j<=NDIM;j++)	for(j=1;j<=NDIM;j++)
ximort[i][j]=0.;	ximort[i][j]=0.;
/* ximort=gsl_matrix_alloc(1,NDIM,1,NDIM); */	/* ximort=gsl_matrix_alloc(1,NDIM,1,NDIM); */
cens=ivector(1,n);	cens=ivector(1,n);
ageexmed=vector(1,n);	ageexmed=vector(1,n);

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

Removed from v.1.247
changed lines
	Added in v.1.248