From 3baaf7c820cc1e37068435a6c6263cd1eb2396d3 Mon Sep 17 00:00:00 2001 From: "N. Brouard" Date: Tue, 16 Dec 2014 11:20:36 +0000 Subject: [PATCH] Summary: After compiling on Visual C * imach.c (Module): Merging 1.61 to 1.162 --- src/imach.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/imach.c b/src/imach.c index b0aa4a0..378ed96 100644 --- a/src/imach.c +++ b/src/imach.c @@ -1,6 +1,11 @@ /* $Id$ $State$ $Log$ + Revision 1.164 2014/12/16 10:52:11 brouard + Summary: Merging with Visual C after suppressing some warnings for unused variables. Also fixing Saito's bug 0.98Xn + + * imach.c (Module): Merging 1.61 to 1.162 + Revision 1.163 2014/12/16 10:30:11 brouard * imach.c (Module): Merging 1.61 to 1.162 @@ -492,9 +497,8 @@ end */ +#define POWELL /* Instead of NLOPT */ - - #include #include #include @@ -2142,7 +2146,7 @@ void likelione(FILE *ficres,double p[], int npar, int nlstate, int *globpri, lon void mlikeli(FILE *ficres,double p[], int npar, int ncovmodel, int nlstate, double ftol, double (*func)(double [])) { - int i,j, iter; + int i,j, iter=0; double **xi; double fret; double fretone; /* Only one call to likelihood */ @@ -5431,7 +5435,7 @@ int main(int argc, char *argv[]) double agedeb; double ageminpar=1.e20,agemin=1.e20, agemaxpar=-1.e20, agemax=-1.e20; - + double fret; double dum; /* Dummy variable */ double ***p3mat; double ***mobaverage; -- 2.43.0