diff --git a/DESCRIPTION b/DESCRIPTION index c544f034a74704b32dcf779c1fa6bd9b1afb6400..436a1774045333071354d2a03e35d206cb752fa1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: akima -Version: 0.3-1 +Version: 0.3-2 Title: Interpolation of irregularly spaced data -Author: Fortran code by H. Akima. - R port by Albrecht Gebhardt . +Author: Fortran code by H. Akima + R port by Albrecht Gebhardt Maintainer: Albrecht Gebhardt Description: Linear or cubic spline interpolation for irregular gridded data License: Fortran code: ACM, free for non-commercial use, R functions GPL diff --git a/man/interp.Rd b/man/interp.Rd index 276eb2430014d2985a0df15f336de8bfc6e9a46e..b273b1805fced52ddf3ff47f8fde34d099a4d0b1 100644 --- a/man/interp.Rd +++ b/man/interp.Rd @@ -6,9 +6,9 @@ \alias{interp.new} \alias{interp.old} \usage{ -interp(x, y, z, xo=<>, yo=<>, ncp=0, extrap=F) -interp.old(x, y, z, xo=<>, yo=<>, ncp=0, extrap=F) -interp.new(x, y, z, xo=<>, yo=<>, ncp=0, extrap=F) +interp(x, y, z, xo=<>, yo=<>, ncp=0, extrap=FALSE, duplicate = "error", dupfun = NULL) +interp.old(x, y, z, xo=<>, yo=<>, ncp=0, extrap=FALSE, duplicate = "error", dupfun = NULL) +interp.new(x, y, z, xo=<>, yo=<>, linear=FALSE, ncp=NULL, extrap=FALSE, duplicate = "error", dupfun = NULL) } \arguments{ \item{x}{ @@ -46,6 +46,7 @@ interp.new(x, y, z, xo=<>, yo=<>, ncp=0, extrap=F) used (\code{extrap=F}, the default), \code{yo} should have a range that is close to or inside of the range of \code{y} for the results to be meaningful. } + \item{linear}{logical, switch to linear interpolation in \code{interp.new}} \item{ncp}{ number of additional points to be used in computing partial derivatives at each data point. diff --git a/man/interpp.Rd b/man/interpp.Rd index a0129d2efc615bfbf21d4aef4cd7a236261c67e3..a796dab319d6e43f9e95d197ab9ae23178ea1b6d 100644 --- a/man/interpp.Rd +++ b/man/interpp.Rd @@ -6,7 +6,7 @@ \alias{interpp.old} \alias{interpp.new} \usage{ -interpp(x, y, z, xo, yo, ncp=0, extrap=F) +interpp(x, y, z, xo, yo, ncp=0, extrap=F, duplicate = "error", dupfun = NULL) } \arguments{ \item{x}{