Update SolverBenchmark for DataFrames v0.21

Author: amontoison

Project.toml

@@ -16,11 +16,12 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
 BenchmarkProfiles = "0.2.0, 0.3.0"
 BenchmarkTools = "^0.4.2, 0.5"
-DataFrames = "^0.20"
+DataFrames = "^0.21"
 GitHub = "^5.0.2"
 JSON = "0.20.0, 0.21.0"
 LaTeXTabulars = "^0.1.0"
@@ -37,6 +38,7 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [targets]
-test = ["LibGit2", "LinearAlgebra", "Test", "Plots", "Random", "Printf", "UnicodePlots"]
+test = ["LibGit2", "LinearAlgebra", "Test", "Plots", "Random", "Printf", "UnicodePlots", "SparseArrays"]

src/formatting.jl

@@ -31,15 +31,15 @@ Outputs:
 - `table::Array{String,2}`: formatted table.
 """
 function format_table(df :: DataFrame, formatter::Function;
-                      cols :: Array{Symbol,1} = names(df),
+                      cols :: Array{Symbol,1} = propertynames(df),
                       ignore_missing_cols :: Bool = false,
                       fmt_override :: Dict{Symbol,F} = Dict{Symbol,Function}(),
                       hdr_override :: Dict{Symbol,String} = Dict{Symbol,String}(),
                      ) where F <: Function
   if ignore_missing_cols
     cols = filter(c->hasproperty(df, c), cols)
   elseif !all(hasproperty(df, c) for c in cols)
-    missing_cols = setdiff(cols, names(df))
+    missing_cols = setdiff(cols, propertynames(df))
     @error("There are no columns `" * join(missing_cols, ", ") * "` in dataframe")
     throw(BoundsError)
   end

src/join.jl

@@ -26,9 +26,9 @@ function join(stats::Dict{Symbol,DataFrame},
               hdr_override::Dict{Symbol,String} = Dict{Symbol,String}(),
              )
   length(cols) == 0 && error("cols can't be empty")
-  if !all(:id in names(df) for (s,df) in stats)
+  if !all(:id in propertynames(df) for (s,df) in stats)
     error("Missing column :id in some DataFrame")
-  elseif !all(setdiff(cols, names(df)) == [] for (s,df) in stats)
+  elseif !all(setdiff(cols, propertynames(df)) == [] for (s,df) in stats)
     error("Not all DataFrames have all columns given by `cols`")
   end
 
@@ -49,13 +49,14 @@ function join(stats::Dict{Symbol,DataFrame},
   df = stats[s][:, invariant_cols]
 
   rename_f(c, s) = begin
-    c in invariant_cols && return c
-    sc = haskey(hdr_override, c) ? hdr_override[c] : string(c)
+    Symbol(c) in invariant_cols && return c
+    sc = haskey(hdr_override, c) ? hdr_override[c] : c
     Symbol(sc * "_$s")
   end
 
+  show(df)
   for (s, dfs) in stats
-    df = join(df, rename(c->rename_f(c, s), dfs[!, cols]), on=:id, makeunique=true)
+    df = innerjoin(df, rename(c->rename_f(c, s), dfs[!, cols]), on=:id, makeunique=true)
   end
 
   return df

test/example/joined.md

@@ -1,12 +1,12 @@
-|    id |    name | flag_alpha |  f_alpha |  t_alpha | flag_beta |   f_beta |   t_beta | flag_gamma |  f_gamma |  t_gamma |
-|-------|---------|------------|----------|----------|-----------|----------|----------|------------|----------|----------|
-|     1 | prob001 |    failure | -6.9e-01 |  6.2e+01 |   success | -1.1e+00 |  1.8e+02 |    success |  6.3e-02 |  3.3e+01 |
-|     2 | prob002 |    failure | -7.6e-01 |  3.5e+02 |   failure |  8.2e-01 |  8.0e+01 |    success |  1.2e-01 |  6.9e+02 |
-|     3 | prob003 |    success |  4.0e-01 |  7.7e+02 |   success |  1.5e-01 |  6.8e+02 |    success |  2.7e+00 |  8.4e+02 |
-|     4 | prob004 |    success |  8.1e-01 |  4.3e+01 |   failure | -3.3e-01 |  9.3e+02 |    failure | -6.9e-01 |  1.9e+02 |
-|     5 | prob005 |    success | -3.5e-01 |  2.7e+02 |   failure |  1.4e+00 |  9.7e+02 |    failure | -5.5e-02 |  1.6e+02 |
-|     6 | prob006 |    success | -1.9e-01 |  6.7e+01 |   success | -4.4e-01 |  6.5e+02 |    success |  4.2e-01 |  9.0e+02 |
-|     7 | prob007 |    success | -1.6e+00 |  1.6e+02 |   success |  1.1e+00 |  6.0e+02 |    success | -1.4e+00 |  9.5e+01 |
-|     8 | prob008 |    success | -2.5e+00 |  6.1e+02 |   success | -2.5e-01 |  4.8e+02 |    failure | -4.5e-01 |  7.8e+02 |
-|     9 | prob009 |    success |  2.3e+00 |  1.4e+02 |   failure |  2.9e-01 |  6.3e+01 |    failure | -8.8e-01 |  8.7e+02 |
-|    10 | prob010 |    failure |  2.2e-01 |  8.4e+02 |   success | -3.5e+00 |  4.7e+02 |    success |  1.1e+00 |  8.4e+02 |
+|    id |    name | status_alpha |  f_alpha |  t_alpha | status_beta |   f_beta |   t_beta | status_gamma |  f_gamma |  t_gamma |
+|-------|---------|--------------|----------|----------|-------------|----------|----------|--------------|----------|----------|
+|     1 | prob001 |      failure | -6.9e-01 |  6.2e+01 |     success | -1.1e+00 |  1.8e+02 |      success |  6.3e-02 |  3.3e+01 |
+|     2 | prob002 |      failure | -7.6e-01 |  3.5e+02 |     failure |  8.2e-01 |  8.0e+01 |      success |  1.2e-01 |  6.9e+02 |
+|     3 | prob003 |      success |  4.0e-01 |  7.7e+02 |     success |  1.5e-01 |  6.8e+02 |      success |  2.7e+00 |  8.4e+02 |
+|     4 | prob004 |      success |  8.1e-01 |  4.3e+01 |     failure | -3.3e-01 |  9.3e+02 |      failure | -6.9e-01 |  1.9e+02 |
+|     5 | prob005 |      success | -3.5e-01 |  2.7e+02 |     failure |  1.4e+00 |  9.7e+02 |      failure | -5.5e-02 |  1.6e+02 |
+|     6 | prob006 |      success | -1.9e-01 |  6.7e+01 |     success | -4.4e-01 |  6.5e+02 |      success |  4.2e-01 |  9.0e+02 |
+|     7 | prob007 |      success | -1.6e+00 |  1.6e+02 |     success |  1.1e+00 |  6.0e+02 |      success | -1.4e+00 |  9.5e+01 |
+|     8 | prob008 |      success | -2.5e+00 |  6.1e+02 |     success | -2.5e-01 |  4.8e+02 |      failure | -4.5e-01 |  7.8e+02 |
+|     9 | prob009 |      success |  2.3e+00 |  1.4e+02 |     failure |  2.9e-01 |  6.3e+01 |      failure | -8.8e-01 |  8.7e+02 |
+|    10 | prob010 |      failure |  2.2e-01 |  8.4e+02 |     success | -3.5e+00 |  4.7e+02 |      success |  1.1e+00 |  8.4e+02 |

test/example/joined.tex

@@ -1,12 +1,12 @@
 \begin{longtable}[c]{lrrrrrrrrrr}
 \hline 
-id & name & flag\_alpha & f\_alpha & t\_alpha & flag\_beta & f\_beta & t\_beta & flag\_gamma & f\_gamma & t\_gamma \\
+id & name & status\_alpha & f\_alpha & t\_alpha & status\_beta & f\_beta & t\_beta & status\_gamma & f\_gamma & t\_gamma \\
 \hline 
 \endfirsthead
 \multicolumn{11}{l}
 {{\bfseries \tablename\ \thetable{} --- continued from previous page}} \\
 \hline 
-id & name & flag\_alpha & f\_alpha & t\_alpha & flag\_beta & f\_beta & t\_beta & flag\_gamma & f\_gamma & t\_gamma \\
+id & name & status\_alpha & f\_alpha & t\_alpha & status\_beta & f\_beta & t\_beta & status\_gamma & f\_gamma & t\_gamma \\
 \hline 
 \endhead
 \hline