From: Ben Pfaff Date: Fri, 12 Aug 2022 18:10:16 +0000 (-0700) Subject: more pcompute X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=32d612555853c41f5fd89cc225a2d98bfa240718 more pcompute --- diff --git a/tests/language/stats/ctables.at b/tests/language/stats/ctables.at index 432da3deb4..388c61f1c1 100644 --- a/tests/language/stats/ctables.at +++ b/tests/language/stats/ctables.at @@ -13,7 +13,6 @@ dnl * THRU (numeric ranges) dnl * OTHERNM dnl - Date/time variables and values dnl - Test PCOMPUTE: -dnl * PCOMPUTE for more than one kind of summary (e.g. [COUNT, ROWPCT]). dnl * MISSING, OTHERNM dnl * multi-dimensional (multiple CCT_POSTCOMPUTE in one cell) dnl * dates @@ -1616,31 +1615,67 @@ AT_DATA([ctables.sps], CTABLES /PCOMPUTE &x=EXPR([3] + [4]) /PCOMPUTE &y=EXPR([4] + [5]) - /PPROPERTIES &x LABEL='3+4' HIDESOURCECATS=YES FORMAT=COUNT F8.2 + /PPROPERTIES &x LABEL='3+4' FORMAT=COUNT F8.2 /PPROPERTIES &y LABEL=')LABEL[5]+)LABEL[6]' - /TABLE=qn105ba BY qns1 - /CATEGORIES VARIABLES=qns1 [1, 2, SUBTOTAL, 3, 4, 5, &x, &y, SUBTOTAL] + /TABLE=qn105ba [COUNT, ROWPCT] BY qns1 + /CATEGORIES VARIABLES=qns1 [1, 2, SUBTOTAL, 3, 4, 5, &x, &y, SUBTOTAL] TOTAL=YES + +* Adding HIDESOURCECATS=YES for one PPROPERTIES. +CTABLES + /PCOMPUTE &x=EXPR([3] + [4]) + /PCOMPUTE &y=EXPR([4] + [5]) + /PPROPERTIES &x LABEL='3+4' FORMAT=COUNT F8.2 + /PPROPERTIES &y LABEL=')LABEL[5]+)LABEL[6]' HIDESOURCECATS=YES + /TABLE=qn105ba [COUNT, ROWPCT] BY qns1 + /CATEGORIES VARIABLES=qns1 [1, 2, SUBTOTAL, 3, 4, 5, &x, &y, SUBTOTAL] TOTAL=YES ]]) -AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl - Custom Tables -╭────────────────────────────────────────────────────────┬─────────────────────────────────────────────────────────────╮ -│ │ S1. Including yourself, how many members of this household │ -│ │ are age 16 or older? │ -│ ├───────┬───────┬──────────┬───────┬────────┬──────┬──────────┤ -│ │ 1 │ 2 │ Subtotal │ 5 │ 3+4 │ 4+5 │ Subtotal │ -│ ├───────┼───────┼──────────┼───────┼────────┼──────┼──────────┤ -│ │ Count │ Count │ Count │ Count │ Count │ Count│ Count │ -├────────────────────────────────────────────────────────┼───────┼───────┼──────────┼───────┼────────┼──────┼──────────┤ -│105b. How likely is it that drivers who have Almost │ 147│ 246│ 393│ 11│ 81.00│ 30│ 92│ -│had too much to drink to drive safely will certain │ │ │ │ │ │ │ │ -│A. Get stopped by the police? Very likely│ 384│ 552│ 936│ 14│ 171.00│ 65│ 185│ -│ Somewhat │ 590│ 1249│ 1839│ 20│ 265.00│ 92│ 285│ -│ likely │ │ │ │ │ │ │ │ -│ Somewhat │ 278│ 647│ 925│ 6│ 116.00│ 38│ 122│ -│ unlikely │ │ │ │ │ │ │ │ -│ Very │ 141│ 290│ 431│ 4│ 59.00│ 22│ 63│ -│ unlikely │ │ │ │ │ │ │ │ -╰────────────────────────────────────────────────────────┴───────┴───────┴──────────┴───────┴────────┴──────┴──────────╯ +AT_CHECK([pspp ctables.sps -O box=unicode -O width=140], [0], [dnl + Custom Tables +╭───────────────────┬──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ +│ │ S1. Including yourself, how many members of this household are age 16 or older? │ +│ ├───────────┬───────────┬───────────┬───────────┬──────────┬──────────┬────────────┬──────────┬───────────┬────────────┤ +│ │ 1 │ 2 │ Subtotal │ 3 │ 4 │ 5 │ 3+4 │ 4+5 │ Subtotal │ Total │ +│ ├─────┬─────┼─────┬─────┼─────┬─────┼─────┬─────┼─────┬────┼─────┬────┼──────┬─────┼─────┬────┼─────┬─────┼─────┬──────┤ +│ │ │ │ │ │ │ │ │ │ │ Row│ │ Row│ │ │ │ Row│ │ │ │ │ +│ │Count│Row %│Count│Row %│Count│Row %│Count│Row %│Count│ % │Count│ % │ Count│Row %│Count│ % │Count│Row %│Count│ Row %│ +├───────────────────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼────┼─────┼────┼──────┼─────┼─────┼────┼─────┼─────┼─────┼──────┤ +│105b. How Almost │ 147│30.3%│ 246│50.7%│ 393│81.0%│ 62│12.8%│ 19│3.9%│ 11│2.3%│ 81.00│16.7%│ 30│6.2%│ 92│19.0%│ 485│100.0%│ +│likely is certain │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│it that │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│drivers Very │ 384│34.3%│ 552│49.2%│ 936│83.5%│ 120│10.7%│ 51│4.5%│ 14│1.2%│171.00│15.3%│ 65│5.8%│ 185│16.5%│ 1121│100.0%│ +│who have likely │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│had too │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│much to Somewhat│ 590│27.8%│ 1249│58.8%│ 1839│86.6%│ 193│ 9.1%│ 72│3.4%│ 20│ .9%│265.00│12.5%│ 92│4.3%│ 285│13.4%│ 2124│100.0%│ +│drink to likely │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│drive │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│safely Somewhat│ 278│26.6%│ 647│61.8%│ 925│88.3%│ 84│ 8.0%│ 32│3.1%│ 6│ .6%│116.00│11.1%│ 38│3.6%│ 122│11.7%│ 1047│100.0%│ +│will A. unlikely│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│Get │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│stopped by Very │ 141│28.5%│ 290│58.7%│ 431│87.2%│ 41│ 8.3%│ 18│3.6%│ 4│ .8%│ 59.00│11.9%│ 22│4.5%│ 63│12.8%│ 494│100.0%│ +│the unlikely│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│police? │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +╰───────────────────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴────┴─────┴────┴──────┴─────┴─────┴────┴─────┴─────┴─────┴──────╯ + + Custom Tables +╭─────────────────────────────────────────┬────────────────────────────────────────────────────────────────────────────────────────────────╮ +│ │ S1. Including yourself, how many members of this household are age 16 or older? │ +│ ├───────────┬───────────┬───────────┬───────────┬────────────┬──────────┬───────────┬────────────┤ +│ │ 1 │ 2 │ Subtotal │ 3 │ 3+4 │ 4+5 │ Subtotal │ Total │ +│ ├─────┬─────┼─────┬─────┼─────┬─────┼─────┬─────┼──────┬─────┼─────┬────┼─────┬─────┼─────┬──────┤ +│ │ │ │ │ │ │ │ │ │ │ │ │ Row│ │ │ │ │ +│ │Count│Row %│Count│Row %│Count│Row %│Count│Row %│ Count│Row %│Count│ % │Count│Row %│Count│ Row %│ +├─────────────────────────────────────────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼──────┼─────┼─────┼────┼─────┼─────┼─────┼──────┤ +│105b. How likely is it that Almost │ 147│30.3%│ 246│50.7%│ 393│81.0%│ 62│12.8%│ 81.00│16.7%│ 30│6.2%│ 92│19.0%│ 485│100.0%│ +│drivers who have had too much certain │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│to drink to drive safely will Very │ 384│34.3%│ 552│49.2%│ 936│83.5%│ 120│10.7%│171.00│15.3%│ 65│5.8%│ 185│16.5%│ 1121│100.0%│ +│A. Get stopped by the police? likely │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│ Somewhat │ 590│27.8%│ 1249│58.8%│ 1839│86.6%│ 193│ 9.1%│265.00│12.5%│ 92│4.3%│ 285│13.4%│ 2124│100.0%│ +│ likely │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│ Somewhat │ 278│26.6%│ 647│61.8%│ 925│88.3%│ 84│ 8.0%│116.00│11.1%│ 38│3.6%│ 122│11.7%│ 1047│100.0%│ +│ unlikely │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +│ Very │ 141│28.5%│ 290│58.7%│ 431│87.2%│ 41│ 8.3%│ 59.00│11.9%│ 22│4.5%│ 63│12.8%│ 494│100.0%│ +│ unlikely │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ +╰─────────────────────────────────────────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴──────┴─────┴─────┴────┴─────┴─────┴─────┴──────╯ ]) AT_CLEANUP