Commit fe0eeb0c authored by agebhard's avatar agebhard
Browse files

* Try to fix solaris-x86 configure problem

* small typos
parent c1f627d3
Package: akima
Version: 0.6-3
Date: 2016-12-23
Date: 2016-12-27
Title: Interpolation of Irregularly and Regularly Spaced Data
Authors@R: c(person("Hiroshi", "Akima", role = c("aut", "cph"),
comment = "Fortran code (TOMS 760, 761, 697 and 433)"),
person("Albrecht", "Gebhardt", role = c("aut", "cre", "cph"),
email = "albrecht.gebhardt@aau.at",
comment = "R port (interp* functions), bicubic* functions"),
comment = "R port (interp*, bicubic* functions), bilinear code"),
person("Thomas", "Petzold", role = c("ctb", "cph"),
comment = "aspline function"),
person("Martin", "Maechler", email="maechler@stat.math.ethz.ch",
......
......@@ -2,8 +2,8 @@ This library contains an R implementation of the S-Plus function interp().
I used Fortran code for cubic spline interpolation from H. Akima available
at http://www.netlib.org/toms .
There are two version, one from 1978 (AMS code 526, used in SPlus 3.x) and a
newer one (AMS 761) from 1996. The original versions are in the directory orig/.
There are two version, one from 1978 (ACM code 526, used in SPlus 3.x) and a
newer one (ACM 761) from 1996. The original versions are in the directory orig/.
I only had to write a subroutine idptli.f for linear interpolation within
triangles from the delauney triangulation.
......@@ -15,6 +15,10 @@ interp() actually calls interp.new() or interp.old() depending on its arguments,
linear interpolation is done by interp.old(), spline interpolation by interp.new
.
UPDATE (27.12.2016):
Remove ACM 526 code, switch completely to ACM 761 in Renka/Browns version
from 1998
UPDATE (13.12.2004):
Thomas Petzoldt <petzoldt@rcs.urz.tu-dresden.de> provided an R interface to
......@@ -26,6 +30,7 @@ ACM subscription):
TOMS 433: http://dl.acm.org/citation.cfm?id=355604.355605
TOMS 526: http://dl.acm.org/citation.cfm?id=355780.355787
TOMS 697: http://dl.acm.org/citation.cfm?id=114697.116808
TOMS 760: http://dl.acm.org/citation.cfm?id=232854.232854
TOMS 761: http://dl.acm.org/citation.cfm?id=232826.232856
Original Fortran code is freely available at Netlib/TOMS -- Collected Algorithms
......@@ -33,6 +38,7 @@ of the ACM at:
http://www.netlib.org/toms/433
http://www.netlib.org/toms/526
http://www.netlib.org/toms/697
http://www.netlib.org/toms/760
http://www.netlib.org/toms/761
UPDATE: (28.02.2013)
......
# package/configure.in
AC_PREREQ(2.50)
AC_INIT([akima],[0.5-10])
AC_INIT([akima],[0.6-3])
AC_CONFIG_SRCDIR(src/tripack.f)
#if you want to use more macros
m4_include([tools/acinclude.m4])
......
......@@ -120,14 +120,14 @@ interp(x, y=NULL, z, xo=seq(min(x), max(x), length = nx),
\code{SpatialPixelssDataFrame} is returned.
}
\note{
\code{interp} uses Akimas new Fortran code (AMS 761) from 1996 in the revised
\code{interp} uses Akimas new Fortran code (ACM 761) from 1996 in the revised
version by Renka from 1998 for spline interpolation, the triangulation
(based on Renkas tripack) is reused for linear interpolation. In this
newer version Akima switched from his own triangulation to Renkas
tripack (AMS 751).
tripack (ACM 751).
Note that earlier versions (up to version 0.5-12) as well as S-Plus
used the old Fortran code from Akima 1978 (AMS 526).
used the old Fortran code from Akima 1978 (ACM 526).
The resulting structure is suitable for input to the
functions \code{\link{contour}} and \code{\link{image}}. Check
......
......@@ -36,9 +36,6 @@ check <- function(){
tlptr=integer(6*n-12),
tlend=integer(n),
tlnew=as.integer(0),
tnear=integer(n),
tnext=integer(n),
tdist=double(n),
ier=as.integer(0))
if(length(ret$tdist[[is.na(ret\$tdist)]])==5)
cat("export ALL_NAS=yes\n", file="conftest.out")
......@@ -81,9 +78,6 @@ check <- function(){
tlptr=integer(6*n-12),
tlend=integer(n),
tlnew=as.integer(0),
tnear=integer(n),
tnext=integer(n),
tdist=double(n),
ier=as.integer(0))
if(length(ret$tdist[[is.na(ret\$tdist)]])==5)
cat("export ALL_NAS=yes\n", file="conftest.out")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment