From: stevenj Date: Fri, 20 Jul 2012 18:13:45 +0000 (-0400) Subject: version bump for 2.3 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=29f7fd0f2e75f5d5c770763349f5629e15a5e03d;p=nlopt.git version bump for 2.3 Ignore-this: 241506342a47d0b53ca11fe0e5fc493a darcs-hash:20120720181345-c8de0-e9d90197a6b988592923025b76de60250d6577b6.gz --- diff --git a/COPYRIGHT b/COPYRIGHT index 89f6680..83c9172 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/NEWS b/NEWS index 0a5b69a..0f02f23 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,24 @@ +NLopt 2.3 (20 July 2012) + +* In Matlab/Octave interface, make returning NaN from the objective + equivalent to nlopt_force_stop; thanks to Norman Violet for the suggestion. + +* Added CCSA-quadratic (NLOPT_LD_CCSAQ), similar to MMA. + +* Added interface for supplying a preconditioner (approximate Hessian); + currently only supported in CCSAQ. + +* When adding mconstraints, allow tol==NULL as synonym for zero tolerances. + +* Added missing NLOPT_LD_SLSQP constant in Matlab/Octave. + +* Lower tolerance for dual optimization in MMA/CCSAQ; thanks to + Christophe Leruste for the problem report + +* Fixed bug in timer, thanks to William Vaughn for the patch. + +* Bug fix to convergence test in sbplx; thanks to Douglas Bates. + NLopt 2.2.4 (9 June 2011) * Fixed linking problem for C++ and Python shared libraries on MacOS X; diff --git a/api/deprecated.c b/api/deprecated.c index d1db085..66fa461 100644 --- a/api/deprecated.c +++ b/api/deprecated.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/api/f77api.c b/api/f77api.c index eb4afa1..2898ba7 100644 --- a/api/f77api.c +++ b/api/f77api.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/api/f77funcs.h b/api/f77funcs.h index fed5bf3..04faa9a 100644 --- a/api/f77funcs.h +++ b/api/f77funcs.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/api/f77funcs_.h b/api/f77funcs_.h index f237231..dad13b3 100644 --- a/api/f77funcs_.h +++ b/api/f77funcs_.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/api/general.c b/api/general.c index 5ac1059..8ce76d6 100644 --- a/api/general.c +++ b/api/general.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/api/nlopt-internal.h b/api/nlopt-internal.h index d41099f..f205cbe 100644 --- a/api/nlopt-internal.h +++ b/api/nlopt-internal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/api/nlopt.3 b/api/nlopt.3 index 8e41766..72fafd6 100644 --- a/api/nlopt.3 +++ b/api/nlopt.3 @@ -728,6 +728,6 @@ is implemented for up to 1111 dimensions. .SH AUTHORS Written by Steven G. Johnson. .PP -Copyright (c) 2007-2011 Massachusetts Institute of Technology. +Copyright (c) 2007-2012 Massachusetts Institute of Technology. .SH "SEE ALSO" nlopt_minimize(3) diff --git a/api/nlopt.h b/api/nlopt.h index 46584e9..e09877d 100644 --- a/api/nlopt.h +++ b/api/nlopt.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/api/nlopt_minimize_constrained.3 b/api/nlopt_minimize_constrained.3 index f908667..8328420 100644 --- a/api/nlopt_minimize_constrained.3 +++ b/api/nlopt_minimize_constrained.3 @@ -591,6 +591,6 @@ is implemented for up to 1111 dimensions. .SH AUTHORS Written by Steven G. Johnson. .PP -Copyright (c) 2007-2011 Massachusetts Institute of Technology. +Copyright (c) 2007-2012 Massachusetts Institute of Technology. .SH "SEE ALSO" nlopt_minimize(3) diff --git a/api/optimize.c b/api/optimize.c index 80059a5..af0886f 100644 --- a/api/optimize.c +++ b/api/optimize.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/api/options.c b/api/options.c index f3a4320..4a4936e 100644 --- a/api/options.c +++ b/api/options.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/auglag/auglag.h b/auglag/auglag.h index 38af4f9..88981bf 100644 --- a/auglag/auglag.h +++ b/auglag/auglag.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/cdirect/cdirect.c b/cdirect/cdirect.c index a3685a7..3cce27b 100644 --- a/cdirect/cdirect.c +++ b/cdirect/cdirect.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/cdirect/cdirect.h b/cdirect/cdirect.h index c7a8f5c..5a3f942 100644 --- a/cdirect/cdirect.h +++ b/cdirect/cdirect.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/cdirect/hybrid.c b/cdirect/hybrid.c index 46face8..52abecc 100644 --- a/cdirect/hybrid.c +++ b/cdirect/hybrid.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/configure.ac b/configure.ac index 71d3944..0cf08ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(nlopt, 2.2.4, stevenj@alum.mit.edu) +AC_INIT(nlopt, 2.3, stevenj@alum.mit.edu) AC_CONFIG_SRCDIR(api/nlopt.h) -SHARED_VERSION_INFO="6:2:6" # CURRENT:REVISION:AGE +SHARED_VERSION_INFO="7:0:7" # CURRENT:REVISION:AGE AM_INIT_AUTOMAKE(1.7) AM_CONFIG_HEADER(config.h) diff --git a/cquad/cquad.h b/cquad/cquad.h index ea0be77..95a72c8 100644 --- a/cquad/cquad.h +++ b/cquad/cquad.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/crs/crs.c b/crs/crs.c index a1950c0..0ebe48e 100644 --- a/crs/crs.c +++ b/crs/crs.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/crs/crs.h b/crs/crs.h index f7adaed..6df9f3d 100644 --- a/crs/crs.h +++ b/crs/crs.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/isres/isres.h b/isres/isres.h index adc3e0a..258e821 100644 --- a/isres/isres.h +++ b/isres/isres.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/mlsl/mlsl.c b/mlsl/mlsl.c index 88506a4..be23438 100644 --- a/mlsl/mlsl.c +++ b/mlsl/mlsl.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/mlsl/mlsl.h b/mlsl/mlsl.h index 85d0851..7e46c7f 100644 --- a/mlsl/mlsl.h +++ b/mlsl/mlsl.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/mma/ccsa_quadratic.c b/mma/ccsa_quadratic.c index 0ef175c..7f9324b 100644 --- a/mma/ccsa_quadratic.c +++ b/mma/ccsa_quadratic.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/mma/mma.c b/mma/mma.c index 249b892..6039bbc 100644 --- a/mma/mma.c +++ b/mma/mma.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/mma/mma.h b/mma/mma.h index 7968dc8..a4e6073 100644 --- a/mma/mma.h +++ b/mma/mma.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/neldermead/neldermead.h b/neldermead/neldermead.h index b741c7d..453046d 100644 --- a/neldermead/neldermead.h +++ b/neldermead/neldermead.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/neldermead/nldrmd.c b/neldermead/nldrmd.c index 685d3d3..0fdacf8 100644 --- a/neldermead/nldrmd.c +++ b/neldermead/nldrmd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/neldermead/sbplx.c b/neldermead/sbplx.c index bcff9cd..049a645 100644 --- a/neldermead/sbplx.c +++ b/neldermead/sbplx.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/newuoa/newuoa.c b/newuoa/newuoa.c index e27e23c..2638999 100644 --- a/newuoa/newuoa.c +++ b/newuoa/newuoa.c @@ -1,5 +1,5 @@ /* Copyright (c) 2004 M. J. D. Powell (mjdp@cam.ac.uk) - * Copyright (c) 2007-2011 Massachusetts Institute of Technology + * Copyright (c) 2007-2012 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 diff --git a/octave/nlopt_optimize-mex.c b/octave/nlopt_optimize-mex.c index 85819fe..5e2df93 100644 --- a/octave/nlopt_optimize-mex.c +++ b/octave/nlopt_optimize-mex.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/octave/nlopt_optimize-oct.cc b/octave/nlopt_optimize-oct.cc index d30264e..903e6c8 100644 --- a/octave/nlopt_optimize-oct.cc +++ b/octave/nlopt_optimize-oct.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/util/nlopt-util.h b/util/nlopt-util.h index ca33df4..fa60d2b 100644 --- a/util/nlopt-util.h +++ b/util/nlopt-util.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/util/qsort_r.c b/util/qsort_r.c index 96a68b2..553df83 100644 --- a/util/qsort_r.c +++ b/util/qsort_r.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/util/redblack.c b/util/redblack.c index 43b0927..ed9ea11 100644 --- a/util/redblack.c +++ b/util/redblack.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/util/redblack.h b/util/redblack.h index f40baf3..9bb8bd0 100644 --- a/util/redblack.h +++ b/util/redblack.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/util/redblack_test.c b/util/redblack_test.c index bfd785f..0729309 100644 --- a/util/redblack_test.c +++ b/util/redblack_test.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/util/rescale.c b/util/rescale.c index baca89e..11f2608 100644 --- a/util/rescale.c +++ b/util/rescale.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/util/stop.c b/util/stop.c index d052d0e..94c60fe 100644 --- a/util/stop.c +++ b/util/stop.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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 diff --git a/util/timer.c b/util/timer.c index 99fa344..9b5956e 100644 --- a/util/timer.c +++ b/util/timer.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2011 Massachusetts Institute of Technology +/* Copyright (c) 2007-2012 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