Binary files /tmp/tmp3015pr_m/GqhoZlZE0w/adiv-2.1/build/partial.rdb and /tmp/tmp3015pr_m/cjW_sbrHQq/adiv-2.1.1/build/partial.rdb differ diff -Nru adiv-2.1/debian/changelog adiv-2.1.1/debian/changelog --- adiv-2.1/debian/changelog 2021-08-23 06:45:05.000000000 +0000 +++ adiv-2.1.1/debian/changelog 2021-10-19 12:48:34.000000000 +0000 @@ -1,15 +1,22 @@ -adiv (2.1-1cran1.1804.0) bionic; urgency=medium +adiv (2.1.1-1cran1.1804.0) bionic; urgency=medium * Compilation for Ubuntu 18.04.5 LTS * Build for c2d4u for R 3.5.0 - -- Michael Rutter Mon, 23 Aug 2021 06:45:05 +0000 + -- Michael Rutter Tue, 19 Oct 2021 12:48:34 +0000 + +adiv (2.1.1-1cran1) testing; urgency=low + + * cran2deb svn: 362M with DB version 1. + + -- cran2deb4ubuntu Mon, 18 Oct 2021 14:51:37 -0400 + adiv (2.1-1cran1) testing; urgency=low * cran2deb svn: 362M with DB version 1. - -- cran2deb4ubuntu Sun, 22 Aug 2021 15:16:13 -0400 + -- cran2deb4ubuntu Sun, 22 Aug 2021 15:16:35 -0400 adiv (2.0.1-1cran1) testing; urgency=low diff -Nru adiv-2.1/DESCRIPTION adiv-2.1.1/DESCRIPTION --- adiv-2.1/DESCRIPTION 2021-08-21 14:40:02.000000000 +0000 +++ adiv-2.1.1/DESCRIPTION 2021-09-27 15:10:16.000000000 +0000 @@ -1,8 +1,8 @@ Package: adiv Type: Package Title: Analysis of Diversity -Version: 2.1 -Date: 2021-08-10 +Version: 2.1.1 +Date: 2021-09-27 Author: Sandrine Pavoine Maintainer: Sandrine Pavoine Description: Functions, data sets and examples for the calculation of various indices of biodiversity including species, functional and phylogenetic diversity. Part of the indices are expressed in terms of equivalent numbers of species. The package also provides ways to partition biodiversity across spatial or temporal scales (alpha, beta, gamma diversities). In addition to the quantification of biodiversity, ordination approaches are available which rely on diversity indices and allow the detailed identification of species, functional or phylogenetic differences between communities. @@ -12,6 +12,6 @@ rgl, stats, utils License: GPL (>= 2) NeedsCompilation: no -Packaged: 2021-08-21 13:31:19 UTC; SandrineP +Packaged: 2021-09-27 13:19:55 UTC; SandrineP Repository: CRAN -Date/Publication: 2021-08-21 14:40:02 UTC +Date/Publication: 2021-09-27 15:10:16 UTC diff -Nru adiv-2.1/MD5 adiv-2.1.1/MD5 --- adiv-2.1/MD5 2021-08-21 14:40:03.000000000 +0000 +++ adiv-2.1.1/MD5 2021-09-27 15:10:16.000000000 +0000 @@ -1,4 +1,4 @@ -cdc4c4afadc374def51a37d51e8d5500 *DESCRIPTION +db827bad3456e54556d3a341c9137693 *DESCRIPTION 2329548e145c9d94a8984ebd010e6cf3 *NAMESPACE 510d0c3278cb0c413925603314ef6f76 *R/CFbinary.R 58b4f088e2caabd71876e99f7d3ac97b *R/CFprop.R @@ -8,7 +8,7 @@ 82c2cce958589115281596be146d310b *R/EqRS.R 1d809028c89f9e821ce13542aff2ad8b *R/EqRSintra.R 79413530989796fb0bb3d9bff5282271 *R/EqRao.R -6cb96a796b30fc3669733cad69bc7e50 *R/FPdivparam.R +c7f1f73635141ca11b13ef4b56d2f54a *R/FPdivparam.R 72593f90603b112631dc35beb183a6b5 *R/Jac.R 5a117c43c89cea4b2e27281a52c73939 *R/K.R cbbc6c92cd72bc1a8fb48db331116601 *R/Kstar.R @@ -105,7 +105,7 @@ 4a54934b23e6aa76d6278f15b6ce433a *R/twoHmax.R b2558c980eeac65986846e25ff3803a0 *R/uniqueness.R e39548aa7430721e93596284a4406b29 *R/wapqe.R -b215b1ee92364884b608fdf50d632dfe *build/partial.rdb +610ef84d73b2c9f89b09b15dbb19915b *build/partial.rdb 5ba3e91c2406e5a1add642d1ebf31f35 *data/RDMCCP16.rda bd3ffc521e094d8372292968bed77189 *data/RP15EI.rda 57943449bf0704c6b0fb58955bd57241 *data/RP15JVS.rda diff -Nru adiv-2.1/R/FPdivparam.R adiv-2.1.1/R/FPdivparam.R --- adiv-2.1/R/FPdivparam.R 2021-02-28 15:51:23.000000000 +0000 +++ adiv-2.1.1/R/FPdivparam.R 2021-09-27 10:29:06.000000000 +0000 @@ -92,8 +92,9 @@ ORIval <- distinctAb(comm = commdiv, disORtree = dis, method = "KstarI", palpha = aaa)[[1]] ORIval[is.na(ORIval)] <- 0 divv <- rowSums(ORIval) - if(equivalent){ - if(is.null(dmax) | (dmax-max(dis)) >= tol) dmax <- max(dis) + if(equivalent){ + if(is.null(dmax)) dmax <- max(dis) + if((dmax-max(dis)) >= tol) dmax <- max(dis) if(abs(aaa-1) > tol) divv <- (( 1-(aaa-1)*divv/dmax ))^(1/(1-aaa)) else divv <- exp(divv/dmax) }