diff --git a/src/utils.ts b/src/utils.ts index c6ad0dbc..19d00a7c 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -457,11 +457,6 @@ export const toError = (value: unknown): Error => { } } -const toAverage = (statistics: Statistics): string => - `${formatNumber(mToNs(statistics.mean))} \xb1 ${statistics.rme.toFixed(2)}%` -const toMedian = (statistics: Statistics): string => - `${formatNumber(mToNs(statistics.p50))} \xb1 ${formatNumber(mToNs(statistics.mad))}` - export const defaultConvertTaskResultForConsoleTable: ConsoleTableConverter = ( task: Task ): Record => { @@ -471,10 +466,10 @@ export const defaultConvertTaskResultForConsoleTable: ConsoleTableConverter = ( 'Task name': task.name, ...(state === 'aborted-with-statistics' || state === 'completed' ? { - 'Latency avg (ns)': toAverage(task.result.latency), - 'Latency med (ns)': toMedian(task.result.latency), - 'Throughput avg (ops/s)': toAverage(task.result.throughput), - 'Throughput med (ops/s)': toMedian(task.result.throughput), + 'Latency avg (ns)': `${formatNumber(mToNs(task.result.latency.mean), 5, 2)} \xb1 ${task.result.latency.rme.toFixed(2)}%`, + 'Latency med (ns)': `${formatNumber(mToNs(task.result.latency.p50), 5, 2)} \xb1 ${formatNumber(mToNs(task.result.latency.mad), 5, 2)}`, + 'Throughput avg (ops/s)': `${Math.round(task.result.throughput.mean).toString()} \xb1 ${task.result.throughput.rme.toFixed(2)}%`, + 'Throughput med (ops/s)': `${Math.round(task.result.throughput.p50).toString()} \xb1 ${Math.round(task.result.throughput.mad).toString()}`, Samples: task.result.latency.samples.length, } : state !== 'errored' diff --git a/test/utils-default-convert-task-result-for-console-table.test.ts b/test/utils-default-convert-task-result-for-console-table.test.ts index 25fd76ab..2a6916a5 100644 --- a/test/utils-default-convert-task-result-for-console-table.test.ts +++ b/test/utils-default-convert-task-result-for-console-table.test.ts @@ -199,8 +199,8 @@ test('defaultConvertTaskResultForConsoleTable - aborted-with-statistics', () => Remarks: 'aborted-with-statistics', Samples: 5, 'Task name': 'Sample Task', - 'Throughput avg (ops/s)': '1000000000 ± 9.82%', - 'Throughput med (ops/s)': '1000000000 ± 50000000', + 'Throughput avg (ops/s)': '1000 ± 9.82%', + 'Throughput med (ops/s)': '1000 ± 50', }) expect(Object.keys(defaultConvertTaskResultForConsoleTable({ @@ -242,8 +242,8 @@ test('defaultConvertTaskResultForConsoleTable - completed', () => { 'Latency med (ns)': '1000000000 ± 50000000', Samples: 5, 'Task name': 'Sample Task', - 'Throughput avg (ops/s)': '1000000000 ± 9.82%', - 'Throughput med (ops/s)': '1000000000 ± 50000000', + 'Throughput avg (ops/s)': '1000 ± 9.82%', + 'Throughput med (ops/s)': '1000 ± 50', }) expect(Object.keys(defaultConvertTaskResultForConsoleTable({