diff --git a/lib/benchee/collection_data.ex b/lib/benchee/collection_data.ex index 8c4d0956..0904c318 100644 --- a/lib/benchee/collection_data.ex +++ b/lib/benchee/collection_data.ex @@ -7,6 +7,6 @@ defmodule Benchee.CollectionData do @type t :: %__MODULE__{ samples: [float | non_neg_integer], - statistics: Benchee.Statistics.t() | nil + statistics: Benchee.Statistics.t() } end diff --git a/lib/benchee/conversion.ex b/lib/benchee/conversion.ex index d33d7efe..729d394a 100644 --- a/lib/benchee/conversion.ex +++ b/lib/benchee/conversion.ex @@ -20,8 +20,8 @@ defmodule Benchee.Conversion do iex> statistics = %Benchee.Statistics{average: 1_000_000.0, ips: 1000.0} iex> scenario = %Benchee.Benchmark.Scenario{ - ...> run_time_data: %{statistics: statistics}, - ...> memory_usage_data: %{statistics: statistics} + ...> run_time_data: %Benchee.CollectionData{statistics: statistics}, + ...> memory_usage_data: %Benchee.CollectionData{statistics: statistics} ...> } iex> Benchee.Conversion.units([scenario], :best) %{ diff --git a/lib/benchee/formatters/console.ex b/lib/benchee/formatters/console.ex index 7a968fe1..b31f896c 100644 --- a/lib/benchee/formatters/console.ex +++ b/lib/benchee/formatters/console.ex @@ -23,7 +23,7 @@ defmodule Benchee.Formatters.Console do ``` iex> scenarios = [ ...> %Benchee.Benchmark.Scenario{ - ...> name: "My Job", input_name: "My input", run_time_data: %{ + ...> name: "My Job", input_name: "My input", run_time_data: %Benchee.CollectionData{ ...> statistics: %Benchee.Statistics{ ...> average: 200.0, ...> ips: 5000.0, @@ -32,11 +32,10 @@ defmodule Benchee.Formatters.Console do ...> percentiles: %{99 => 300.1}, ...> sample_size: 200 ...> } - ...> }, - ...> memory_usage_data: %{statistics: %Benchee.Statistics{}} + ...> } ...> }, ...> %Benchee.Benchmark.Scenario{ - ...> name: "Job 2", input_name: "My input", run_time_data: %{ + ...> name: "Job 2", input_name: "My input", run_time_data: %Benchee.CollectionData{ ...> statistics: %Benchee.Statistics{ ...> average: 400.0, ...> ips: 2500.0, @@ -45,8 +44,7 @@ defmodule Benchee.Formatters.Console do ...> percentiles: %{99 => 500.1}, ...> sample_size: 200 ...> } - ...> }, - ...> memory_usage_data: %{statistics: %Benchee.Statistics{}} + ...> } ...> } ...> ] iex> suite = %Benchee.Suite{ diff --git a/lib/benchee/formatters/console/run_time.ex b/lib/benchee/formatters/console/run_time.ex index 3d03de22..2a601171 100644 --- a/lib/benchee/formatters/console/run_time.ex +++ b/lib/benchee/formatters/console/run_time.ex @@ -38,23 +38,23 @@ defmodule Benchee.Formatters.Console.RunTime do iex> scenarios = [ ...> %Benchee.Benchmark.Scenario{ ...> name: "My Job", - ...> run_time_data: %{ + ...> run_time_data: %Benchee.CollectionData{ ...> statistics: %Benchee.Statistics{ ...> average: 200.0, ips: 5000.0,std_dev_ratio: 0.1, median: 190.0, percentiles: %{99 => 300.1}, ...> minimum: 100.1, maximum: 200.2, sample_size: 10_101, mode: 333.2 ...> }, ...> }, - ...> memory_usage_data: %{statistics: memory_statistics} + ...> memory_usage_data: %Benchee.CollectionData{statistics: memory_statistics} ...> }, ...> %Benchee.Benchmark.Scenario{ ...> name: "Job 2", - ...> run_time_data: %{ + ...> run_time_data: %Benchee.CollectionData{ ...> statistics: %Benchee.Statistics{ ...> average: 400.0, ips: 2500.0, std_dev_ratio: 0.2, median: 390.0, percentiles: %{99 => 500.1}, ...> minimum: 200.2, maximum: 400.4, sample_size: 20_202, mode: [612.3, 554.1] ...> } ...> }, - ...> memory_usage_data: %{statistics: memory_statistics} + ...> memory_usage_data: %Benchee.CollectionData{statistics: memory_statistics} ...> } ...> ] iex> configuration = %{comparison: false, unit_scaling: :best, extended_statistics: true} diff --git a/test/benchee/benchmark/runner_test.exs b/test/benchee/benchmark/runner_test.exs index 998aecf8..881b044f 100644 --- a/test/benchee/benchmark/runner_test.exs +++ b/test/benchee/benchmark/runner_test.exs @@ -347,7 +347,7 @@ defmodule Benchee.Benchmark.RunnerTest do suite = %Suite{ scenarios: [ %Scenario{ - run_time_data: %{samples: [1_000_000]}, + run_time_data: %Benchee.CollectionData{samples: [1_000_000]}, function: fn -> 1 + 1 end, input: @no_input } @@ -675,7 +675,7 @@ defmodule Benchee.Benchmark.RunnerTest do # should be closer to 10 by you know slow CI systems... assert hook_call_count >= 2 # for every sample that we have, we should have run a hook - [%{run_time_data: %{samples: run_times}}] = result.scenarios + [%{run_time_data: %Benchee.CollectionData{samples: run_times}}] = result.scenarios sample_size = length(run_times) assert sample_size == hook_call_count end diff --git a/test/benchee/formatters/console/memory_test.exs b/test/benchee/formatters/console/memory_test.exs index f552c744..6ab92c52 100644 --- a/test/benchee/formatters/console/memory_test.exs +++ b/test/benchee/formatters/console/memory_test.exs @@ -2,7 +2,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do use ExUnit.Case, async: true doctest Benchee.Formatters.Console.Memory - alias Benchee.{Benchmark.Scenario, Formatters.Console.Memory, Statistics} + alias Benchee.{Benchmark.Scenario, CollectionData, Formatters.Console.Memory, Statistics} @console_config %{ comparison: true, @@ -15,7 +15,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -25,11 +25,11 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} }, %Scenario{ name: "Second", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 400.0, ips: 2_500.0, @@ -39,7 +39,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} } ] @@ -57,7 +57,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do long_scenario = %Scenario{ name: third_name, - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 400.1, ips: 2_500.0, @@ -67,7 +67,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} } longer_scenarios = scenarios ++ [long_scenario] @@ -86,7 +86,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -96,11 +96,11 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} }, %Scenario{ name: "Second", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -110,7 +110,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} } ] @@ -126,7 +126,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "Second", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -136,11 +136,11 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} }, %Scenario{ name: "First", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -150,7 +150,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} } ] @@ -174,7 +174,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -184,11 +184,11 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} }, %Scenario{ name: second_name, - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -198,7 +198,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} } ] @@ -215,7 +215,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -225,7 +225,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} } ] @@ -237,7 +237,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 100.0, std_dev: 0.0, @@ -247,11 +247,11 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} }, %Scenario{ name: "Second", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 200.0, std_dev: 0.0, @@ -261,7 +261,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} } ] @@ -282,7 +282,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First job", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -295,7 +295,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 50_000 } }, - run_time_data: %{statistics: %Statistics{average: 100.0, ips: 1_000.0}} + run_time_data: %CollectionData{statistics: %Statistics{average: 100.0, ips: 1_000.0}} } ] @@ -321,7 +321,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do end test "does nothing when there's no statistics to format" do - scenarios = [%Scenario{memory_usage_data: %{statistics: %Statistics{sample_size: 0}}}] + scenarios = [%Scenario{memory_usage_data: %CollectionData{statistics: %Statistics{sample_size: 0}}}] assert [] = Memory.format_scenarios(scenarios, %{}) end @@ -330,7 +330,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 100.0, std_dev: 0.0, @@ -340,12 +340,12 @@ defmodule Benchee.Formatters.Console.MemoryTest do sample_size: 10 } }, - run_time_data: %{statistics: %Statistics{}} + run_time_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Second", - memory_usage_data: %{statistics: %Statistics{}}, - run_time_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}}, + run_time_data: %CollectionData{statistics: %Statistics{}} } ] @@ -369,7 +369,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 0.0, median: 0.0, @@ -379,11 +379,11 @@ defmodule Benchee.Formatters.Console.MemoryTest do std_dev_ratio: 0.0 } }, - run_time_data: %{statistics: %Statistics{}} + run_time_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Second", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 100.0, median: 100.0, @@ -393,7 +393,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do std_dev_ratio: 0.10 } }, - run_time_data: %{statistics: %Statistics{}} + run_time_data: %CollectionData{statistics: %Statistics{}} } ] @@ -415,12 +415,12 @@ defmodule Benchee.Formatters.Console.MemoryTest do scenarios = [ %Scenario{ name: "First", - memory_usage_data: %{statistics: %Statistics{}}, - run_time_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}}, + run_time_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Second", - memory_usage_data: %{ + memory_usage_data: %CollectionData{ statistics: %Statistics{ average: 100.0, median: 100.0, @@ -430,7 +430,7 @@ defmodule Benchee.Formatters.Console.MemoryTest do std_dev_ratio: 0.10 } }, - run_time_data: %{statistics: %Statistics{}} + run_time_data: %CollectionData{statistics: %Statistics{}} } ] diff --git a/test/benchee/formatters/console/run_time_test.exs b/test/benchee/formatters/console/run_time_test.exs index c3b20dc1..63c5cd1c 100644 --- a/test/benchee/formatters/console/run_time_test.exs +++ b/test/benchee/formatters/console/run_time_test.exs @@ -2,7 +2,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do use ExUnit.Case, async: true doctest Benchee.Formatters.Console.RunTime - alias Benchee.{Benchmark.Scenario, Formatters.Console.RunTime, Statistics} + alias Benchee.{Benchmark.Scenario, CollectionData, Formatters.Console.RunTime, Statistics} @console_config %{ comparison: true, @@ -20,7 +20,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "First job", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -33,7 +33,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 50_000 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -56,7 +56,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "First job", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -69,7 +69,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 50_000 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -84,7 +84,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "First job", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -96,7 +96,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 50_000 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -110,7 +110,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "First", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -120,11 +120,11 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Second", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 400.0, ips: 2_500.0, @@ -134,7 +134,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 300 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -152,7 +152,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do long_scenario = %Scenario{ name: third_name, - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 400.1, ips: 2_500.0, @@ -162,7 +162,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } longer_scenarios = scenarios ++ [long_scenario] @@ -181,7 +181,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "First", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -191,11 +191,11 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 400 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Second", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -205,7 +205,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -221,7 +221,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "Second", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -231,11 +231,11 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "First", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -244,7 +244,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do percentiles: %{99 => 200.1} } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -268,7 +268,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "First", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -278,11 +278,11 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: second_name, - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -292,7 +292,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -309,7 +309,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "First", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -319,7 +319,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -331,7 +331,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "First", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 0.15, ips: 10_000.0, @@ -341,7 +341,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -355,7 +355,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do scenarios = [ %Scenario{ name: "Job", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 11_000_000.0, ips: 12_000.0, @@ -365,7 +365,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -380,7 +380,7 @@ defmodule Benchee.Formatters.Console.RunTimeTest do end test "does nothing when there's no statistics to format" do - scenarios = [%Scenario{run_time_data: %{statistics: %Statistics{sample_size: 0}}}] + scenarios = [%Scenario{run_time_data: %CollectionData{statistics: %Statistics{sample_size: 0}}}] assert [] = RunTime.format_scenarios(scenarios, %{}) end diff --git a/test/benchee/formatters/console_test.exs b/test/benchee/formatters/console_test.exs index baff9099..1d4d5220 100644 --- a/test/benchee/formatters/console_test.exs +++ b/test/benchee/formatters/console_test.exs @@ -3,7 +3,7 @@ defmodule Benchee.Formatters.ConsoleTest do doctest Benchee.Formatters.Console import ExUnit.CaptureIO - alias Benchee.{Benchmark.Scenario, Formatter, Formatters.Console, Statistics, Suite} + alias Benchee.{Benchmark.Scenario, CollectionData, Formatter, Formatters.Console, Statistics, Suite} @config %Benchee.Configuration{ title: "A comprehensive benchmarking of inputs" @@ -21,7 +21,7 @@ defmodule Benchee.Formatters.ConsoleTest do name: "Second", input_name: @no_input, input: @no_input, - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -31,13 +31,13 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "First", input_name: @no_input, input: @no_input, - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -47,7 +47,7 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -79,7 +79,7 @@ defmodule Benchee.Formatters.ConsoleTest do name: "Job", input_name: "My Arg", input: "My Arg", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -89,13 +89,13 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Job", input_name: "Other Arg", input: "Other Arg", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 400.0, ips: 2_500.0, @@ -105,7 +105,7 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -129,7 +129,7 @@ defmodule Benchee.Formatters.ConsoleTest do name: "Job", input_name: "Other Arg", input: "Other Arg", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 400.0, ips: 2_500.0, @@ -139,13 +139,13 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Job", input_name: "My Arg", input: "My Arg", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -155,7 +155,7 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -179,7 +179,7 @@ defmodule Benchee.Formatters.ConsoleTest do name: "Other Job", input_name: "My Arg", input: "My Arg", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -189,13 +189,13 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Job", input_name: "My Arg", input: "My Arg", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -205,13 +205,13 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Other Job", input_name: "Other Arg", input: "Other Arg", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 250.0, ips: 4_000.0, @@ -221,13 +221,13 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "Job", input_name: "Other Arg", input: "Other Arg", - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 400.0, ips: 2_500.0, @@ -237,7 +237,7 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -265,7 +265,7 @@ defmodule Benchee.Formatters.ConsoleTest do name: "job (improved)", input_name: @no_input, input: @no_input, - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 100.0, ips: 10_000.0, @@ -275,13 +275,13 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} }, %Scenario{ name: "job", input_name: @no_input, input: @no_input, - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -291,7 +291,7 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] @@ -309,7 +309,7 @@ defmodule Benchee.Formatters.ConsoleTest do name: "job", input_name: @no_input, input: @no_input, - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ average: 200.0, ips: 5_000.0, @@ -319,7 +319,7 @@ defmodule Benchee.Formatters.ConsoleTest do sample_size: 200 } }, - memory_usage_data: %{statistics: %Statistics{}} + memory_usage_data: %CollectionData{statistics: %Statistics{}} } ] diff --git a/test/benchee/statistics_test.exs b/test/benchee/statistics_test.exs index 58ddd148..923e06a3 100644 --- a/test/benchee/statistics_test.exs +++ b/test/benchee/statistics_test.exs @@ -73,7 +73,7 @@ defmodule Benchee.StatistcsTest do suite = Statistics.statistics(%Suite{scenarios: scenarios}) - [%Scenario{run_time_data: %{statistics: stats}}] = suite.scenarios + [%Scenario{run_time_data: %CollectionData{statistics: stats}}] = suite.scenarios assert stats.mode == 55 end @@ -88,7 +88,7 @@ defmodule Benchee.StatistcsTest do suite = Statistics.statistics(%Suite{scenarios: scenarios}) - [%Scenario{run_time_data: %{statistics: stats}}] = suite.scenarios + [%Scenario{run_time_data: %CollectionData{statistics: stats}}] = suite.scenarios assert_in_delta stats.std_dev, 164.7, 0.1 assert_in_delta stats.std_dev_ratio, 0.41, 0.01 end @@ -118,7 +118,7 @@ defmodule Benchee.StatistcsTest do %Suite{ scenarios: [ %Scenario{ - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ percentiles: %{ 25 => _, @@ -148,7 +148,7 @@ defmodule Benchee.StatistcsTest do %Suite{ scenarios: [ %Scenario{ - run_time_data: %{ + run_time_data: %CollectionData{ statistics: %Statistics{ percentiles: %{ 25 => _, @@ -175,8 +175,8 @@ defmodule Benchee.StatistcsTest do [ %Scenario{ - run_time_data: %{statistics: run_time_stats}, - memory_usage_data: %{statistics: memory_stats} + run_time_data: %CollectionData{statistics: run_time_stats}, + memory_usage_data: %CollectionData{statistics: memory_stats} } ] = suite.scenarios @@ -235,7 +235,7 @@ defmodule Benchee.StatistcsTest do end defp stats_for(suite, job_name, input_name) do - %Scenario{run_time_data: %{statistics: stats}} = + %Scenario{run_time_data: %CollectionData{statistics: stats}} = Enum.find(suite.scenarios, fn scenario -> scenario.job_name == job_name && scenario.input_name == input_name end)