Mercurial > hg > octave-shane
changeset 6218:c1b66b74937d
[project @ 2006-12-27 17:43:50 by jwe]
author | jwe |
---|---|
date | Wed, 27 Dec 2006 17:43:51 +0000 |
parents | 95084cd8723c |
children | ba9db82d85a8 |
files | scripts/general/interp2.m src/ChangeLog src/Makefile.in src/mappers.cc src/mex.cc src/mkbuiltins src/mkdefs src/mkdocs src/mkops |
diffstat | 9 files changed, 23 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/general/interp2.m +++ b/scripts/general/interp2.m @@ -53,16 +53,16 @@ ## ## @table @asis ## @item 'nearest' -## Return the nearest neighbour. +## Return the nearest neighbor. ## @item 'linear' -## Linear interpolation from nearest neighbours +## Linear interpolation from nearest neighbors. ## @item 'pchip' -## Piece-wise cubic hermite interpolating polynomial +## Piece-wise cubic hermite interpolating polynomial (not implemented yet). ## @item 'cubic' -## Cubic interpolation from four nearest neighbours +## Cubic interpolation from four nearest neighbors. ## @item 'spline' ## Cubic spline interpolation--smooth first and second derivatives -## throughout the curve (Not implemented yet). +## throughout the curve (not implemented yet). ## @end table ## ## If a scalar value @var{extrapval} is defined as the final value, then
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2006-12-27 John W. Eaton <jwe@octave.org> + + * Makefile.in (%.df : %.cc): Insert a "do not edit" notice in the + .df files. + + * mex.cc (mxArray_matlab::get_class_name, + mxArray_octave_value::get_class_id): Use "function_handle", not + "function handle". + 2006-12-14 John W. Eaton <jwe@octave.org> * pt-decl.cc (tree_decl_elt::eval): New function.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -26,7 +26,8 @@ %.df : %.cc @echo making $@ from $< - @(egrep '^(///*|/\*) *PKG_ADD:' $< ; \ + @(echo "// DO NOT EDIT! Generated automatically by mkdefs." ; \ + egrep '^(///*|/\*) *PKG_ADD:' $< ; \ $(CXXCPP) $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) -DMAKE_BUILTINS $< \ | $(srcdir)/mkdefs) > $@-t @$(simple-move-if-change-rule)
--- a/src/mappers.cc +++ b/src/mappers.cc @@ -470,7 +470,7 @@ \n\ @example\n\ @group\n\ -is_NA ([13, Inf, NA, NaN])\n\ +isna ([13, Inf, NA, NaN])\n\ @result{} [ 0, 0, 1, 0 ]\n\ @end group\n\ @end example\n\
--- a/src/mex.cc +++ b/src/mex.cc @@ -413,7 +413,7 @@ id = mxINT64_CLASS; else if (cn == "uint64") id = mxUINT64_CLASS; - else if (cn == "function handle") + else if (cn == "function_handle") id = mxFUNCTION_CLASS; return id; @@ -848,7 +848,7 @@ case mxUINT32_CLASS: return "uint32"; case mxINT64_CLASS: return "int64"; case mxUINT64_CLASS: return "uint64"; - case mxFUNCTION_CLASS: return "function handle"; + case mxFUNCTION_CLASS: return "function_handle"; default: return "unknown"; } }