From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 18 Oct 2014 06:30:10 +0000 (+0200)
Subject: FREQUENCIES: Fix the default /STATISTICS.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=e1335ea67114822554e0d51bd5e0b49401b17dc4

FREQUENCIES: Fix the default /STATISTICS.

The subcommand /STATISTICS (with nothing following) should be the same as /STATISTICS = DEFAULT.
---

diff --git a/src/language/stats/frequencies.c b/src/language/stats/frequencies.c
index dc6eede880..da1a3828d1 100644
--- a/src/language/stats/frequencies.c
+++ b/src/language/stats/frequencies.c
@@ -635,10 +635,18 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds)
 
       if (lex_match_id (lexer, "STATISTICS"))
 	{
-	  lex_match (lexer, T_EQUALS);
-
-	  frq.stats = 0;
-	  frq.n_stats = 0;
+	  frq.stats = BIT_INDEX (FRQ_ST_MEAN) 
+	    | BIT_INDEX (FRQ_ST_STDDEV) 
+	    | BIT_INDEX (FRQ_ST_MINIMUM)
+	    | BIT_INDEX (FRQ_ST_MAXIMUM);
+	  
+	  frq.n_stats = 4;
+
+	  if (lex_match (lexer, T_EQUALS))
+	    {
+	      frq.n_stats = 0;
+	      frq.stats = 0;
+	    }
 
 	  while (lex_token (lexer) != T_ENDCMD
 		 && lex_token (lexer) != T_SLASH)
diff --git a/tests/language/stats/frequencies.at b/tests/language/stats/frequencies.at
index 6ac8def6f5..12255d64db 100644
--- a/tests/language/stats/frequencies.at
+++ b/tests/language/stats/frequencies.at
@@ -617,3 +617,58 @@ N,Valid,3
 Percentiles,50 (Median),2.00
 ])
 AT_CLEANUP
+
+
+
+AT_SETUP([FREQUENCIES default statistics])
+AT_DATA([median.sps], [dnl
+data list notable list /x *.
+begin data.
+10
+20
+3000000
+end data.
+
+FREQUENCIES
+	/VARIABLES = x
+	/STATISTICS
+	.
+
+FREQUENCIES
+	/VARIABLES = x
+	/STATISTICS = DEFAULT
+	.
+])
+
+AT_CHECK([pspp median.sps -O format=csv], [0],  [dnl
+Table: x
+Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
+,10.00,1,33.33,33.33,33.33
+,20.00,1,33.33,33.33,66.67
+,3000000.00,1,33.33,33.33,100.00
+Total,,3,100.0,100.0,
+
+Table: x
+N,Valid,3
+,Missing,0
+Mean,,1000010.00
+Std Dev,,1732042.15
+Minimum,,10.00
+Maximum,,3000000.00
+
+Table: x
+Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
+,10.00,1,33.33,33.33,33.33
+,20.00,1,33.33,33.33,66.67
+,3000000.00,1,33.33,33.33,100.00
+Total,,3,100.0,100.0,
+
+Table: x
+N,Valid,3
+,Missing,0
+Mean,,1000010.00
+Std Dev,,1732042.15
+Minimum,,10.00
+Maximum,,3000000.00
+])
+AT_CLEANUP