Summary: After compiling on Visual C

* imach.c (Module): Merging 1.61 to 1.162

diff --git a/src/imach.c b/src/imach.c
index b0aa4a00626fa095fe803df6ce576dea25ac5822..378ed9661559295e9a53c1f6e273aa6db34c97d1 100644 (file)
--- 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 <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -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;