Commit 5509f5b3 authored by Gebhardt, Albrecht's avatar Gebhardt, Albrecht
Browse files

several cleanup steps

parent 19fd57c9
Package: akima
Version: 0.6-3.3
Date: 2020-05-31
Date: 2022-03-30
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)"),
......@@ -28,8 +28,8 @@ Imports: sp
NeedsCompilation: yes
Packaged: 2020-05-30 09:17:28 UTC; ripley
Author: Hiroshi Akima [aut, cph] (Fortran code (TOMS 760, 761, 697 and 433)),
Albrecht Gebhardt [aut, cre, cph] (R port (interp* functions), bicubic*
functions),
Albrecht Gebhardt [aut, cre, cph] (R port (interp* functions, bicubic*
functions), bilinear code),
Thomas Petzold [ctb, cph] (aspline function),
Martin Maechler [ctb, cph] (interp2xyz function + enhancements),
YYYY Association for Computing Machinery, Inc. [cph] (covers code from
......
......@@ -13,7 +13,7 @@ interp <-
sp.z <- NULL
sp.proj4string <- NULL
if(is.null(y)&&is.character(z)){
if(class(x)=="SpatialPointsDataFrame"){
if(inherits(x,"SpatialPointsDataFrame"){
sp.coord <- dimnames(coordinates(x))[[2]]
sp.z <- z
sp.proj4string <- x@proj4string
......
......@@ -10,14 +10,14 @@
sp.z <- NULL
sp.proj4string <- NULL
if(is.null(y)&&is.character(z)){
if(class(xo)=="SpatialPointsDataFrame"){
if(inherits(xo,"SpatialPointsDataFrame"){
yo <- coordinates(xo)[,2]
xo <- coordinates(xo)[,1]
} else
stop(paste("either x,y,z,xo,yo have to be numeric vectors",
"or both x and xo have to be SpatialPointsDataFrames",
"and z a name of a data column in x"))
if(class(x)=="SpatialPointsDataFrame"){
if(inherits(x,"SpatialPointsDataFrame"){
sp.coord <- dimnames(coordinates(x))[[2]]
sp.z <- z
sp.proj4string <- x@proj4string
......
This diff is collapsed.
# package/configure.in
AC_PREREQ(2.50)
AC_PREREQ([2.71])
AC_INIT([akima],[0.6-3])
AC_CONFIG_SRCDIR(src/tripack.f)
#if you want to use more macros
......@@ -26,5 +26,6 @@ CHECK_SUN_COMPILER_OPTIMIZATION
AC_SUBST(PKG_CFLAGS)
AC_SUBST(PKG_FFLAGS)
AC_OUTPUT(src/Makevars)
AC_CONFIG_FILES([src/Makevars])
AC_OUTPUT
#include <R.h>
/* ACM 526, removed in version 0.6-3:
exten void F77_NAME(idbvip) (int *md, int *ncp, int *ndp,
double *xd, double *yd, double *zd,
int *nip, double *xi, double *yi, double *zi,
int *iwk, double *wk, void *missi);
exten void F77_NAME(idsfft) (int *md, int *ncp, int *ndp,
double *xd, double *yd,double *zd,
int *nxi, int *nyi,
double *xi, double *yi, double *zi,
int *iwk, double *wk, void *missi);
*/
/* ACM 679: */
extern void F77_NAME(uvip3p) (int *np, int *nd, double *xd, double *yd,
......
......@@ -24,39 +24,6 @@
/* Fortran interface descriptions: */
/* ACM 526, soon to be removed */
static R_NativePrimitiveArgType idbvip_t[13] = {
INTSXP, /* MD, */
INTSXP, /* NCP, */
INTSXP, /* NDP, */
REALSXP, /* XD, */
REALSXP, /* YD, */
REALSXP, /* ZD, */
INTSXP, /* NIP, */
REALSXP, /* XI, */
REALSXP, /* YI, */
REALSXP, /* ZI, */
INTSXP, /* IWK, */
REALSXP, /* WK, */
LGLSXP /* MISSI */
};
static R_NativePrimitiveArgType idsfft_t[14] = {
INTSXP, /* MD, */
INTSXP, /* NCP, */
INTSXP, /* NDP, */
REALSXP, /* XD, */
REALSXP, /* YD, */
REALSXP, /* ZD, */
INTSXP, /* NXI, */
INTSXP, /* NYI, */
REALSXP, /* XI, */
REALSXP, /* YI, */
REALSXP, /* ZI, */
INTSXP, /* IWK, */
REALSXP, /* WK, */
LGLSXP /* MISSI */
};
/* ACM 760: */
static R_NativePrimitiveArgType rgbi3p_t[12] = {
......@@ -153,10 +120,6 @@ static R_NativePrimitiveArgType biliip_t[10] = {
static R_FortranMethodDef fortranMethods[] = {
/* {"idbvip", (DL_FUNC) &F77_SUB(idbvip), 13, idbvip_t}, interpp.old,
removed in version 0.6-3 */
/* {"idsfft", (DL_FUNC) &F77_SUB(idsfft), 14, idsfft_t}, interp.old,
removed in version 0.6-3 */
{"sdbi3p", (DL_FUNC) &F77_SUB(sdbi3p), 16, sdbi3p_t}, /* interpp */
{"sdsf3p", (DL_FUNC) &F77_SUB(sdsf3p), 17, sdsf3p_t}, /* interp */
{"uvip3p", (DL_FUNC) &F77_SUB(uvip3p), 8, uvip3p_t}, /* aspline */
......
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