diff --git a/Experiments/Scripts/comparison_exps.jl b/Experiments/Scripts/comparison_exps.jl index 7d900f7..43781ef 100644 --- a/Experiments/Scripts/comparison_exps.jl +++ b/Experiments/Scripts/comparison_exps.jl @@ -52,13 +52,13 @@ end println("Building...") -build_experiments(experiment_params) -build_experiments(max_bounds_experiment_params) +# build_experiments(experiment_params) +# build_experiments(max_bounds_experiment_params) println("Estimating...") -run_estimation_experiments(experiment_params; timeout=TIMEOUT_SEC) -run_estimation_experiments(max_bounds_experiment_params; timeout=TIMEOUT_SEC) +# run_estimation_experiments(experiment_params; timeout=TIMEOUT_SEC) +# run_estimation_experiments(max_bounds_experiment_params; timeout=TIMEOUT_SEC) comparison_methods = ["alley", "alleyTPI", "wj", "impr", "jsub", "cs", "cset", "sumrdf", "lss"] x_order = [string(data) for data in datasets] @@ -145,8 +145,8 @@ graph_grouped_bar_plot(smaller_experiment_params; y_type=memory_footprint, x_order = x_order, legend_order = bar_legend_order, - ylims=[0, 14], - y_ticks = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],#[20, 40, 60, 80, 100], + ylims=[0, 10], + y_ticks = [1, 2, 3, 4, 5, 6, 7, 8], legend_pos=:topleft, dimensions = (900, 400), scale_factor = 1000, @@ -162,7 +162,7 @@ graph_grouped_bar_plot(smaller_experiment_params; legend_order = bar_legend_order, legend_pos=:topleft, ylims=[0, 11], - y_ticks = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], #[100, 200, 300, 400, 500, 600, 700, 800], + y_ticks = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], dimensions = (900, 400), scale_factor = 1000, log_scale = true, diff --git a/Experiments/graph_results.jl b/Experiments/graph_results.jl index 7c52a7d..88024d0 100644 --- a/Experiments/graph_results.jl +++ b/Experiments/graph_results.jl @@ -331,23 +331,23 @@ function graph_grouped_boxplot_with_comparison_methods(experiment_params_list::V end # now handle leftover lss data - total = 0 - for results_key in keys(comparison_results) - # results_dict[(dataset, estimator, query_path)] = (Estimate=comparison_results[i, :Value], Runtime=comparison_results[i, :Runtime], QueryType=comparison_results[i,:QueryType]) - # look for all the rows where the estimator is lss, then push the appropriate x and y values. - if (results_key[2] == "lss") - total += 1 - current_results = comparison_results[results_key] - current_x = results_key[1] - current_y = if y_type == estimate_error - current_results[1] - else - current_results[2] + if ("lss" in estimator_types) + for results_key in keys(comparison_results) + # results_dict[(dataset, estimator, query_path)] = (Estimate=comparison_results[i, :Value], Runtime=comparison_results[i, :Runtime], QueryType=comparison_results[i,:QueryType]) + # look for all the rows where the estimator is lss, then push the appropriate x and y values. + if (results_key[2] == "lss") + current_results = comparison_results[results_key] + current_x = results_key[1] + current_y = if y_type == estimate_error + current_results[1] + else + current_results[2] + end + estimator = "lss" + push!(x_values, string(current_x)) + push!(y_values, typeof(current_y) == String ? parse(Float64, current_y) : current_y) + push!(estimators, estimator) end - estimator = "lss" - push!(x_values, string(current_x)) - push!(y_values, typeof(current_y) == String ? parse(Float64, current_y) : current_y) - push!(estimators, estimator) end end @@ -450,7 +450,7 @@ function graph_grouped_bar_plot(experiment_params_list::Vector{ExperimentParams} append!(y_values, [88, 648, 569, 800, 6600, 6900, 6300, 3200]) append!(groups, ["alleyTPI" for _ in 1:8]) append!(x_values, ["aids", "human", "lubm80", "dblp", "eu2005", "yeast", "youtube"]) - append!(y_values, [9023910, 9067842, 9018477, 8981142, 9010042,9045878, 8992702]) + append!(y_values, [9.023910, 9.067842, 9.018477, 8.981142, 9.010042, 9.045878, 8.992702]) # units of MB append!(groups, ["lss" for _ in 1:7]) elseif y_type == build_time @@ -461,8 +461,8 @@ function graph_grouped_bar_plot(experiment_params_list::Vector{ExperimentParams} append!(y_values, [221, 2518, 17452, 1061, 14233, 11738, 35585, 11044]) append!(groups, ["alleyTPI" for _ in 1:8]) append!(x_values, ["aids", "human", "lubm80", "dblp", "eu2005", "yeast", "youtube"]) - # append!(y_values, [1022.6, 29.5023, 3.6737, 3355.36, 492.89, 7047.44, 3130.0165]) - append!(y_values, [2207.7717, 50.2491, 5.9976, 8105.503, 328.89, 19839.2887, 2309.733]) + # append!(y_values, [1022.6, 29.5023, 3.6737, 3355.36, 492.89, 7047.44, 3130.0165]) # multithreaded results + append!(y_values, [2207.7717, 50.2491, 5.9976, 8105.503, 328.89, 19839.2887, 2309.733]) # single-threaded results append!(groups, ["lss" for _ in 1:7])