Mercurial > hg > octave-thorsten
changeset 12304:c16ce72e0a22 release-3-4-x
Deprecate glpkmex function and remove from documentation.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sun, 30 Jan 2011 07:52:36 -0800 |
| parents | 2c35dfd641ff |
| children | f8891edcfd35 |
| files | ChangeLog NEWS doc/ChangeLog doc/interpreter/optim.txi scripts/ChangeLog scripts/deprecated/glpkmex.m scripts/deprecated/module.mk scripts/optimization/glpkmex.m scripts/optimization/module.mk |
| diffstat | 8 files changed, 25 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-01-30 Rik <octave@nomad.inbox5.com> + + * NEWS: Deprecate glpkmex function. + 2011-01-30 John W. Eaton <jwe@octave.org> * acinclude.m4 (OCTAVE_PROG_GHOSTSCRIPT): Update warning message.
--- a/NEWS +++ b/NEWS @@ -409,9 +409,9 @@ be removed from Octave 3.8 (or whatever version is the second major release after 3.4): - autocor cellidx gammai replot - autocov dispatch is_global saveimage - betai fstat krylovb values + autocor cellidx gammai krylovb values + autocov dispatch glpkmex replot + betai fstat is_global saveimage * For compatibility with Matlab, mu2lin (x) is now equivalent to mu2lin (x, 0).
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2011-01-30 Rik <octave@nomad.inbox5.com> + + * interpreter/optim.txi: Deprecate glpkmex function and remove + from documentation. + 2011-01-30 John W. Eaton <jwe@octave.org> * interpreter/install.txi (Compiling Octave with 64-bit Indexing):
--- a/doc/interpreter/optim.txi +++ b/doc/interpreter/optim.txi @@ -70,8 +70,6 @@ @DOCSTRING(glpk) -@DOCSTRING(glpkmex) - @node Quadratic Programming @section Quadratic Programming
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2010-01-30 Rik <octave@nomad.inbox5.com> + + * deprecated/module.mk, optimization/module.mk: Deprecate glpkmex + function. + 2011-01-30 John W. Eaton <jwe@octave.org> * plot/__gnuplot_drawnow__.m: Rename from gnuplot_drawnow.m
rename from scripts/optimization/glpkmex.m rename to scripts/deprecated/glpkmex.m --- a/scripts/optimization/glpkmex.m +++ b/scripts/deprecated/glpkmex.m @@ -26,6 +26,13 @@ function [xopt, fopt, status, extra] = glpkmex (varargin) + persistent warned = false; + if (! warned) + warned = true; + warning ("Octave:deprecated-function", + "glpkmex is obsolete and will be removed from a future version of Octave; please use glpk instead"); + endif + ## If there is no input output the version and syntax if (nargin < 4 || nargin > 11) print_usage ();