Use trusty

[nlopt.git] / cdirect / cdirect.h

diff --git a/cdirect/cdirect.h b/cdirect/cdirect.h
index 41148a6d72db402ecb7167868549e43ce74444fd..69acb588aa8328516f8aefc29c3211ac3bd69507 100644 (file)
--- a/cdirect/cdirect.h
+++ b/cdirect/cdirect.h
@@ -1,3 +1,25 @@
+/* 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
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+ */
+
 #ifndef CDIRECT_H
 #define CDIRECT_H
 
@@ -12,21 +34,21 @@ extern "C"
 extern nlopt_result cdirect_unscaled(int n, nlopt_func f, void *f_data,
                                     const double *lb, const double *ub,
                                     double *x,
-                                    double *fmin,
+                                    double *minf,
                                     nlopt_stopping *stop,
                                     double magic_eps, int which_alg);
 
 extern nlopt_result cdirect(int n, nlopt_func f, void *f_data,
                            const double *lb, const double *ub,
                            double *x,
-                           double *fmin,
+                           double *minf,
                            nlopt_stopping *stop,
                            double magic_eps, int which_alg);
 
 extern nlopt_result cdirect_hybrid(int n, nlopt_func f, void *f_data,
                            const double *lb, const double *ub,
                            double *x,
-                           double *fmin,
+                           double *minf,
                            nlopt_stopping *stop,
                            nlopt_algorithm local_alg,
                            int local_maxeval,
@@ -35,7 +57,7 @@ extern nlopt_result cdirect_hybrid(int n, nlopt_func f, void *f_data,
 extern nlopt_result cdirect_hybrid_unscaled(int n, nlopt_func f, void *f_data,
                            const double *lb, const double *ub,
                            double *x,
-                           double *fmin,
+                           double *minf,
                            nlopt_stopping *stop,
                            nlopt_algorithm local_alg,
                            int local_maxeval,
@@ -49,7 +71,7 @@ typedef struct {
      double *x;
      const double *lb, *ub;
 } cdirect_uf_data;
-extern double cdirect_uf(int n, const double *xu, double *grad, void *d_);
+extern double cdirect_uf(unsigned n, const double *xu, double *grad, void *d_);
 
 #ifdef __cplusplus
 }  /* extern "C" */