From 43513ffd3bd31a0a26c007715a87f846a579afaa Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 24 Jun 2009 16:47:38 +0800 Subject: [PATCH] Added second ROC test --- src/language/stats/roc.c | 8 ++++ tests/automake.mk | 1 + tests/command/roc2.sh | 96 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100755 tests/command/roc2.sh diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c index eae528a3..88f95404 100644 --- a/src/language/stats/roc.c +++ b/src/language/stats/roc.c @@ -640,6 +640,13 @@ do_roc (struct cmd_roc *roc, struct casereader *input, struct dictionary *dict) n_neg = process_negative_group (var, neg, dict, &rs[i]); + printf ("Positives:\n"); + dump_casereader (n_pos); + + printf ("Negatives:\n"); + dump_casereader (n_neg); + +#if 0 /* Simple join on VALUE */ for ( ; (cpos = casereader_read (n_pos) ); case_unref (cpos)) { @@ -690,6 +697,7 @@ do_roc (struct cmd_roc *roc, struct casereader *input, struct dictionary *dict) rs[i].q2hat /= rs[i].n1 * pow2 (rs[i].n2); } } +#endif casereader_destroy (positives); casereader_destroy (negatives); diff --git a/tests/automake.mk b/tests/automake.mk index 9824a9fe..aba1a62c 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -57,6 +57,7 @@ dist_TESTS = \ tests/command/regression-qr.sh \ tests/command/reliability.sh \ tests/command/roc.sh \ + tests/command/roc2.sh \ tests/command/sample.sh \ tests/command/sort.sh \ tests/command/sysfiles.sh \ diff --git a/tests/command/roc2.sh b/tests/command/roc2.sh new file mode 100755 index 00000000..08572749 --- /dev/null +++ b/tests/command/roc2.sh @@ -0,0 +1,96 @@ +#!/bin/sh + +# This program tests the ROC command. + +TEMPDIR=/tmp/pspp-tst-$$ +TESTFILE=$TEMPDIR/`basename $0`.sps + +# ensure that top_builddir are absolute +if [ -z "$top_builddir" ] ; then top_builddir=. ; fi +if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi +top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp + +# ensure that top_srcdir is absolute +top_srcdir=`cd $top_srcdir; pwd` + +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 + cd / + 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 <