Mercurial > octave-nkf
annotate scripts/polynomial/spline.m @ 19627:446c46af4b42 stable
strip trailing whitespace from most source files
* Makefile.am, NEWS, build-aux/common.mk, configure.ac,
doc/Makefile.am, doc/doxyhtml/Makefile.am,
doc/interpreter/Makefile.am, doc/interpreter/arith.txi,
doc/interpreter/audio.txi, doc/interpreter/basics.txi,
doc/interpreter/bugs.txi, doc/interpreter/container.txi,
doc/interpreter/cp-idx.txi, doc/interpreter/data.txi,
doc/interpreter/debug.txi, doc/interpreter/diagperm.txi,
doc/interpreter/diffeq.txi, doc/interpreter/doccheck/README,
doc/interpreter/doccheck/spellcheck, doc/interpreter/emacs.txi,
doc/interpreter/errors.txi, doc/interpreter/eval.txi,
doc/interpreter/expr.txi, doc/interpreter/external.txi,
doc/interpreter/fn-idx.txi, doc/interpreter/func.txi,
doc/interpreter/geometry.txi, doc/interpreter/geometryimages.m,
doc/interpreter/gpl.txi, doc/interpreter/grammar.txi,
doc/interpreter/gui.txi, doc/interpreter/image.txi,
doc/interpreter/install.txi, doc/interpreter/interp.txi,
doc/interpreter/interpimages.m, doc/interpreter/intro.txi,
doc/interpreter/io.txi, doc/interpreter/java.txi,
doc/interpreter/linalg.txi, doc/interpreter/macros.texi,
doc/interpreter/matrix.txi, doc/interpreter/munge-texi.pl,
doc/interpreter/nonlin.txi, doc/interpreter/numbers.txi,
doc/interpreter/obsolete.txi, doc/interpreter/octave-config.1,
doc/interpreter/octave.texi, doc/interpreter/oop.txi,
doc/interpreter/op-idx.txi, doc/interpreter/optim.txi,
doc/interpreter/package.txi, doc/interpreter/plot.txi,
doc/interpreter/poly.txi, doc/interpreter/preface.txi,
doc/interpreter/quad.txi, doc/interpreter/set.txi,
doc/interpreter/signal.txi, doc/interpreter/sparse.txi,
doc/interpreter/sparseimages.m, doc/interpreter/splineimages.m,
doc/interpreter/stats.txi, doc/interpreter/stmt.txi,
doc/interpreter/strings.txi, doc/interpreter/system.txi,
doc/interpreter/testfun.txi, doc/interpreter/tips.txi,
doc/interpreter/var.txi, doc/interpreter/vectorize.txi,
doc/liboctave/Makefile.am, doc/liboctave/array.texi,
doc/liboctave/bugs.texi, doc/liboctave/cp-idx.texi,
doc/liboctave/dae.texi, doc/liboctave/diffeq.texi,
doc/liboctave/error.texi, doc/liboctave/factor.texi,
doc/liboctave/fn-idx.texi, doc/liboctave/gpl.texi,
doc/liboctave/install.texi, doc/liboctave/intro.texi,
doc/liboctave/liboctave.texi, doc/liboctave/matvec.texi,
doc/liboctave/nleqn.texi, doc/liboctave/nlfunc.texi,
doc/liboctave/ode.texi, doc/liboctave/optim.texi,
doc/liboctave/preface.texi, doc/liboctave/quad.texi,
doc/liboctave/range.texi, doc/refcard/Makefile.am,
doc/refcard/refcard.tex, etc/HACKING, etc/NEWS.1, etc/NEWS.2,
etc/NEWS.3, etc/OLD-ChangeLogs/ChangeLog,
etc/OLD-ChangeLogs/doc-ChangeLog,
etc/OLD-ChangeLogs/scripts-ChangeLog,
etc/OLD-ChangeLogs/src-ChangeLog, etc/OLD-ChangeLogs/test-ChangeLog,
etc/PROJECTS, etc/README.Cygwin, etc/README.MacOS, etc/README.MinGW,
etc/README.gnuplot, etc/gdbinit, etc/icons/Makefile.am,
examples/@polynomial/end.m, examples/@polynomial/subsasgn.m,
examples/Makefile.am, examples/standalonebuiltin.cc,
libgui/Makefile.am, libgui/qterminal/libqterminal/README,
libgui/qterminal/libqterminal/unix/BlockArray.cpp,
libgui/qterminal/libqterminal/unix/BlockArray.h,
libgui/qterminal/libqterminal/unix/Character.h,
libgui/qterminal/libqterminal/unix/CharacterColor.h,
libgui/qterminal/libqterminal/unix/Emulation.cpp,
libgui/qterminal/libqterminal/unix/Emulation.h,
libgui/qterminal/libqterminal/unix/Filter.cpp,
libgui/qterminal/libqterminal/unix/Filter.h,
libgui/qterminal/libqterminal/unix/History.cpp,
libgui/qterminal/libqterminal/unix/History.h,
libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp,
libgui/qterminal/libqterminal/unix/KeyboardTranslator.h,
libgui/qterminal/libqterminal/unix/LineFont.h,
libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp,
libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h,
libgui/qterminal/libqterminal/unix/Screen.cpp,
libgui/qterminal/libqterminal/unix/Screen.h,
libgui/qterminal/libqterminal/unix/ScreenWindow.cpp,
libgui/qterminal/libqterminal/unix/ScreenWindow.h,
libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp,
libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.h,
libgui/qterminal/libqterminal/unix/Vt102Emulation.h,
libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp,
libgui/qterminal/qterminal/main.cpp,
libgui/src/m-editor/file-editor-tab.cc, libgui/src/octave-gui.cc,
libgui/src/octave-qt-link.cc, libinterp/corefcn/data.cc,
libinterp/corefcn/defun-int.h, libinterp/corefcn/det.cc,
libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/graphics.cc,
libinterp/corefcn/graphics.in.h, libinterp/corefcn/ls-mat5.cc,
libinterp/corefcn/lu.cc, libinterp/corefcn/oct-tex-parser.yy,
libinterp/corefcn/oct-tex-symbols.in, libinterp/corefcn/quadcc.cc,
libinterp/corefcn/zfstream.cc, libinterp/dldfcn/__eigs__.cc,
libinterp/dldfcn/__voronoi__.cc, libinterp/gendoc.pl,
libinterp/genprops.awk, libinterp/mk-errno-list, libinterp/mk-pkg-add,
libinterp/mkbuiltins, libinterp/mkdefs, libinterp/mkdocs,
libinterp/mkops, libinterp/octave-value/ov-java.cc,
libinterp/parse-tree/lex.ll, libinterp/parse-tree/oct-parse.in.yy,
libinterp/parse-tree/octave.gperf, liboctave/Makefile.am,
liboctave/array/Array.cc, liboctave/array/module.mk,
liboctave/cruft/daspk/datv.f, liboctave/cruft/daspk/dcnst0.f,
liboctave/cruft/daspk/dcnstr.f, liboctave/cruft/daspk/ddasic.f,
liboctave/cruft/daspk/ddasid.f, liboctave/cruft/daspk/ddasik.f,
liboctave/cruft/daspk/ddaspk.f, liboctave/cruft/daspk/ddstp.f,
liboctave/cruft/daspk/ddwnrm.f, liboctave/cruft/daspk/dfnrmd.f,
liboctave/cruft/daspk/dfnrmk.f, liboctave/cruft/daspk/dhels.f,
liboctave/cruft/daspk/dheqr.f, liboctave/cruft/daspk/dinvwt.f,
liboctave/cruft/daspk/dlinsd.f, liboctave/cruft/daspk/dlinsk.f,
liboctave/cruft/daspk/dmatd.f, liboctave/cruft/daspk/dnedd.f,
liboctave/cruft/daspk/dnedk.f, liboctave/cruft/daspk/dnsd.f,
liboctave/cruft/daspk/dnsid.f, liboctave/cruft/daspk/dnsik.f,
liboctave/cruft/daspk/dnsk.f, liboctave/cruft/daspk/dorth.f,
liboctave/cruft/daspk/dslvd.f, liboctave/cruft/daspk/dslvk.f,
liboctave/cruft/daspk/dspigm.f, liboctave/cruft/daspk/dyypnw.f,
liboctave/cruft/dasrt/ddasrt.f, liboctave/cruft/dasrt/drchek.f,
liboctave/cruft/dassl/ddaslv.f, liboctave/cruft/dassl/ddassl.f,
liboctave/cruft/misc/blaswrap.c, liboctave/cruft/misc/module.mk,
liboctave/cruft/odepack/cfode.f, liboctave/cruft/odepack/dlsode.f,
liboctave/cruft/odepack/ewset.f, liboctave/cruft/odepack/intdy.f,
liboctave/cruft/odepack/prepj.f, liboctave/cruft/odepack/sintdy.f,
liboctave/cruft/odepack/slsode.f, liboctave/cruft/odepack/solsy.f,
liboctave/cruft/odepack/ssolsy.f, liboctave/cruft/odepack/stode.f,
liboctave/cruft/odepack/vnorm.f, liboctave/cruft/ranlib/Basegen.doc,
liboctave/cruft/ranlib/README, liboctave/cruft/ranlib/genbet.f,
liboctave/cruft/ranlib/genexp.f, liboctave/cruft/ranlib/gennch.f,
liboctave/cruft/ranlib/gennf.f, liboctave/cruft/ranlib/gennor.f,
liboctave/cruft/ranlib/getsd.f, liboctave/cruft/ranlib/initgn.f,
liboctave/cruft/ranlib/phrtsd.f, liboctave/cruft/ranlib/randlib.fdoc,
liboctave/cruft/ranlib/setsd.f, liboctave/cruft/ranlib/tstgmn.for,
liboctave/cruft/ranlib/tstmid.for, liboctave/cruft/slatec-fn/atanh.f,
liboctave/cruft/slatec-fn/datanh.f,
liboctave/cruft/slatec-fn/xgmainc.f,
liboctave/cruft/slatec-fn/xsgmainc.f, liboctave/numeric/module.mk,
liboctave/operators/mk-ops.awk, liboctave/operators/mx-ops,
liboctave/operators/sparse-mk-ops.awk,
liboctave/operators/sparse-mx-ops, liboctave/operators/vx-ops,
liboctave/util/module.mk, run-octave.in, scripts/@ftp/ftp.m,
scripts/audio/wavread.m, scripts/deprecated/java_convert_matrix.m,
scripts/deprecated/java_debug.m, scripts/deprecated/java_invoke.m,
scripts/deprecated/java_new.m,
scripts/deprecated/java_unsigned_conversion.m,
scripts/deprecated/javafields.m, scripts/deprecated/javamethods.m,
scripts/deprecated/shell_cmd.m, scripts/general/accumarray.m,
scripts/general/display.m, scripts/general/fieldnames.m,
scripts/general/interp1.m, scripts/general/interp2.m,
scripts/general/interp3.m, scripts/general/isa.m,
scripts/general/methods.m, scripts/general/sortrows.m,
scripts/geometry/convhull.m, scripts/geometry/delaunay.m,
scripts/geometry/delaunay3.m, scripts/geometry/delaunayn.m,
scripts/geometry/griddata.m, scripts/geometry/griddatan.m,
scripts/geometry/voronoi.m, scripts/geometry/voronoin.m,
scripts/gui/guihandles.m, scripts/gui/inputdlg.m,
scripts/gui/listdlg.m, scripts/gui/msgbox.m, scripts/gui/questdlg.m,
scripts/gui/uigetfile.m, scripts/gui/waitbar.m, scripts/gui/warndlg.m,
scripts/help/doc.m, scripts/help/help.m, scripts/help/type.m,
scripts/image/bone.m, scripts/image/cmpermute.m,
scripts/image/cmunique.m, scripts/image/colorcube.m,
scripts/image/colormap.m, scripts/image/contrast.m,
scripts/image/gray2ind.m, scripts/image/image.m,
scripts/image/imshow.m, scripts/image/ind2gray.m, scripts/image/jet.m,
scripts/image/rgb2ntsc.m, scripts/image/spinmap.m,
scripts/io/importdata.m, scripts/io/strread.m, scripts/io/textread.m,
scripts/io/textscan.m, scripts/java/java_get.m,
scripts/java/java_set.m, scripts/java/javaaddpath.m,
scripts/java/javaclasspath.m, scripts/java/javamem.m,
scripts/linear-algebra/linsolve.m, scripts/linear-algebra/qzhess.m,
scripts/miscellaneous/debug.m, scripts/miscellaneous/desktop.m,
scripts/miscellaneous/dir.m, scripts/miscellaneous/dos.m,
scripts/miscellaneous/edit.m, scripts/miscellaneous/fact.m,
scripts/miscellaneous/getappdata.m, scripts/miscellaneous/inputname.m,
scripts/miscellaneous/license.m, scripts/miscellaneous/ls_command.m,
scripts/miscellaneous/run.m, scripts/miscellaneous/setfield.m,
scripts/miscellaneous/unix.m, scripts/miscellaneous/ver.m,
scripts/mk-pkg-add, scripts/mkdoc.pl,
scripts/optimization/fminsearch.m, scripts/optimization/optimset.m,
scripts/optimization/sqp.m, scripts/pkg/pkg.m,
scripts/pkg/private/create_pkgadddel.m,
scripts/pkg/private/fix_depends.m, scripts/pkg/private/install.m,
scripts/plot/appearance/axis.m, scripts/plot/appearance/box.m,
scripts/plot/appearance/clabel.m, scripts/plot/appearance/daspect.m,
scripts/plot/appearance/datetick.m, scripts/plot/appearance/grid.m,
scripts/plot/appearance/legend.m, scripts/plot/appearance/orient.m,
scripts/plot/appearance/shading.m, scripts/plot/appearance/text.m,
scripts/plot/appearance/title.m, scripts/plot/appearance/xlabel.m,
scripts/plot/appearance/ylabel.m, scripts/plot/appearance/zlabel.m,
scripts/plot/draw/area.m, scripts/plot/draw/bar.m,
scripts/plot/draw/barh.m, scripts/plot/draw/colorbar.m,
scripts/plot/draw/contour.m, scripts/plot/draw/contour3.m,
scripts/plot/draw/contourf.m, scripts/plot/draw/ellipsoid.m,
scripts/plot/draw/errorbar.m, scripts/plot/draw/ezcontour.m,
scripts/plot/draw/ezcontourf.m, scripts/plot/draw/ezmesh.m,
scripts/plot/draw/ezpolar.m, scripts/plot/draw/fill.m,
scripts/plot/draw/fplot.m, scripts/plot/draw/hist.m,
scripts/plot/draw/meshc.m, scripts/plot/draw/meshz.m,
scripts/plot/draw/pareto.m, scripts/plot/draw/patch.m,
scripts/plot/draw/peaks.m, scripts/plot/draw/pie.m,
scripts/plot/draw/pie3.m, scripts/plot/draw/plot.m,
scripts/plot/draw/plotyy.m, scripts/plot/draw/private/__bar__.m,
scripts/plot/draw/private/__contour__.m,
scripts/plot/draw/private/__errplot__.m,
scripts/plot/draw/private/__ezplot__.m,
scripts/plot/draw/private/__patch__.m,
scripts/plot/draw/private/__stem__.m, scripts/plot/draw/rectangle.m,
scripts/plot/draw/ribbon.m, scripts/plot/draw/rose.m,
scripts/plot/draw/scatter.m, scripts/plot/draw/scatter3.m,
scripts/plot/draw/semilogx.m, scripts/plot/draw/shrinkfaces.m,
scripts/plot/draw/sombrero.m, scripts/plot/draw/sphere.m,
scripts/plot/draw/stairs.m, scripts/plot/draw/stem.m,
scripts/plot/draw/stemleaf.m, scripts/plot/draw/surf.m,
scripts/plot/draw/surface.m, scripts/plot/draw/surfc.m,
scripts/plot/draw/surfl.m, scripts/plot/draw/surfnorm.m,
scripts/plot/draw/tetramesh.m, scripts/plot/draw/trimesh.m,
scripts/plot/draw/triplot.m, scripts/plot/draw/trisurf.m,
scripts/plot/util/__gnuplot_drawnow__.m,
scripts/plot/util/__plt_get_axis_arg__.m, scripts/plot/util/axes.m,
scripts/plot/util/clf.m, scripts/plot/util/copyobj.m,
scripts/plot/util/figure.m, scripts/plot/util/gcbo.m,
scripts/plot/util/graphics_toolkit.m, scripts/plot/util/hggroup.m,
scripts/plot/util/meshgrid.m, scripts/plot/util/newplot.m,
scripts/plot/util/print.m,
scripts/plot/util/private/__add_default_menu__.m,
scripts/plot/util/private/__fltk_print__.m,
scripts/plot/util/private/__gnuplot_print__.m,
scripts/plot/util/private/__print_parse_opts__.m,
scripts/plot/util/refreshdata.m, scripts/plot/util/subplot.m,
scripts/polynomial/conv.m, scripts/polynomial/poly.m,
scripts/polynomial/polyeig.m, scripts/polynomial/polyfit.m,
scripts/polynomial/polyval.m,
scripts/polynomial/private/__splinefit__.m,
scripts/polynomial/spline.m, scripts/prefs/prefdir.m,
scripts/prefs/preferences.m, scripts/prefs/private/prefsfile.m,
scripts/prefs/rmpref.m, scripts/signal/freqz.m,
scripts/signal/module.mk, scripts/sparse/eigs.m, scripts/sparse/pcg.m,
scripts/sparse/private/__sprand_impl__.m, scripts/sparse/sprand.m,
scripts/sparse/sprandn.m, scripts/sparse/spy.m, scripts/sparse/svds.m,
scripts/specfun/expint.m, scripts/specfun/factor.m,
scripts/special-matrix/gallery.m, scripts/special-matrix/hankel.m,
scripts/special-matrix/toeplitz.m, scripts/startup/inputrc,
scripts/statistics/base/kurtosis.m, scripts/statistics/base/moment.m,
scripts/statistics/base/qqplot.m, scripts/statistics/base/var.m,
scripts/statistics/distributions/betarnd.m,
scripts/statistics/distributions/binoinv.m,
scripts/statistics/distributions/binopdf.m,
scripts/statistics/distributions/binornd.m,
scripts/statistics/distributions/cauchy_rnd.m,
scripts/statistics/distributions/chi2rnd.m,
scripts/statistics/distributions/discrete_pdf.m,
scripts/statistics/distributions/discrete_rnd.m,
scripts/statistics/distributions/empirical_rnd.m,
scripts/statistics/distributions/exprnd.m,
scripts/statistics/distributions/frnd.m,
scripts/statistics/distributions/gamrnd.m,
scripts/statistics/distributions/geornd.m,
scripts/statistics/distributions/hygernd.m,
scripts/statistics/distributions/kolmogorov_smirnov_cdf.m,
scripts/statistics/distributions/laplace_cdf.m,
scripts/statistics/distributions/laplace_pdf.m,
scripts/statistics/distributions/logistic_cdf.m,
scripts/statistics/distributions/logistic_pdf.m,
scripts/statistics/distributions/lognrnd.m,
scripts/statistics/distributions/nbincdf.m,
scripts/statistics/distributions/nbininv.m,
scripts/statistics/distributions/nbinpdf.m,
scripts/statistics/distributions/nbinrnd.m,
scripts/statistics/distributions/normrnd.m,
scripts/statistics/distributions/poissinv.m,
scripts/statistics/distributions/poissrnd.m,
scripts/statistics/distributions/tinv.m,
scripts/statistics/distributions/trnd.m,
scripts/statistics/distributions/unidcdf.m,
scripts/statistics/distributions/unidpdf.m,
scripts/statistics/distributions/unidrnd.m,
scripts/statistics/distributions/unifrnd.m,
scripts/statistics/distributions/wblrnd.m,
scripts/statistics/models/module.mk,
scripts/statistics/tests/kruskal_wallis_test.m,
scripts/strings/base2dec.m, scripts/strings/deblank.m,
scripts/strings/dec2base.m, scripts/strings/dec2bin.m,
scripts/strings/dec2hex.m, scripts/strings/mat2str.m,
scripts/strings/ostrsplit.m, scripts/strings/regexptranslate.m,
scripts/strings/str2num.m, scripts/strings/strcat.m,
scripts/strings/strjoin.m, scripts/strings/strsplit.m,
scripts/strings/strtok.m, scripts/strings/strtrim.m,
scripts/strings/strtrunc.m, scripts/strings/substr.m,
scripts/testfun/__run_test_suite__.m, scripts/testfun/speed.m,
scripts/testfun/test.m, scripts/time/asctime.m,
scripts/time/datenum.m, scripts/time/datevec.m,
scripts/time/weekday.m, src/Makefile.am, test/Makefile.am,
test/build-bc-overload-tests.sh, test/build-sparse-tests.sh,
test/jit.tst, test/line-continue.tst: Strip trailing whitespace.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 08:26:57 -0500 |
parents | 3232956a6081 |
children | 4197fc428c7d |
rev | line source |
---|---|
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
14872
diff
changeset
|
1 ## Copyright (C) 2000-2013 Kai Habel |
5824 | 2 ## Copyright (C) 2006 David Bateman |
3 ## | |
4 ## This file is part of Octave. | |
5 ## | |
6 ## Octave is free software; you can redistribute it and/or modify it | |
7 ## under the terms of the GNU General Public License as published by | |
7016 | 8 ## the Free Software Foundation; either version 3 of the License, or (at |
9 ## your option) any later version. | |
5824 | 10 ## |
11 ## Octave is distributed in the hope that it will be useful, but | |
12 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
14 ## General Public License for more details. | |
15 ## | |
16 ## You should have received a copy of the GNU General Public License | |
7016 | 17 ## along with Octave; see the file COPYING. If not, see |
18 ## <http://www.gnu.org/licenses/>. | |
5824 | 19 |
20 ## -*- texinfo -*- | |
10793
be55736a0783
Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents:
10658
diff
changeset
|
21 ## @deftypefn {Function File} {@var{pp} =} spline (@var{x}, @var{y}) |
7650 | 22 ## @deftypefnx {Function File} {@var{yi} =} spline (@var{x}, @var{y}, @var{xi}) |
14104
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
23 ## Return the cubic spline interpolant of points @var{x} and @var{y}. |
19627
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17966
diff
changeset
|
24 ## |
14104
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
25 ## When called with two arguments, return the piecewise polynomial @var{pp} |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
26 ## that may be used with @code{ppval} to evaluate the polynomial at specific |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
27 ## points. When called with a third input argument, @code{spline} evaluates |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
28 ## the spline at the points @var{xi}. The third calling form @code{spline |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
29 ## (@var{x}, @var{y}, @var{xi})} is equivalent to @code{ppval (spline |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
30 ## (@var{x}, @var{y}), @var{xi})}. |
5824 | 31 ## |
14104
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
32 ## The variable @var{x} must be a vector of length @var{n}. @var{y} can be |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
33 ## either a vector or array. If @var{y} is a vector it must have a length of |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
34 ## either @var{n} or @code{@var{n} + 2}. If the length of @var{y} is |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
35 ## @var{n}, then the "not-a-knot" end condition is used. If the length of |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
36 ## @var{y} is @code{@var{n} + 2}, then the first and last values of the |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
37 ## vector @var{y} are the values of the first derivative of the cubic spline |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
38 ## at the endpoints. |
5824 | 39 ## |
40 ## If @var{y} is an array, then the size of @var{y} must have the form | |
41 ## @tex | |
42 ## $$[s_1, s_2, \cdots, s_k, n]$$ | |
43 ## @end tex | |
8517
81d6ab3ac93c
Allow documentation tobe built for other formats than tex and info
sh@sh-laptop
parents:
8310
diff
changeset
|
44 ## @ifnottex |
5824 | 45 ## @code{[@var{s1}, @var{s2}, @dots{}, @var{sk}, @var{n}]} |
8517
81d6ab3ac93c
Allow documentation tobe built for other formats than tex and info
sh@sh-laptop
parents:
8310
diff
changeset
|
46 ## @end ifnottex |
5824 | 47 ## or |
48 ## @tex | |
8828 | 49 ## $$[s_1, s_2, \cdots, s_k, n + 2].$$ |
5824 | 50 ## @end tex |
8517
81d6ab3ac93c
Allow documentation tobe built for other formats than tex and info
sh@sh-laptop
parents:
8310
diff
changeset
|
51 ## @ifnottex |
5824 | 52 ## @code{[@var{s1}, @var{s2}, @dots{}, @var{sk}, @var{n} + 2]}. |
8517
81d6ab3ac93c
Allow documentation tobe built for other formats than tex and info
sh@sh-laptop
parents:
8310
diff
changeset
|
53 ## @end ifnottex |
14104
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
54 ## The array is reshaped internally to a matrix where the leading |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11536
diff
changeset
|
55 ## dimension is given by |
5824 | 56 ## @tex |
57 ## $$s_1 s_2 \cdots s_k$$ | |
58 ## @end tex | |
8517
81d6ab3ac93c
Allow documentation tobe built for other formats than tex and info
sh@sh-laptop
parents:
8310
diff
changeset
|
59 ## @ifnottex |
5824 | 60 ## @code{@var{s1} * @var{s2} * @dots{} * @var{sk}} |
8517
81d6ab3ac93c
Allow documentation tobe built for other formats than tex and info
sh@sh-laptop
parents:
8310
diff
changeset
|
61 ## @end ifnottex |
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
62 ## and each row of this matrix is then treated separately. Note that this |
14104
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
63 ## is exactly opposite to @code{interp1} but is done for @sc{matlab} |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
64 ## compatibility. |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
65 ## |
614505385171
doc: Overhaul docstrings for polynomial functions.
Rik <octave@nomad.inbox5.com>
parents:
12608
diff
changeset
|
66 ## @seealso{pchip, ppval, mkpp, unmkpp} |
5824 | 67 ## @end deftypefn |
68 | |
69 ## This code is based on csape.m from octave-forge, but has been | |
70 ## modified to use the sparse solver code in octave that itself allows | |
71 ## special casing of tri-diagonal matrices, modified for NDArrays and | |
72 ## for the treatment of vectors y 2 elements longer than x as complete | |
73 ## splines. | |
74 | |
75 function ret = spline (x, y, xi) | |
76 | |
77 x = x(:); | |
78 n = length (x); | |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
79 if (n < 2) |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
80 error ("spline: requires at least 2 points"); |
5824 | 81 endif |
82 | |
83 ## Check the size and shape of y | |
84 ndy = ndims (y); | |
85 szy = size (y); | |
17966
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
86 if (ndy == 2 && (any (szy == n) || any (szy == n+2))) |
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
87 if (szy(2) == n || szy(2) == n+2) |
6014 | 88 a = y.'; |
5824 | 89 else |
90 a = y; | |
17966
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
91 szy = szy([2 1]); |
5824 | 92 endif |
93 else | |
12608
59e2460acae1
make piecewise polynomial (pp) functions more compatible
Kai Habel <kai.habel@gmx.de>
parents:
12444
diff
changeset
|
94 a = shiftdim (reshape (y, [prod(szy(1:end-1)), szy(end)]), 1); |
5824 | 95 endif |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11536
diff
changeset
|
96 |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11536
diff
changeset
|
97 for k = (1:columns (a))(any (isnan (a))) |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11536
diff
changeset
|
98 ok = ! isnan (a(:,k)); |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11536
diff
changeset
|
99 a(!ok,k) = spline (x(ok), a(ok,k), x(!ok)); |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11536
diff
changeset
|
100 endfor |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11536
diff
changeset
|
101 |
5824 | 102 complete = false; |
14872
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
103 if (rows (a) == n + 2) |
5824 | 104 complete = true; |
105 dfs = a(1,:); | |
106 dfe = a(end,:); | |
107 a = a(2:end-1,:); | |
108 endif | |
109 | |
14222
190952239c2c
Use '!' for not operation in preference to '~'.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
110 if (! issorted (x)) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14575
diff
changeset
|
111 [x, idx] = sort (x); |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
112 a = a(idx,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
113 endif |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
114 |
5824 | 115 b = c = zeros (size (a)); |
116 h = diff (x); | |
5838 | 117 idx = ones (columns (a), 1); |
5824 | 118 |
119 if (complete) | |
120 | |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
121 if (n == 2) |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
122 d = (dfs + dfe) / (x(2) - x(1)) ^ 2 + ... |
12608
59e2460acae1
make piecewise polynomial (pp) functions more compatible
Kai Habel <kai.habel@gmx.de>
parents:
12444
diff
changeset
|
123 2 * (a(1,:) - a(2,:)) / (x(2) - x(1)) ^ 3; |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
124 c = (-2 * dfs - dfe) / (x(2) - x(1)) - ... |
12608
59e2460acae1
make piecewise polynomial (pp) functions more compatible
Kai Habel <kai.habel@gmx.de>
parents:
12444
diff
changeset
|
125 3 * (a(1,:) - a(2,:)) / (x(2) - x(1)) ^ 2; |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
126 b = dfs; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
127 a = a(1,:); |
5824 | 128 |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
129 d = d(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
130 c = c(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
131 b = b(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
132 a = a(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
133 else |
14575
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
134 g(1,:) = (a(2,:) - a(1,:)) / h(1) - dfs; |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
135 g(2:n-1,:) = (a(3:n,:) - a(2:n-1,:)) ./ h(2:n-1) - ... |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
136 (a(2:n-1,:) - a(1:n-2,:)) ./ h(1:n-2); |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
137 g(n,:) = dfe - (a(n,:) - a(n-1,:)) / h(n-1); |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14575
diff
changeset
|
138 c = spdiags ([[h/6;0],[h(1)/3;(h(1:n-2)+h(2:n-1))/3;h(n-1)/3],[0;h/6]],... |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14575
diff
changeset
|
139 [-1,0,1],n,n) \ (g / 2); |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
140 b(1:n-1,:) = diff (a) ./ h(1:n-1, idx) ... |
10549 | 141 - h(1:n-1,idx) / 3 .* (c(2:n,:) + 2 * c(1:n-1,:)); |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
142 d = diff (c) ./ (3 * h(1:n-1, idx)); |
5824 | 143 |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
144 d = d(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
145 c = c(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
146 b = b(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
147 a = a(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
148 endif |
5824 | 149 else |
150 | |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
151 if (n == 2) |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
152 b = (a(2,:) - a(1,:)) / (x(2) - x(1)); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
153 a = a(1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
154 d = []; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
155 c = []; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
156 b = b(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
157 a = a(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
158 elseif (n == 3) |
5824 | 159 |
11196
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
160 n = 2; |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
161 c = (a(1,:) - a(3,:)) / ((x(3) - x(1)) * (x(2) - x(3))) ... |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
162 + (a(2,:) - a(1,:)) / ((x(2) - x(1)) * (x(2) - x(3))); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
163 b = (a(2,:) - a(1,:)) * (x(3) - x(1)) ... |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
164 / ((x(2) - x(1)) * (x(3) - x(2))) ... |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
165 + (a(1,:) - a(3,:)) * (x(2) - x(1)) ... |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
166 / ((x(3) - x(1)) * (x(3) - x(2))); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
167 a = a(1,:); |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
168 d = []; |
11196
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
169 x = [min(x), max(x)]; |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
170 |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
171 c = c(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
172 b = b(1:n-1,:); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
173 a = a(1:n-1,:); |
11196
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
174 else |
5824 | 175 |
11196
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
176 g = zeros (n-2, columns (a)); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
177 g(1,:) = 3 / (h(1) + h(2)) ... |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
178 * (a(3,:) - a(2,:) - h(2) / h(1) * (a(2,:) - a(1,:))); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
179 g(n-2,:) = 3 / (h(n-1) + h(n-2)) ... |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
180 * (h(n-2) / h(n-1) * (a(n,:) - a(n-1,:)) - (a(n-1,:) - a(n-2,:))); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
181 |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
182 if (n > 4) |
5824 | 183 |
11196
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
184 g(2:n - 3,:) = 3 * diff (a(3:n-1,:)) ./ h(3:n-2,idx) ... |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
185 - 3 * diff (a(2:n-2,:)) ./ h(2:n - 3,idx); |
5824 | 186 |
11196
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
187 dg = 2 * (h(1:n-2) .+ h(2:n-1)); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
188 dg(1) = dg(1) - h(1); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
189 dg(n-2) = dg(n-2) - h(n-1); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
190 |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
191 ldg = udg = h(2:n-2); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
192 udg(1) = udg(1) - h(1); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
193 ldg(n - 3) = ldg(n-3) - h(n-1); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
194 c(2:n-1,:) = spdiags ([[ldg(:); 0], dg, [0; udg(:)]], |
10549 | 195 [-1, 0, 1], n-2, n-2) \ g; |
5824 | 196 |
11196
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
197 elseif (n == 4) |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
198 |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
199 dg = [h(1) + 2 * h(2); 2 * h(2) + h(3)]; |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
200 ldg = h(2) - h(3); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
201 udg = h(2) - h(1); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
202 c(2:n-1,:) = spdiags ([[ldg(:);0], dg, [0; udg(:)]], |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
203 [-1, 0, 1], n-2, n-2) \ g; |
5824 | 204 |
11196
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
205 endif |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
206 |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
207 c(1,:) = c(2,:) + h(1) / h(2) * (c(2,:) - c(3,:)); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
208 c(n,:) = c(n-1,:) + h(n-1) / h(n-2) * (c(n-1,:) - c(n-2,:)); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
209 b = diff (a) ./ h(1:n-1, idx) ... |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
210 - h(1:n-1, idx) / 3 .* (c(2:n,:) + 2 * c(1:n-1,:)); |
d17cb8a1271d
spline.m: Fix algorithm for input with 3 elements (bug #31098)
Marco Caliari <marco.caliari@univr.it>
parents:
10793
diff
changeset
|
211 d = diff (c) ./ (3 * h(1:n-1, idx)); |
5824 | 212 |
12608
59e2460acae1
make piecewise polynomial (pp) functions more compatible
Kai Habel <kai.habel@gmx.de>
parents:
12444
diff
changeset
|
213 d = d(1:n-1,:);d = d.'(:); |
59e2460acae1
make piecewise polynomial (pp) functions more compatible
Kai Habel <kai.habel@gmx.de>
parents:
12444
diff
changeset
|
214 c = c(1:n-1,:);c = c.'(:); |
59e2460acae1
make piecewise polynomial (pp) functions more compatible
Kai Habel <kai.habel@gmx.de>
parents:
12444
diff
changeset
|
215 b = b(1:n-1,:);b = b.'(:); |
59e2460acae1
make piecewise polynomial (pp) functions more compatible
Kai Habel <kai.habel@gmx.de>
parents:
12444
diff
changeset
|
216 a = a(1:n-1,:);a = a.'(:); |
5824 | 217 endif |
218 | |
219 endif | |
12608
59e2460acae1
make piecewise polynomial (pp) functions more compatible
Kai Habel <kai.habel@gmx.de>
parents:
12444
diff
changeset
|
220 ret = mkpp (x, cat (2, d, c, b, a), szy(1:end-1)); |
5824 | 221 |
222 if (nargin == 3) | |
223 ret = ppval (ret, xi); | |
224 endif | |
225 | |
226 endfunction | |
227 | |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
228 |
5824 | 229 %!demo |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
230 %! x = 0:10; y = sin (x); |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
231 %! xspline = 0:0.1:10; yspline = spline (x,y,xspline); |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
232 %! title ("spline fit to points from sin (x)"); |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
233 %! plot (xspline,sin(xspline),"r", xspline,yspline,"g-", x,y,"b+"); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
234 %! legend ("original", "interpolation", "interpolation points"); |
5824 | 235 %! %-------------------------------------------------------- |
236 %! % confirm that interpolated function matches the original | |
237 | |
6686 | 238 %!shared x,y,abserr |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
239 %! x = [0:10]; y = sin (x); abserr = 1e-14; |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
240 %!assert (spline (x,y,x), y, abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
241 %!assert (spline (x,y,x'), y', abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
242 %!assert (spline (x',y',x'), y', abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
243 %!assert (spline (x',y',x), y, abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
244 %!assert (isempty (spline (x',y',[]))) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
245 %!assert (isempty (spline (x,y,[]))) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
246 %!assert (spline (x,[y;y],x), [spline(x,y,x);spline(x,y,x)], abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
247 %!assert (spline (x,[y;y],x'), [spline(x,y,x);spline(x,y,x)], abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
248 %!assert (spline (x',[y;y],x), [spline(x,y,x);spline(x,y,x)], abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
249 %!assert (spline (x',[y;y],x'), [spline(x,y,x);spline(x,y,x)], abserr) |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
250 %! y = cos (x) + i*sin (x); |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
251 %!assert (spline (x,y,x), y, abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
252 %!assert (real (spline (x,y,x)), real (y), abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
253 %!assert (real (spline (x,y,x.')), real (y).', abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
254 %!assert (real (spline (x.',y.',x.')), real (y).', abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
255 %!assert (real (spline (x.',y,x)), real (y), abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
256 %!assert (imag (spline (x,y,x)), imag (y), abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
257 %!assert (imag (spline (x,y,x.')), imag (y).', abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
258 %!assert (imag (spline (x.',y.',x.')), imag (y).', abserr) |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
259 %!assert (imag (spline (x.',y,x)), imag (y), abserr) |
10658
c66a4657d764
spline.m: Ignore NaNs within input vectors.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
260 %!test |
c66a4657d764
spline.m: Ignore NaNs within input vectors.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
261 %! xnan = 5; |
c66a4657d764
spline.m: Ignore NaNs within input vectors.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
262 %! y(x==xnan) = NaN; |
c66a4657d764
spline.m: Ignore NaNs within input vectors.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
263 %! ok = ! isnan (y); |
c66a4657d764
spline.m: Ignore NaNs within input vectors.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
264 %! assert (spline (x, y, x(ok)), y(ok), abserr); |
c66a4657d764
spline.m: Ignore NaNs within input vectors.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
265 %!test |
c66a4657d764
spline.m: Ignore NaNs within input vectors.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
266 %! ok = ! isnan (y); |
c66a4657d764
spline.m: Ignore NaNs within input vectors.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
267 %! assert (! isnan (spline (x, y, x(!ok)))); |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
268 %!test |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
269 %! x = [1,2]; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
270 %! y = [1,4]; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
271 %! assert (spline (x,y,x), [1,4], abserr); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
272 %!test |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
273 %! x = [2,1]; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
274 %! y = [1,4]; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
275 %! assert (spline (x,y,x), [1,4], abserr); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
276 %!test |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
277 %! x = [1,2]; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
278 %! y = [1,2,3,4]; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
279 %! pp = spline (x,y); |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
280 %! [x,P] = unmkpp (pp); |
14575
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
281 %! assert (P, [3,-3,1,2], abserr); |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
282 %!test |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
283 %! x = [2,1]; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
284 %! y = [1,2,3,4]; |
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
285 %! pp = spline (x,y); |
17966
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
286 %! pp2 = spline (x', y'); |
12444
07e102029d2a
spline.m: Allow length(x) == 2 and unsorted x values.
Ben Abbott <bpabbott@mac.com>
parents:
11587
diff
changeset
|
287 %! [x,P] = unmkpp (pp); |
14575
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
288 %! assert (P, [7,-9,1,3], abserr); |
17966
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
289 %! assert (pp2, pp); |
14575
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
290 %!test |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
291 %! x = [0,1,2]; |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
292 %! y = [0,0,1,0,0]; |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
293 %! pp = spline (x,y); |
17966
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
294 %! pp2 = spline (x', y'); |
14575
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
295 %! [x,P] = unmkpp (pp); |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
296 %! assert (P, [-2,3,0,0;2,-3,0,1], abserr); |
17966
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
297 %! assert (pp2, pp); |
14575
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
298 %!test |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
299 %! x = [0,1,2,3]; |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
300 %! y = [0,0,1,1,0,0]; |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
301 %! pp = spline (x,y); |
17966
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
302 %! pp2 = spline (x', y'); |
14575
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
303 %! [x,P] = unmkpp (pp); |
2e23cd0a9e40
Fix complete spline with three points (bug #35739)
Marco Caliari <marco.caliari@univr.it>
parents:
14363
diff
changeset
|
304 %! assert (P, [-1,2,0,0;0,-1,1,1;1,-1,-1,1], abserr); |
17966
3232956a6081
spline.m: Fix problem with transposed "complete" inputs (bug #40584).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
305 %! assert (pp2, pp); |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14222
diff
changeset
|
306 |