[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp src/language/stats/ChangeLog src/language/...
From: |
John Darrington |
Subject: |
[Pspp-cvs] pspp src/language/stats/ChangeLog src/language/... |
Date: |
Thu, 14 Feb 2008 12:08:40 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 08/02/14 12:08:40
Modified files:
src/language/stats: ChangeLog examine.q
src/math : factor-stats.c
tests : automake.mk
Added files:
tests/bugs : examine-missing2.sh
Log message:
Fixed bug #22306
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/examine.q?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/factor-stats.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/examine-missing2.sh?cvsroot=pspp&rev=1.1
Patches:
Index: src/language/stats/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- src/language/stats/ChangeLog 2 Jan 2008 03:46:43 -0000 1.71
+++ src/language/stats/ChangeLog 14 Feb 2008 12:08:39 -0000 1.72
@@ -1,3 +1,8 @@
+2008-02-14 John Darrington <address@hidden>
+
+ * examine.q: Fixed counts of missing variables. Thanks to
+ Jason Stover for reporting this problem.
+
2008-01-02 John Darrington <address@hidden>
* binomial.c chisquare.c examine.q frequencies.q oneway.q regression.q
: updated
Index: src/language/stats/examine.q
===================================================================
RCS file: /sources/pspp/pspp/src/language/stats/examine.q,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/language/stats/examine.q 2 Jan 2008 03:46:44 -0000 1.31
+++ src/language/stats/examine.q 14 Feb 2008 12:08:39 -0000 1.32
@@ -156,7 +156,7 @@
void factor_calc (const struct ccase *c, int case_no,
- double weight, int case_missing);
+ double weight, bool case_missing);
/* Represent a factor as a string, so it can be
@@ -639,7 +639,7 @@
/* Perform calculations for the sub factors */
void
factor_calc (const struct ccase *c, int case_no, double weight,
- int case_missing)
+ bool case_missing)
{
size_t v;
struct factor *fctr = factors;
@@ -700,7 +700,7 @@
if (case_missing || var_is_value_missing (var, val, exclude_values))
{
free (val);
- continue;
+ val = NULL;
}
metrics_calc ( & (*foo)->m[v], val, weight, case_no);
@@ -754,7 +754,7 @@
for (; casereader_read (input, &c); case_destroy (&c))
{
- int case_missing = 0;
+ bool case_missing = false;
const double weight = dict_get_case_weight (dict, &c, NULL);
if ( cmd->miss == XMN_LISTWISE )
@@ -768,7 +768,7 @@
);
if ( var_is_value_missing (var, val, exclude_values))
- case_missing = 1;
+ case_missing = true;
free (val);
}
@@ -786,7 +786,7 @@
|| case_missing )
{
free (val) ;
- continue ;
+ val = NULL;
}
metrics_calc (&totals[v], val, weight, case_no);
@@ -975,7 +975,6 @@
tab_title (tbl, _ ("Case Processing Summary"));
-
tab_joint_text (tbl, heading_columns, 0,
n_cols -1, 0,
TAB_CENTER | TAT_TITLE,
@@ -990,22 +989,21 @@
for ( i = 0 ; i < 3 ; ++i )
{
- tab_text (tbl, heading_columns + i*2 , 2, TAB_CENTER | TAT_TITLE,
+ tab_text (tbl, heading_columns + i * 2 , 2, TAB_CENTER | TAT_TITLE,
_ ("N"));
- tab_text (tbl, heading_columns + i*2 + 1, 2, TAB_CENTER | TAT_TITLE,
+ tab_text (tbl, heading_columns + i * 2 + 1, 2, TAB_CENTER | TAT_TITLE,
_ ("Percent"));
tab_joint_text (tbl, heading_columns + i*2 , 1,
- heading_columns + i*2 + 1, 1,
+ heading_columns + i * 2 + 1, 1,
TAB_CENTER | TAT_TITLE,
subtitle[i]);
tab_box (tbl, -1, -1,
TAL_0, TAL_0,
- heading_columns + i*2, 1,
- heading_columns + i*2 + 1, 1);
-
+ heading_columns + i * 2, 1,
+ heading_columns + i * 2 + 1, 1);
}
@@ -1020,7 +1018,6 @@
tab_text (tbl, 2, heading_rows - 1, TAB_CENTER | TAT_TITLE,
var_to_string (fctr->indep_var[1]));
}
-
}
@@ -1030,7 +1027,6 @@
if ( fctr )
n_factors = hsh_count (fctr->fstats);
-
if ( i > 0 )
tab_hline (tbl, TAL_1, 0, n_cols -1 , i * n_factors + heading_rows);
@@ -1040,13 +1036,10 @@
var_to_string (dependent_var[i])
);
-
if ( !fctr )
populate_summary (tbl, heading_columns,
(i * n_factors) + heading_rows,
&totals[i]);
-
-
else
{
struct factor_statistics **fs = fctr->fs;
@@ -1077,7 +1070,6 @@
if (fctr->indep_var[1] && count > 0 )
tab_hline (tbl, TAL_1, 1, n_cols - 1,
(i * n_factors ) + count + heading_rows);
-
}
prev = (*fs)->id[0];
@@ -1135,11 +1127,7 @@
/* This seems a bit pointless !!! */
tab_text (t, col + 5, row + 0, TAB_RIGHT | TAT_PRINTF, "%2.0f%%",
100.0 * total / total );
-
-
}
-
-
}
Index: src/math/factor-stats.c
===================================================================
RCS file: /sources/pspp/pspp/src/math/factor-stats.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/math/factor-stats.c 11 Nov 2007 05:51:44 -0000 1.8
+++ src/math/factor-stats.c 14 Feb 2008 12:08:40 -0000 1.9
@@ -73,11 +73,9 @@
moments1_add(fs->moments, x, weight);
-
if ( x < fs->min) fs->min = x;
if ( x > fs->max) fs->max = x;
-
wv = (struct weighted_value **) hsh_probe (fs->ordered_data,(void *) val );
if ( *wv )
Index: tests/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/tests/automake.mk,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- tests/automake.mk 6 Feb 2008 10:33:05 -0000 1.53
+++ tests/automake.mk 14 Feb 2008 12:08:40 -0000 1.54
@@ -105,6 +105,7 @@
tests/bugs/get.sh \
tests/bugs/examine-1sample.sh \
tests/bugs/examine-missing.sh \
+ tests/bugs/examine-missing2.sh \
tests/bugs/freq-nolabels.sh \
tests/bugs/get-no-file.sh \
tests/bugs/html-frequency.sh \
Index: tests/bugs/examine-missing2.sh
===================================================================
RCS file: tests/bugs/examine-missing2.sh
diff -N tests/bugs/examine-missing2.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/bugs/examine-missing2.sh 14 Feb 2008 12:08:40 -0000 1.1
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+# This program tests for a bug in which examine didn't
+# count missing values.
+
+TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
+
+# ensure that top_srcdir and top_builddir are absolute
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+top_srcdir=`cd $top_srcdir; pwd`
+top_builddir=`cd $top_builddir; pwd`
+
+PSPP=$top_builddir/src/ui/terminal/pspp
+
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
+
+LANG=C
+export LANG
+
+
+cleanup()
+{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ rm -rf $TEMPDIR
+}
+
+
+fail()
+{
+ echo $activity
+ echo FAILED
+ cleanup;
+ exit 1;
+}
+
+
+no_result()
+{
+ echo $activity
+ echo NO RESULT;
+ cleanup;
+ exit 2;
+}
+
+pass()
+{
+ cleanup;
+ exit 0;
+}
+
+mkdir -p $TEMPDIR
+
+cd $TEMPDIR
+
+activity="create program"
+cat > $TESTFILE << EOF
+DATA LIST LIST /x * y *.
+BEGIN DATA.
+1 1
+2 1
+3 1
+4 1
+5 2
+6 2
+. 2
+END DATA
+
+EXAMINE /x by y.
+EOF
+if [ $? -ne 0 ] ; then no_result ; fi
+
+
+activity="run program"
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+if [ $? -ne 0 ] ; then no_result ; fi
+
+activity="compare results"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
+1.1 DATA LIST. Reading free-form data from INLINE.
++--------+------+
+|Variable|Format|
+#========#======#
+|x |F8.0 |
+|y |F8.0 |
++--------+------+
+2.1 EXAMINE. Case Processing Summary
+#=#=============================#
+# # Cases #
+# #---------+---------+---------#
+# # Valid | Missing | Total #
+# #-+-------+-+-------+-+-------#
+# #N|Percent|N|Percent|N|Percent#
+#=#=#=======#=#=======#=#=======#
+#x#6| 86%|1| 14%|7| 100%#
+#=#=#=======#=#=======#=#=======#
+2.2 EXAMINE. Case Processing Summary
+#==========#=============================#
+# # Cases #
+# #---------+---------+---------#
+# # Valid | Missing | Total #
+# #-+-------+-+-------+-+-------#
+# y #N|Percent|N|Percent|N|Percent#
+#==========#=#=======#=#=======#=#=======#
+#x 1.00#4| 100%|0| 0%|4| 100%#
+# 2.00#2| 67%|1| 33%|3| 100%#
+#==========#=#=======#=#=======#=#=======#
+EOF
+if [ $? -ne 0 ] ; then fail ; fi
+
+pass;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp src/language/stats/ChangeLog src/language/...,
John Darrington <=