Use trusty

[nlopt.git] / neldermead / neldermead.h

diff --git a/neldermead/neldermead.h b/neldermead/neldermead.h
index 9531d211c65b80acb253b474ef1c30016dda039c..5041c5a2a2233e2c1e9a006a50f9ff18cfc37aa0 100644 (file)
--- a/neldermead/neldermead.h
+++ b/neldermead/neldermead.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2008 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2014 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -36,7 +36,22 @@ nlopt_result nldrmd_minimize(int n, nlopt_func f, void *f_data,
                             double *x, /* in: initial guess, out: minimizer */
                             double *minf,
                             const double *xstep, /* initial step sizes */
-                            nlopt_stopping *stop, double psi);
+                            nlopt_stopping *stop);
+
+nlopt_result nldrmd_minimize_(int n, nlopt_func f, void *f_data,
+                             const double *lb, const double *ub, /* bounds */
+                             double *x,/* in: initial guess, out: minimizer */
+                             double *minf,
+                             const double *xstep, /* initial step sizes */
+                             nlopt_stopping *stop,
+                             double psi, double *scratch, double *fdiff);
+
+nlopt_result sbplx_minimize(int n, nlopt_func f, void *f_data,
+                           const double *lb, const double *ub, /* bounds */
+                           double *x, /* in: initial guess, out: minimizer */
+                           double *minf,
+                           const double *xstep0, /* initial step sizes */
+                           nlopt_stopping *stop);
 
 #ifdef __cplusplus
 }  /* extern "C" */