add support for DataFrames 0.22

Author: mykelk

Project.toml

@@ -24,7 +24,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 
 [compat]
-DataFrames = "0.21"
+DataFrames = "0.21,0.22"
 DataStructures = "0.11,0.12,0.13,0.14,0.15,0.16,0.17,0.18"
 Discretizers = "3.0"
 Distributions = "0.17,0.18,0.19,0.20,0.21,0.22,0.23,0.24"

src/DiscreteBayesNet/tables.jl

@@ -66,7 +66,7 @@ function sumout(t::Table, v::NodeNameUnion)
     else
         # note that this will fail miserably if f is too large (~1E4 maybe?)
         #  nothing I can do; there is a github issue
-        return Table(by(f, remainingvars, df -> DataFrame(p = sum(df[!,:p]))))
+        return Table(combine(df -> DataFrame(p = sum(df[!,:p])), DataFrames.groupby(f, remainingvars)))
     end
 end
 

test/test_factors.jl

@@ -45,7 +45,7 @@ bn = rand_discrete_bn(10, 4)
 name = :N5
 
 ϕ = Factor(bn, name)
-df = join(DataFrame(ϕ), table(bn, name).potential, on=names(ϕ))
+df = innerjoin(DataFrame(ϕ), table(bn, name).potential, on=names(ϕ))
 diff = abs.(df[!,:p] - df[!,:potential])
 
 @test all(diff .< 1E-13)