From 4a53a6b27807ee6e0adf2c6b8212b8cda1028e33 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Sat, 3 Sep 2022 09:55:44 -0400 Subject: [PATCH] Fix labels for mlr histogram --auto (#1089) --- internal/pkg/transformers/histogram.go | 4 ++-- test/cases/verb-histogram/0005/cmd | 1 + test/cases/verb-histogram/0005/experr | 0 test/cases/verb-histogram/0005/expout | 10 ++++++++++ test/cases/verb-histogram/0006/cmd | 1 + test/cases/verb-histogram/0006/experr | 0 test/cases/verb-histogram/0006/expout | 10 ++++++++++ test/cases/verb-histogram/0007/cmd | 1 + test/cases/verb-histogram/0007/experr | 0 test/cases/verb-histogram/0007/expout | 10 ++++++++++ test/input/histo2.csv | 5 +++++ 11 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 test/cases/verb-histogram/0005/cmd create mode 100644 test/cases/verb-histogram/0005/experr create mode 100644 test/cases/verb-histogram/0005/expout create mode 100644 test/cases/verb-histogram/0006/cmd create mode 100644 test/cases/verb-histogram/0006/experr create mode 100644 test/cases/verb-histogram/0006/expout create mode 100644 test/cases/verb-histogram/0007/cmd create mode 100644 test/cases/verb-histogram/0007/experr create mode 100644 test/cases/verb-histogram/0007/expout create mode 100644 test/input/histo2.csv diff --git a/internal/pkg/transformers/histogram.go b/internal/pkg/transformers/histogram.go index 553aed737..54e4ec45c 100644 --- a/internal/pkg/transformers/histogram.go +++ b/internal/pkg/transformers/histogram.go @@ -367,11 +367,11 @@ func (tr *TransformerHistogram) emitAuto( outrec.PutReference( tr.outputPrefix+"bin_lo", - mlrval.FromFloat((lo+float64(i))/mul), + mlrval.FromFloat(lo+(float64(i)/mul)), ) outrec.PutReference( tr.outputPrefix+"bin_hi", - mlrval.FromFloat((lo+float64(i+1))/mul), + mlrval.FromFloat(lo+(float64(i+1)/mul)), ) for _, valueFieldName := range tr.valueFieldNames { diff --git a/test/cases/verb-histogram/0005/cmd b/test/cases/verb-histogram/0005/cmd new file mode 100644 index 000000000..d5c2384fb --- /dev/null +++ b/test/cases/verb-histogram/0005/cmd @@ -0,0 +1 @@ +mlr --icsv --opprint histogram --nbins 9 --auto -f x test/input/histo2.csv diff --git a/test/cases/verb-histogram/0005/experr b/test/cases/verb-histogram/0005/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/verb-histogram/0005/expout b/test/cases/verb-histogram/0005/expout new file mode 100644 index 000000000..c845d3ac6 --- /dev/null +++ b/test/cases/verb-histogram/0005/expout @@ -0,0 +1,10 @@ +bin_lo bin_hi x_count +100.00000000 122.22222222 1 +122.22222222 144.44444444 0 +144.44444444 166.66666667 0 +166.66666667 188.88888889 0 +188.88888889 211.11111111 2 +211.11111111 233.33333333 0 +233.33333333 255.55555556 0 +255.55555556 277.77777778 0 +277.77777778 300.00000000 1 diff --git a/test/cases/verb-histogram/0006/cmd b/test/cases/verb-histogram/0006/cmd new file mode 100644 index 000000000..f09fcb028 --- /dev/null +++ b/test/cases/verb-histogram/0006/cmd @@ -0,0 +1 @@ +mlr --icsv --opprint histogram --nbins 9 --auto -f y test/input/histo2.csv diff --git a/test/cases/verb-histogram/0006/experr b/test/cases/verb-histogram/0006/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/verb-histogram/0006/expout b/test/cases/verb-histogram/0006/expout new file mode 100644 index 000000000..8e4d41d9b --- /dev/null +++ b/test/cases/verb-histogram/0006/expout @@ -0,0 +1,10 @@ +bin_lo bin_hi y_count +20.00000000 26.66666667 1 +26.66666667 33.33333333 0 +33.33333333 40.00000000 0 +40.00000000 46.66666667 2 +46.66666667 53.33333333 0 +53.33333333 60.00000000 0 +60.00000000 66.66666667 0 +66.66666667 73.33333333 0 +73.33333333 80.00000000 1 diff --git a/test/cases/verb-histogram/0007/cmd b/test/cases/verb-histogram/0007/cmd new file mode 100644 index 000000000..7a1db935f --- /dev/null +++ b/test/cases/verb-histogram/0007/cmd @@ -0,0 +1 @@ +mlr --icsv --opprint histogram --nbins 9 --auto -f x,y test/input/histo2.csv diff --git a/test/cases/verb-histogram/0007/experr b/test/cases/verb-histogram/0007/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/verb-histogram/0007/expout b/test/cases/verb-histogram/0007/expout new file mode 100644 index 000000000..9d76ec7a4 --- /dev/null +++ b/test/cases/verb-histogram/0007/expout @@ -0,0 +1,10 @@ +bin_lo bin_hi x_count y_count +20.00000000 51.11111111 0 3 +51.11111111 82.22222222 0 1 +82.22222222 113.33333333 1 0 +113.33333333 144.44444444 0 0 +144.44444444 175.55555556 0 0 +175.55555556 206.66666667 2 0 +206.66666667 237.77777778 0 0 +237.77777778 268.88888889 0 0 +268.88888889 300.00000000 1 0 diff --git a/test/input/histo2.csv b/test/input/histo2.csv new file mode 100644 index 000000000..d9f6dfa57 --- /dev/null +++ b/test/input/histo2.csv @@ -0,0 +1,5 @@ +x,y +100,20 +200,40 +300,41 +200,80