percentile. Fixes bug #17424. Thanks to John Darrington for
review.
* frequencies.q (internal_cmd_frequencies): Fix handling of bit
masks for `stats' variable. If median is selected, turn it off
and add a 50th percentile.
(add_percentile): Simplify code a little.
(calc_stats): Drop special casing of median.
(dump_statistics): Ditto, except that we label the 50th percentile
as "50 (Median)" to make it clear that it's also the median.
+2007-08-01 Ben Pfaff <blp@gnu.org>
+
+ Clean up handling of median, by treating it almost like any other
+ percentile. Fixes bug #17424. Thanks to John Darrington for
+ review.
+ * frequencies.q (internal_cmd_frequencies): Fix handling of bit
+ masks for `stats' variable. If median is selected, turn it off
+ and add a 50th percentile.
+ (add_percentile): Simplify code a little.
+ (calc_stats): Drop special casing of median.
+ (dump_statistics): Ditto, except that we label the 50th percentile
+ as "50 (Median)" to make it clear that it's also the median.
+
2007-07-31 Ben Pfaff <blp@gnu.org>
Remove integer mode from FREQUENCIES and incidentally fix bug
2007-07-31 Ben Pfaff <blp@gnu.org>
Remove integer mode from FREQUENCIES and incidentally fix bug
static struct percentile *percentiles;
static int n_percentiles;
static struct percentile *percentiles;
static int n_percentiles;
-static int implicit_50th ;
-
/* Groups of statistics. */
#define BI BIT_INDEX
#define frq_default \
/* Groups of statistics. */
#define BI BIT_INDEX
#define frq_default \
if (cmd.a_statistics[FRQ_ST_ALL])
stats |= frq_all;
if (cmd.sort != FRQ_AVALUE && cmd.sort != FRQ_DVALUE)
if (cmd.a_statistics[FRQ_ST_ALL])
stats |= frq_all;
if (cmd.sort != FRQ_AVALUE && cmd.sort != FRQ_DVALUE)
+ stats &= ~BIT_INDEX (frq_median);
for (i = 0; i < frq_n_stats; i++)
if (cmd.a_statistics[st_name[i].st_indx])
stats |= BIT_INDEX (i);
if (stats & frq_kurt)
for (i = 0; i < frq_n_stats; i++)
if (cmd.a_statistics[st_name[i].st_indx])
stats |= BIT_INDEX (i);
if (stats & frq_kurt)
+ stats |= BIT_INDEX (frq_sekurt);
+ stats |= BIT_INDEX (frq_seskew);
/* Calculate n_stats. */
n_stats = 0;
/* Calculate n_stats. */
n_stats = 0;
add_percentile (j / (double) cmd.n_ntiles[i]);
}
}
add_percentile (j / (double) cmd.n_ntiles[i]);
}
}
+ if (stats & BIT_INDEX (frq_median))
+ {
+ /* Treat the median as the 50% percentile.
+ We output it in the percentiles table as "50 (Median)." */
+ add_percentile (0.5);
+ stats &= ~BIT_INDEX (frq_median);
+ n_stats--;
+ }
/* Do it! */
input = casereader_create_filter_weight (proc_open (ds), dataset_dict (ds),
/* Do it! */
input = casereader_create_filter_weight (proc_open (ds), dataset_dict (ds),
{
percentiles = pool_nrealloc (syntax_pool, percentiles,
n_percentiles + 1, sizeof *percentiles);
{
percentiles = pool_nrealloc (syntax_pool, percentiles,
n_percentiles + 1, sizeof *percentiles);
-
- if (i < n_percentiles)
- memmove (&percentiles[i + 1], &percentiles[i],
- (n_percentiles - i) * sizeof (struct percentile) );
-
+ insert_element (percentiles, n_percentiles, sizeof *percentiles, i);
percentiles[i].p = x;
n_percentiles++;
}
percentiles[i].p = x;
n_percentiles++;
}
double rank;
int i = 0;
int idx;
double rank;
int i = 0;
int idx;
/* Calculate percentiles. */
/* Calculate percentiles. */
- /* If the 50th percentile was not explicitly requested then we must
- calculate it anyway --- it's the median */
- median_value = 0 ;
- for (i = 0; i < n_percentiles; i++)
- {
- if (percentiles[i].p == 0.5)
- {
- median_value = &percentiles[i].value;
- break;
- }
- }
-
- if ( 0 == median_value )
- {
- add_percentile (0.5);
- implicit_50th = 1;
- }
-
for (i = 0; i < n_percentiles; i++)
{
percentiles[i].flag = 0;
for (i = 0; i < n_percentiles; i++)
{
percentiles[i].flag = 0;
percentiles[i].value = percentiles[i].x1 +
( percentiles[i].x2 - percentiles[i].x1) * s ;
percentiles[i].value = percentiles[i].x1 +
( percentiles[i].x2 - percentiles[i].x1) * s ;
-
- if ( percentiles[i].p == 0.50)
- median_value = &percentiles[i].value;
d[frq_max] = ft->valid[ft->n_valid - 1].value[0].f;
d[frq_mode] = X_mode;
d[frq_range] = d[frq_max] - d[frq_min];
d[frq_max] = ft->valid[ft->n_valid - 1].value[0].f;
d[frq_mode] = X_mode;
d[frq_range] = d[frq_max] - d[frq_min];
- d[frq_median] = *median_value;
d[frq_sum] = d[frq_mean] * W;
d[frq_stddev] = sqrt (d[frq_variance]);
d[frq_semean] = d[frq_stddev] / sqrt (W);
d[frq_sum] = d[frq_mean] * W;
d[frq_stddev] = sqrt (d[frq_variance]);
d[frq_semean] = d[frq_stddev] / sqrt (W);
struct tab_table *t;
int i, r;
struct tab_table *t;
int i, r;
- int n_explicit_percentiles = n_percentiles;
-
- if ( implicit_50th && n_percentiles > 0 )
- --n_percentiles;
-
if (var_is_alpha (v))
return;
ft = &get_var_freqs (v)->tab;
if (var_is_alpha (v))
return;
ft = &get_var_freqs (v)->tab;
}
calc_stats (v, stat_value);
}
calc_stats (v, stat_value);
- t = tab_create (3, n_stats + n_explicit_percentiles + 2, 0);
+ t = tab_create (3, n_stats + n_percentiles + 2, 0);
tab_dim (t, tab_natural_dimensions);
tab_box (t, TAL_1, TAL_1, -1, -1 , 0 , 0 , 2, tab_nr(t) - 1) ;
tab_dim (t, tab_natural_dimensions);
tab_box (t, TAL_1, TAL_1, -1, -1 , 0 , 0 , 2, tab_nr(t) - 1) ;
tab_float(t, 2, 1, TAB_NONE, ft->total_cases - ft->valid_cases, 11, 0);
tab_float(t, 2, 1, TAB_NONE, ft->total_cases - ft->valid_cases, 11, 0);
- for (i = 0; i < n_explicit_percentiles; i++, r++)
+ for (i = 0; i < n_percentiles; i++, r++)
{
if ( i == 0 )
{
tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, _("Percentiles"));
}
{
if ( i == 0 )
{
tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, _("Percentiles"));
}
- tab_float (t, 1, r, TAB_LEFT, percentiles[i].p * 100, 3, 0 );
+ if (percentiles[i].p == 0.5)
+ tab_text (t, 1, r, TAB_LEFT, _("50 (Median)"));
+ else
+ tab_float (t, 1, r, TAB_LEFT, percentiles[i].p * 100, 3, 0);
tab_float (t, 2, r, TAB_NONE, percentiles[i].value, 11, 3);
}
tab_float (t, 2, r, TAB_NONE, percentiles[i].value, 11, 3);
}
+2007-08-01 Ben Pfaff <blp@gnu.org>
+
+ * command/weight.sh: Update to match new output format for median
+ under FREQUENCIES.
+
+ * stats/percentiles-compatible.sh: Ditto.
+
+ * stats/percentiles-enhanced.sh: Ditto.
+
2007-07-28 John Darrington <john@darrington.wattle.id.au>
* command/t-test-1-indep-val.sh: Changed the order of groups in the
2007-07-28 John Darrington <john@darrington.wattle.id.au>
* command/t-test-1-indep-val.sh: Changed the order of groups in the
| 80| 1| 0|100|
| 94| 1| 0|100|
+--------+--------+---+---+
| 80| 1| 0|100|
| 94| 1| 0|100|
+--------+--------+---+---+
-+-----------------+---------+
-|N Valid | 730|
-| Missing| 0|
-|Mean | 31.515|
-|S.E. Mean | .405|
-|Median | 28.500|
-|Mode | 21.000|
-|Std Dev | 10.937|
-|Variance | 119.608|
-|Kurtosis | 2.411|
-|S.E. Kurt | .181|
-|Skewness | 1.345|
-|S.E. Skew | .090|
-|Range | 76.000|
-|Minimum | 18.000|
-|Maximum | 94.000|
-|Sum |23006.000|
-+-----------------+---------+
++-----------------------+---------+
+|N Valid | 730|
+| Missing | 0|
+|Mean | 31.515|
+|S.E. Mean | .405|
+|Mode | 21.000|
+|Std Dev | 10.937|
+|Variance | 119.608|
+|Kurtosis | 2.411|
+|S.E. Kurt | .181|
+|Skewness | 1.345|
+|S.E. Skew | .090|
+|Range | 76.000|
+|Minimum | 18.000|
+|Maximum | 94.000|
+|Sum |23006.000|
+|Percentiles 50 (Median)| 28.500|
++-----------------------+---------+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi
#===========#========#=========#========#========#========#
| Total| 5| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 5| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N Valid | 5|
-| Missing| 0|
-|Mean |3.000|
-|Std Dev |1.581|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |1.500|
-| 50 |3.000|
-| 75 |4.500|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 5|
+| Missing | 0|
+|Mean |3.000|
+|Std Dev |1.581|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |1.500|
+| 50 (Median)|3.000|
+| 75 |4.500|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi
#===========#========#=========#========#========#========#
| Total| 5| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 5| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N Valid | 5|
-| Missing| 0|
-|Mean |3.000|
-|Std Dev |1.581|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |2.000|
-| 50 |3.000|
-| 75 |4.000|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 5|
+| Missing | 0|
+|Mean |3.000|
+|Std Dev |1.581|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |2.000|
+| 50 (Median)|3.000|
+| 75 |4.000|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N Valid | 10|
-| Missing| 0|
-|Mean |3.000|
-|Std Dev |1.491|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |2.000|
-| 50 |3.000|
-| 75 |4.000|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 10|
+| Missing | 0|
+|Mean |3.000|
+|Std Dev |1.491|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |2.000|
+| 50 (Median)|3.000|
+| 75 |4.000|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi
#===========#========#=========#========#========#========#
| Total| 6| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 6| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N Valid | 6|
-| Missing| 0|
-|Mean |3.500|
-|Std Dev |1.517|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |3.000|
-| 50 |3.500|
-| 75 |4.750|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 6|
+| Missing | 0|
+|Mean |3.500|
+|Std Dev |1.517|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |3.000|
+| 50 (Median)|3.500|
+| 75 |4.750|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
#===========#========#=========#========#========#========#
| Total| 10| 100.0| 100.0| |
+--------------------+---------+--------+--------+--------+
-+-------------------+-----+
-|N Valid | 6|
-| Missing| 4|
-|Mean |3.500|
-|Std Dev |1.517|
-|Minimum |1.000|
-|Maximum |5.000|
-|Percentiles 0 |1.000|
-| 25 |3.000|
-| 50 |3.500|
-| 75 |4.750|
-| 100 |5.000|
-+-------------------+-----+
++-----------------------+-----+
+|N Valid | 6|
+| Missing | 4|
+|Mean |3.500|
+|Std Dev |1.517|
+|Minimum |1.000|
+|Maximum |5.000|
+|Percentiles 0 |1.000|
+| 25 |3.000|
+| 50 (Median)|3.500|
+| 75 |4.750|
+| 100 |5.000|
++-----------------------+-----+
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi