diff --git a/tests/error-passthru.vd b/tests/error-passthru.vd index 19e93ef11..b05a69606 100644 --- a/tests/error-passthru.vd +++ b/tests/error-passthru.vd @@ -4,3 +4,4 @@ benchmark Quantity 1 select-equal-cell , benchmark Quantity delete-cells gzd benchmark Quantity addcol-expr Quantity.foo = benchmark Quantity.foo freq-col F +benchmark_Quantity.foo_freq histogram hide-col - Hide current column diff --git a/tests/extend.vd b/tests/extend.vd index d1f5a046a..c7709ecb8 100644 --- a/tests/extend.vd +++ b/tests/extend.vd @@ -1,20 +1,18 @@ sheet col row longname input keystrokes comment open-file tests/data2.tsv o open-file tests/data1.tsv o -data1 jump-sheet-2 ^[2 data2 Key key-col ! -data2 jump-sheet-1 ^[1 data1 Key key-col ! - sheets-stack S +data1 sheets-stack S sheets キdata2 select-row s sheets キdata1 select-row s -sheets join-sheets extend & +sheets join-selected extend & data1+data2 A freq-col F -data1+data2_A_freq jump-sheet-1 ^[1 data1 dup-rows g" data1_copy A key-col ! data1_copy Key key-col ! data1_copy sheets-all S sheets_all キdata1_copy select-row s sheets_all キdata1+data2_A_freq select-row s -sheets_all join-sheets extend & +sheets_all join-selected extend & +data1+data2_A_freq+data1_copy histogram hide-col - Hide current column diff --git a/tests/freq-same-int.vd b/tests/freq-same-int.vd index 462f64c4b..5ecdce85c 100644 --- a/tests/freq-same-int.vd +++ b/tests/freq-same-int.vd @@ -7,6 +7,6 @@ benchmark Quantity キ2018-07-03 setcol-input 3 ge benchmark unselect-rows gu benchmark Quantity type-int # benchmark Quantity freq-col F -benchmark_Quantity_freq quit-sheet q benchmark Quantity キ2018-07-03 edit-cell 2 e benchmark Quantity freq-col F +benchmark_Quantity_freq histogram hide-col - Hide current column diff --git a/tests/golden/error-passthru.tsv b/tests/golden/error-passthru.tsv index d066c34ab..01025a119 100644 --- a/tests/golden/error-passthru.tsv +++ b/tests/golden/error-passthru.tsv @@ -1,2 +1,2 @@ -Quantity.foo count percent histogram -#ERR 51 100.00 ************************************************** +Quantity.foo count percent +#ERR 51 100.00 diff --git a/tests/golden/extend.tsv b/tests/golden/extend.tsv index 6f56f8a2f..0de7d298d 100644 --- a/tests/golden/extend.tsv +++ b/tests/golden/extend.tsv @@ -1,4 +1,4 @@ -A count percent histogram data1_copy_Key data1_copy_B -a1 1 33.33 ************************************************** 1 b1 -c1 1 33.33 ************************************************** 2 d1 -e1 1 33.33 ************************************************** 2 f1 +A count percent data1_copy_Key data1_copy_B +a1 1 33.33 1 b1 +c1 1 33.33 2 d1 +e1 1 33.33 2 f1 diff --git a/tests/golden/freq-same-int.tsv b/tests/golden/freq-same-int.tsv index 1d9969841..6a14fe57e 100644 --- a/tests/golden/freq-same-int.tsv +++ b/tests/golden/freq-same-int.tsv @@ -1,3 +1,3 @@ -Quantity count percent histogram -2 1 1.96 * -3 50 98.04 ************************************************** +Quantity count percent +2 1 1.96 +3 50 98.04 diff --git a/tests/golden/histogram.tsv b/tests/golden/histogram.tsv index 159893432..fb0874f31 100644 --- a/tests/golden/histogram.tsv +++ b/tests/golden/histogram.tsv @@ -1,6 +1,6 @@ -Quantity count percent histogram -2.00 - 30.40 26 92.86 ************************************************** -30.40 - 58.80 1 3.57 * -58.80 - 87.20 0 0.00 -87.20 - 115.60 0 0.00 -115.60 - 144.00 1 3.57 * +Quantity count percent +2.00 - 30.40 26 92.86 +30.40 - 58.80 1 3.57 +58.80 - 87.20 0 0.00 +87.20 - 115.60 0 0.00 +115.60 - 144.00 1 3.57 diff --git a/tests/golden/numeric_binning.tsv b/tests/golden/numeric_binning.tsv index b1a921a82..6b7556bdc 100644 --- a/tests/golden/numeric_binning.tsv +++ b/tests/golden/numeric_binning.tsv @@ -1,8 +1,8 @@ -Quantity count percent histogram -1.00 - 21.43 46 90.20 ************************************************** -21.43 - 41.86 3 5.88 *** -41.86 - 62.29 1 1.96 * -123.57 - 144.00 1 1.96 * -62.29 - 82.71 0 0.00 -82.71 - 103.14 0 0.00 -103.14 - 123.57 0 0.00 +Quantity count percent +1.00 - 21.43 46 90.20 +21.43 - 41.86 3 5.88 +41.86 - 62.29 1 1.96 +123.57 - 144.00 1 1.96 +62.29 - 82.71 0 0.00 +82.71 - 103.14 0 0.00 +103.14 - 123.57 0 0.00 diff --git a/tests/histogram.vd b/tests/histogram.vd index 340767bc4..376015245 100644 --- a/tests/histogram.vd +++ b/tests/histogram.vd @@ -1,8 +1,9 @@ sheet col row longname input keystrokes comment open-file sample_data/benchmark.csv o - numeric_binning set-option True +global numeric_binning set-option True benchmark Quantity type-int # benchmark Quantity addcol-expr Quantity > 1 = benchmark Quantity > 1 select-col-regex True | benchmark dup-selected " benchmark_selectedref Quantity freq-col F +benchmark_selectedref_Quantity_freq histogram hide-col - Hide current column diff --git a/tests/numeric_binning.vd b/tests/numeric_binning.vd index 07b4671ab..231a2dff0 100644 --- a/tests/numeric_binning.vd +++ b/tests/numeric_binning.vd @@ -1,6 +1,7 @@ sheet col row longname input keystrokes comment open-file sample_data/benchmark.csv o - override numeric_binning set-option True +global numeric_binning set-option True benchmark Quantity type-int # benchmark Quantity freq-col F benchmark_Quantity_freq count sort-desc ] +benchmark_Quantity_freq histogram hide-col - Hide current column