Update join calls to new DataFrames.

EcoJulia · Mar 2, 2021 · af99075 · af99075
1 parent f577ec1
commit af99075
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Ecology.jl b/src/Ecology.jl
@@ -240,7 +240,7 @@ function generalisedjaccard(proportions::AbstractMatrix, qs,
     error("Can only calculate Jaccard index for 2 subcommunities")
     ab = metadiv(α(meta), qs)
     g = metadiv(Γ(meta), qs)
-    j = join(ab, g, on=[:q, :type_level, :type_name,
+    j = innerjoin(ab, g, on=[:q, :type_level, :type_name,
                         :partition_level, :partition_name, :div_type],
              makeunique=true)
     j[!,:diversity] .= j[!,:diversity] ./ j[!,:diversity_1] .- 1

diff --git a/src/Jost.jl b/src/Jost.jl
@@ -58,7 +58,7 @@ Jost's alpha diversity
 function jostbeta(proportions::AbstractMatrix, qs)
     md = metacommunityDiversity(Gamma(Metacommunity(proportions)), qs)
     ja = jostalpha(proportions, qs)
-    j = join(md, ja, on=[:q, :type_level, :type_name,
+    j = innerjoin(md, ja, on=[:q, :type_level, :type_name,
                          :partition_level, :partition_name, :div_type],
              makeunique=true)
     j[!,:diversity] ./= j[!,:diversity_1]