Mercurial > hg > octave-lojdl
changeset 14384:4e8f1d1b0d75
maint: periodic merge of stable to default.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Sat, 18 Feb 2012 10:09:15 -0800 |
parents | e2306a8e054c (current diff) 07c55bceca23 (diff) |
children | 310039bc3dd3 |
files | configure.ac scripts/geometry/griddata3.m src/Makefile.am |
diffstat | 6 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags +++ b/.hgtags @@ -59,3 +59,4 @@ 72aebe6196414e38ef802469ff6e238f914f04c9 rc-3-6-0-0 64d9f33313cc8c691974bcd123357e24bccbabdc rc-3-6-0-1 704f7895eef03008dd79848eb9da4bfb40787d73 release-3.6.0 +95c43fc8dbe1a07a46fefb3372df5b2309d874fd rc-3-6-1-0
--- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_API_VERSION_NUMBER="48" OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" -OCTAVE_RELEASE_DATE="2012-01-15" +OCTAVE_RELEASE_DATE="2012-02-07" OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." AC_SUBST(OCTAVE_VERSION) AC_SUBST(OCTAVE_API_VERSION_NUMBER)
--- a/liboctave/Makefile.am +++ b/liboctave/Makefile.am @@ -521,7 +521,7 @@ # Increment these as needed and according to the rules in the libtool # manual: liboctave_current = 1 -liboctave_revision = 0 +liboctave_revision = 1 liboctave_age = 0 liboctave_version_info = $(liboctave_current):$(liboctave_revision):$(liboctave_age)
--- a/scripts/geometry/griddata3.m +++ b/scripts/geometry/griddata3.m @@ -17,13 +17,13 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{vi} =} griddata3 (@var{x}, @var{y}, @var{z}, @var{v} @var{xi}, @var{yi}, @var{zi}) -## @deftypefnx {Function File} {@var{vi} =} griddata3 (@var{x}, @var{y}, @var{z}, @var{v} @var{xi}, @var{yi}, @var{zi}, @var{method}) -## @deftypefnx {Function File} {@var{vi} =} griddata3 (@var{x}, @var{y}, @var{z}, @var{v} @var{xi}, @var{yi}, @var{zi}, @var{method}, @var{options}) +## @deftypefn {Function File} {@var{vi} =} griddata3 (@var{x}, @var{y}, @var{z}, @var{v}, @var{xi}, @var{yi}, @var{zi}) +## @deftypefnx {Function File} {@var{vi} =} griddata3 (@var{x}, @var{y}, @var{z}, @var{v}, @var{xi}, @var{yi}, @var{zi}, @var{method}) +## @deftypefnx {Function File} {@var{vi} =} griddata3 (@var{x}, @var{y}, @var{z}, @var{v}, @var{xi}, @var{yi}, @var{zi}, @var{method}, @var{options}) ## ## Generate a regular mesh from irregular data using interpolation. -## The function is defined by @code{@var{y} = f (@var{x},@var{y},@var{z})}. -## The interpolation points are all @var{xi}. +## The function is defined by @code{@var{v} = f (@var{x}, @var{y}, @var{z})}. +## The interpolation points are specified by @var{xi}, @var{yi}, @var{zi}. ## ## The interpolation method can be @code{"nearest"} or @code{"linear"}. ## If method is omitted it defaults to @code{"linear"}.
--- a/scripts/optimization/fminunc.m +++ b/scripts/optimization/fminunc.m @@ -350,10 +350,8 @@ gx = []; endif - if (! (isreal (fx) && isreal (jx))) + if (! (isreal (fx) && isreal (gx))) error ("fminunc:notreal", "fminunc: non-real value encountered"); - elseif (complexeqn && ! (isnumeric (fx) && isnumeric(jx))) - error ("fminunc:notnum", "fminunc: non-numeric value encountered"); elseif (any (isnan (fx(:)))) error ("fminunc:isnan", "fminunc: NaN value encountered"); endif
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -519,7 +519,7 @@ # Increment these as needed and according to the rules in the libtool manual: liboctinterp_current = 1 -liboctinterp_revision = 0 +liboctinterp_revision = 1 liboctinterp_age = 0 liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age)