Binary files /tmp/tmp46W50I/c2mmUzsweO/adehabitathr-0.4.14/build/vignette.rds and /tmp/tmp46W50I/Pkgi3Ce1kf/adehabitathr-0.4.15/build/vignette.rds differ diff -Nru adehabitathr-0.4.14/debian/changelog adehabitathr-0.4.15/debian/changelog --- adehabitathr-0.4.14/debian/changelog 2017-12-03 00:52:12.000000000 +0000 +++ adehabitathr-0.4.15/debian/changelog 2017-12-03 00:52:13.000000000 +0000 @@ -1,14 +1,21 @@ -adehabitathr (0.4.14-1cran2ppa0trusty1) trusty; urgency=medium +adehabitathr (0.4.15-1cran1ppa0trusty0) trusty; urgency=medium * Compilation for Ubuntu 14.04.5 LTS - -- Michael Rutter Thu, 04 May 2017 12:26:58 +0000 + -- Michael Rutter Sun, 03 Dec 2017 00:50:42 +0000 + +adehabitathr (0.4.15-1cran1) testing; urgency=low + + * cran2deb svn: 362M with DB version 1. + + -- cran2deb4ubuntu Sat, 02 Dec 2017 13:50:03 -0500 + adehabitathr (0.4.14-1cran2) testing; urgency=low * cran2deb svn: 362M with DB version 1. - -- cran2deb4ubuntu Sat, 22 Oct 2016 23:08:41 -0400 + -- cran2deb4ubuntu Sat, 22 Oct 2016 23:08:48 -0400 adehabitathr (0.4.14-1cran1) testing; urgency=low diff -Nru adehabitathr-0.4.14/debian/copyright adehabitathr-0.4.15/debian/copyright --- adehabitathr-0.4.14/debian/copyright 2017-12-03 00:52:12.000000000 +0000 +++ adehabitathr-0.4.15/debian/copyright 2017-12-03 00:52:13.000000000 +0000 @@ -2,7 +2,7 @@ automatically using cran2deb4ubuntu by cran2deb4ubuntu . -The original GNU R package is Copyright (C) 2016 Clement Calenge, +The original GNU R package is Copyright (C) 2017 Clement Calenge, contributions from Scott Fortmann-Roe and possibly others. The original GNU R package is maintained by Clement Calenge diff -Nru adehabitathr-0.4.14/DESCRIPTION adehabitathr-0.4.15/DESCRIPTION --- adehabitathr-0.4.14/DESCRIPTION 2015-07-22 10:37:22.000000000 +0000 +++ adehabitathr-0.4.15/DESCRIPTION 2017-11-28 22:07:15.000000000 +0000 @@ -1,6 +1,6 @@ Package: adehabitatHR -Version: 0.4.14 -Date: 2015-07-22 +Version: 0.4.15 +Date: 2017-11-28 Depends: R (>= 3.0.1), sp, methods, deldir, ade4, adehabitatMA, adehabitatLT Suggests: maptools, tkrplot, MASS, rgeos @@ -11,6 +11,6 @@ Description: A collection of tools for the estimation of animals home range. License: GPL (>= 2) NeedsCompilation: yes -Packaged: 2015-07-22 08:21:24 UTC; calenge +Packaged: 2017-11-28 21:31:26 UTC; calenge Repository: CRAN -Date/Publication: 2015-07-22 12:37:22 +Date/Publication: 2017-11-28 22:07:15 UTC Binary files /tmp/tmp46W50I/c2mmUzsweO/adehabitathr-0.4.14/inst/doc/adehabitatHR.pdf and /tmp/tmp46W50I/Pkgi3Ce1kf/adehabitathr-0.4.15/inst/doc/adehabitatHR.pdf differ diff -Nru adehabitathr-0.4.14/MD5 adehabitathr-0.4.15/MD5 --- adehabitathr-0.4.14/MD5 2015-07-22 10:37:23.000000000 +0000 +++ adehabitathr-0.4.15/MD5 2017-11-28 22:07:16.000000000 +0000 @@ -1,5 +1,5 @@ -e41ec00189e9604fa1b0463e785b33d8 *DESCRIPTION -66b2d2315e09a2cf384b70edfa67fa6d *NAMESPACE +d89a8ac0ff54b3fb19604fcc165f2c12 *DESCRIPTION +36b4f11ef53a37858aa90c23dd88f89a *NAMESPACE eb6009e86a43484b5a34d56875ad8db2 *R/BRB.r b1dc3b276d331cb2fc1b479b2088363a *R/CharHull.r 8785961a673dbdf53c26f08d4eb39ae5 *R/LoCoH.r @@ -10,8 +10,8 @@ fca5ca1bd62122d6a66a4ef3947ad19a *R/hidden.r e09951875ab37c9f1dd599c3a3a1b4f1 *R/hr.rast.r 019197e2699db20e47fb40e105368436 *R/kernel.area.r -c45ccaad582c461dbddb4849e399df2b *R/kernelUD.r -f83a9e501134805db45adf2b8607e47d *R/kernelbb.r +16b26425f27cdb46a9d77337f22dcfa6 *R/kernelUD.r +1acb6558966b416fe2f19878e732bad3 *R/kernelbb.r 96ac0afc048d8c8804171335bb401098 *R/kernelkc.r 171cbd5601cc6e5fba370e74814662f4 *R/kernelovelaphr.r 1840d02b0e03c232f55cbe89b48dea2e *R/kerneloverlap.r @@ -20,11 +20,11 @@ 6f1b26d5613a48a9c124b618f0c99a66 *R/mcp.area.r 1ced5f2866bac43215e1d68cf63dda85 *R/mcp.r db1bc475ee008167734b0f14d933dd22 *R/plot.hrsize.r -377f49a246b0949cc6994492b801c914 *build/vignette.rds +4eb3b1a6162ab2e7c4af9ad7fe654419 *build/vignette.rds 77730204057935c931ae66b90bbbf9c7 *inst/CITATION 6a6215ce58ac8437ca7c5d79335464a6 *inst/doc/adehabitatHR.R d35476e3d24b0b351e33a1691d0f9ee7 *inst/doc/adehabitatHR.Rnw -dc07fded5df2ac53dcd99653b9126630 *inst/doc/adehabitatHR.pdf +321ee97bbd8feb2416e535860ff5bf52 *inst/doc/adehabitatHR.pdf 5499f0bde73f04343f6b302fce8a596f *man/BRB.Rd 1392cec2a26aae503d71db890dda975d *man/CharHull.Rd 034d4f09a1b7f3c0b7716d0567bd6d81 *man/LoCoH.Rd @@ -39,5 +39,6 @@ e6a67bf1074b29d930bb80f607b191c6 *man/kerneloverlap.Rd 27ebbcf913670b46464b1b5b626f5799 *man/kver2spol.Rd 1ad8826634f740f74ff7495fc85111b0 *man/mcp.Rd -618c9fcef2d39a61467763b63e0deeec *src/tests.c +c23f11c337f3dac7e4710e74887fb051 *src/init.c +6873e6cc4fdbd39b3a9ce9412aa75468 *src/tests.c d35476e3d24b0b351e33a1691d0f9ee7 *vignettes/adehabitatHR.Rnw diff -Nru adehabitathr-0.4.14/NAMESPACE adehabitathr-0.4.15/NAMESPACE --- adehabitathr-0.4.14/NAMESPACE 2015-07-21 13:10:21.000000000 +0000 +++ adehabitathr-0.4.15/NAMESPACE 2017-11-28 21:20:30.000000000 +0000 @@ -1,4 +1,4 @@ -useDynLib(adehabitatHR) +useDynLib(adehabitatHR, .registration=TRUE) import(sp,adehabitatLT,methods,deldir,ade4,adehabitatMA) importFrom("graphics", "box", "grid", "image", "lines", "par", "title") @@ -6,7 +6,6 @@ importFrom("stats", "na.omit", "quantile", "var") -exportPattern("^[^\\.]") S3method(image, estUDm) S3method(print, estUDm) @@ -24,3 +23,48 @@ exportMethods(show) +export(as.data.frame.estUD) +export(BRB) +export(BRB.D) +export(BRB.likD) +export(CharHull) +export(clusthr) +export(estUDm2spixdf) +export(exwc) +export(findmax) +export(getverticeshr) +export(getverticeshr.default) +export(getverticeshr.estUD) +export(getverticeshr.estUDm) +export(getverticeshr.MCHu) +export(getvolumeUD) +export(hr.rast) +export(image.estUD) +export(image.estUDm) +export(kernel.area) +export(kernelbb) +export(kernelkc) +export(kernelkcbase) +export(kerneloverlap) +export(kerneloverlaphr) +export(kernelUD) +export(khr2estUDm) +export(kver2spol) +export(liker) +export(LoCoH.a) +export(LoCoH.a.area) +export(LoCoH.k) +export(LoCoH.k.area) +export(LoCoH.r) +export(LoCoH.r.area) +export(MCHu.rast) +export(MCHu2hrsize) +export(mcp) +export(mcp.area) +export(plot.hrsize) +export(plot.MCHu) +export(plotLSCV) +export(print.estUDm) +export(print.liker) +export(print.MCHu) +export(spoldf2MCHu) diff -Nru adehabitathr-0.4.14/R/kernelbb.r adehabitathr-0.4.15/R/kernelbb.r --- adehabitathr-0.4.14/R/kernelbb.r 2015-01-29 18:15:36.000000000 +0000 +++ adehabitathr-0.4.15/R/kernelbb.r 2017-11-28 21:30:45.000000000 +0000 @@ -88,7 +88,7 @@ yg <- unique(xyg[,2]) date<-as.double(dft$date)-min(as.double(dft$date)) - toto<-.C("kernelbb", double(length(xg)*length(yg)), as.double(xg), + toto<-.C("kernelbbc", double(length(xg)*length(yg)), as.double(xg), as.double(yg), as.integer(length(yg)),as.integer(length(xg)), as.integer(nrow(df)), as.double(sig12), as.double (sig22), as.double(df$x), as.double(df$y), as.double(date), diff -Nru adehabitathr-0.4.14/R/kernelUD.r adehabitathr-0.4.15/R/kernelUD.r --- adehabitathr-0.4.14/R/kernelUD.r 2015-01-29 18:15:36.000000000 +0000 +++ adehabitathr-0.4.15/R/kernelUD.r 2017-11-28 21:18:25.000000000 +0000 @@ -569,5 +569,3 @@ par(opar) } } - - diff -Nru adehabitathr-0.4.14/src/init.c adehabitathr-0.4.15/src/init.c --- adehabitathr-0.4.14/src/init.c 1970-01-01 00:00:00.000000000 +0000 +++ adehabitathr-0.4.15/src/init.c 2017-11-28 21:31:26.000000000 +0000 @@ -0,0 +1,60 @@ +#include +#include +#include // for NULL +#include + +/* FIXME: + Check these declarations against the C/Fortran source code. +*/ + +/* .C calls */ +extern void calcvolume(void *, void *, void *, void *); +extern void clusterhrr(void *, void *, void *, void *, void *, void *); +extern void CVL(void *, void *, void *, void *, void *, void *, void *); +extern void CVmise(void *, void *, void *, void *, void *, void *); +extern void findmaxgrid(void *, void *, void *); +extern void kernelbbc(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *); +extern void kernelhr(void *, void *, void *, void *, void *, void *, void *, void *, void *); +extern void kernelkcr(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *); +extern void kernepan(void *, void *, void *, void *, void *, void *, void *, void *, void *); +extern void longfacclustr(void *, void *, void *); + +/* .Call calls */ +extern SEXP CalculD(SEXP, SEXP, SEXP, SEXP); +extern SEXP calculDparhab(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP); +extern SEXP Dmv(SEXP, SEXP, SEXP); +extern SEXP fillsegments(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP); +extern SEXP HRresidtime(SEXP, SEXP, SEXP); +extern SEXP mkdeb(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP); +extern SEXP nvisits(SEXP, SEXP, SEXP); + +static const R_CMethodDef CEntries[] = { + {"calcvolume", (DL_FUNC) &calcvolume, 4}, + {"clusterhrr", (DL_FUNC) &clusterhrr, 6}, + {"CVL", (DL_FUNC) &CVL, 7}, + {"CVmise", (DL_FUNC) &CVmise, 6}, + {"findmaxgrid", (DL_FUNC) &findmaxgrid, 3}, + {"kernelbbc", (DL_FUNC) &kernelbbc, 12}, + {"kernelhr", (DL_FUNC) &kernelhr, 9}, + {"kernelkcr", (DL_FUNC) &kernelkcr, 10}, + {"kernepan", (DL_FUNC) &kernepan, 9}, + {"longfacclustr", (DL_FUNC) &longfacclustr, 3}, + {NULL, NULL, 0} +}; + +static const R_CallMethodDef CallEntries[] = { + {"CalculD", (DL_FUNC) &CalculD, 4}, + {"calculDparhab", (DL_FUNC) &calculDparhab, 10}, + {"Dmv", (DL_FUNC) &Dmv, 3}, + {"fillsegments", (DL_FUNC) &fillsegments, 14}, + {"HRresidtime", (DL_FUNC) &HRresidtime, 3}, + {"mkdeb", (DL_FUNC) &mkdeb, 8}, + {"nvisits", (DL_FUNC) &nvisits, 3}, + {NULL, NULL, 0} +}; + +void R_init_adehabitatHR(DllInfo *dll) +{ + R_registerRoutines(dll, CEntries, CallEntries, NULL, NULL); + R_useDynamicSymbols(dll, FALSE); +} diff -Nru adehabitathr-0.4.14/src/tests.c adehabitathr-0.4.15/src/tests.c --- adehabitathr-0.4.14/src/tests.c 2015-07-22 08:21:24.000000000 +0000 +++ adehabitathr-0.4.15/src/tests.c 2017-11-28 21:31:26.000000000 +0000 @@ -58,7 +58,7 @@ void integrno(double *XG, double *X1, double *X2, double *T, double *sig1, double *sig2, double *alpha, double *res); -void kernelbb(double *grille, double *xgri, double *ygri, int *ncolgri, +void kernelbbc(double *grille, double *xgri, double *ygri, int *ncolgri, int *nliggri, int *nloc, double *sig1, double *sig2, double *xlo, double *ylo, double *Tr, int *nalpha); @@ -1652,7 +1652,7 @@ /* Main Function */ -void kernelbb(double *grille, double *xgri, double *ygri, int *ncolgri, +void kernelbbc(double *grille, double *xgri, double *ygri, int *ncolgri, int *nliggri, int *nloc, double *sig1, double *sig2, double *xlo, double *ylo, double *Tr, int *nalpha)