Mercurial > octave-nkf
changeset 6220:0c3537d2a844
[project @ 2006-12-30 17:29:34 by jwe]
| author | jwe |
|---|---|
| date | Sat, 30 Dec 2006 17:29:35 +0000 |
| parents | ba9db82d85a8 |
| children | 8e0f1eda266b |
| files | scripts/ChangeLog scripts/plot/fplot.m scripts/sparse/spfun.m src/ChangeLog src/ov-fcn-inline.cc |
| diffstat | 5 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Wed Dec 27 17:53:34 2006 +0000 +++ b/scripts/ChangeLog Sat Dec 30 17:29:35 2006 +0000 @@ -1,3 +1,8 @@ +2006-12-30 John W. Eaton <jwe@octave.org> + + * sparse/spfun.m: Check for "function_handle" not "function handle". + * plot/fplot.m: Likewise. Use isa instead of strcmp + class. + 2006-12-27 Søren Hauberg <hauberg@gmail.com> * image/imshow.m: Strip NaNs from image.
--- a/scripts/plot/fplot.m Wed Dec 27 17:53:34 2006 +0000 +++ b/scripts/plot/fplot.m Sat Dec 30 17:29:35 2006 +0000 @@ -44,8 +44,7 @@ x = linspace (limits(1), limits(2), n)'; - if (strcmp (class (fn), "inline function") - || strcmp (class (fn), "function handle")) + if (isa (fn, "inline function") || isa (fn, "function_handle")) y = fn (x); elseif (all (isalnum (fn))) y = feval (fn, x);
--- a/scripts/sparse/spfun.m Wed Dec 27 17:53:34 2006 +0000 +++ b/scripts/sparse/spfun.m Sat Dec 30 17:29:35 2006 +0000 @@ -35,7 +35,7 @@ [m,n] = size(s); end - if (isa (f, "function handle") || isa (f, "inline function")) + if (isa (f, "function_handle") || isa (f, "inline function")) t = sparse(i,j,f(v),m,n); else t = sparse(i,j,feval(f,v),m,n);
--- a/src/ChangeLog Wed Dec 27 17:53:34 2006 +0000 +++ b/src/ChangeLog Sat Dec 30 17:29:35 2006 +0000 @@ -1,3 +1,8 @@ +2006-12-30 John W. Eaton <jwe@octave.org> + + * ov-fcn-inline.cc: For compatibility, class id is + "function_handle", not "inline function". + 2006-12-27 John W. Eaton <jwe@octave.org> * Makefile.in (%.df : %.cc): Insert a "do not edit" notice in the
--- a/src/ov-fcn-inline.cc Wed Dec 27 17:53:34 2006 +0000 +++ b/src/ov-fcn-inline.cc Sat Dec 30 17:29:35 2006 +0000 @@ -51,7 +51,7 @@ DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_fcn_inline, "inline function", - "inline function"); + "function_handle"); octave_fcn_inline::octave_fcn_inline (const std::string& f, const string_vector& a,