--- imach/src/imach.c	2014/12/16 10:52:11	1.164
+++ imach/src/imach.c	2014/12/16 11:20:36	1.165
@@ -1,6 +1,11 @@
-/* $Id: imach.c,v 1.164 2014/12/16 10:52:11 brouard Exp $
+/* $Id: imach.c,v 1.165 2014/12/16 11:20:36 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.165  2014/12/16 11:20:36  brouard
+  Summary: After compiling on Visual C
+
+  * imach.c (Module): Merging 1.61 to 1.162
+
   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
 
@@ -497,9 +502,8 @@
  end
 */
 
+#define POWELL /* Instead of NLOPT */
 
-
- 
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -573,11 +577,11 @@ typedef struct {
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.164 2014/12/16 10:52:11 brouard Exp $ */
+/* $Id: imach.c,v 1.165 2014/12/16 11:20:36 brouard Exp $ */
 /* $State: Exp $ */
 
 char version[]="Imach version 0.99, September 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
-char fullversion[]="$Revision: 1.164 $ $Date: 2014/12/16 10:52:11 $"; 
+char fullversion[]="$Revision: 1.165 $ $Date: 2014/12/16 11:20:36 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -2147,7 +2151,7 @@ void likelione(FILE *ficres,double p[],
 
 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 */
@@ -5436,7 +5440,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;