projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make cases simpler, faster, and easier to understand.
[pspp-builds.git]
/
src
/
language
/
stats
/
t-test.q
diff --git
a/src/language/stats/t-test.q
b/src/language/stats/t-test.q
index 3d27874362050247f3ab55f534312d4bdfc217ee..bc6023c72ebfaf7e08785ecc09dfa9a6b96c7669 100644
(file)
--- a/
src/language/stats/t-test.q
+++ b/
src/language/stats/t-test.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2009
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-1799,17
+1799,18
@@
calculate (struct cmd_t_test *cmd,
struct casereader *pass1, *pass2, *pass3;
struct taint *taint;
struct casereader *pass1, *pass2, *pass3;
struct taint *taint;
- struct ccase c;
+ struct ccase
*
c;
enum mv_class exclude = cmd->miss != TTS_INCLUDE ? MV_ANY : MV_SYSTEM;
enum mv_class exclude = cmd->miss != TTS_INCLUDE ? MV_ANY : MV_SYSTEM;
- if (!casereader_peek (input, 0, &c))
+ c = casereader_peek (input, 0);
+ if (c == NULL)
{
casereader_destroy (input);
return;
}
{
casereader_destroy (input);
return;
}
- output_split_file_values (ds,
&
c);
- case_
destroy (&
c);
+ output_split_file_values (ds, c);
+ case_
unref (
c);
if ( cmd->miss == TTS_LISTWISE )
input = casereader_create_filter_missing (input,
if ( cmd->miss == TTS_LISTWISE )
input = casereader_create_filter_missing (input,
@@
-1823,8
+1824,8
@@
calculate (struct cmd_t_test *cmd,
casereader_split (input, &pass1, &pass2);
common_precalc (cmd);
casereader_split (input, &pass1, &pass2);
common_precalc (cmd);
- for (;
casereader_read (pass1, &c); case_destroy (&
c))
- common_calc (dict,
&
c, cmd, exclude);
+ for (;
(c = casereader_read (pass1)) != NULL; case_unref (
c))
+ common_calc (dict, c, cmd, exclude);
casereader_destroy (pass1);
common_postcalc (cmd);
casereader_destroy (pass1);
common_postcalc (cmd);
@@
-1832,22
+1833,22
@@
calculate (struct cmd_t_test *cmd,
{
case T_1_SAMPLE:
one_sample_precalc (cmd);
{
case T_1_SAMPLE:
one_sample_precalc (cmd);
- for (;
casereader_read (pass2, &c); case_destroy (&
c))
- one_sample_calc (dict,
&
c, cmd, exclude);
+ for (;
(c = casereader_read (pass2)) != NULL; case_unref (
c))
+ one_sample_calc (dict, c, cmd, exclude);
one_sample_postcalc (cmd);
break;
case T_PAIRED:
paired_precalc (cmd);
one_sample_postcalc (cmd);
break;
case T_PAIRED:
paired_precalc (cmd);
- for (;
casereader_read (pass2, &c); case_destroy (&
c))
- paired_calc (dict,
&
c, cmd, exclude);
+ for (;
(c = casereader_read (pass2)) != NULL; case_unref (
c))
+ paired_calc (dict, c, cmd, exclude);
paired_postcalc (cmd);
break;
case T_IND_SAMPLES:
pass3 = casereader_clone (pass2);
group_precalc (cmd);
paired_postcalc (cmd);
break;
case T_IND_SAMPLES:
pass3 = casereader_clone (pass2);
group_precalc (cmd);
- for (;
casereader_read (pass2, &c); case_destroy (&
c))
- group_calc (dict,
&
c, cmd, exclude);
+ for (;
(c = casereader_read (pass2)) != NULL; case_unref (
c))
+ group_calc (dict, c, cmd, exclude);
group_postcalc (cmd);
levene (dict, pass3, indep_var, cmd->n_variables, cmd->v_variables,
group_postcalc (cmd);
levene (dict, pass3, indep_var, cmd->n_variables, cmd->v_variables,
@@
-1933,10
+1934,10
@@
short
which_group (const struct group_statistics *g,
const struct group_properties *p)
{
which_group (const struct group_statistics *g,
const struct group_properties *p)
{
- if ( 0 == compare_values (&g->id, &p->v.g_value[0], p->indep_var))
+ if ( 0 == compare_values
_short
(&g->id, &p->v.g_value[0], p->indep_var))
return 0;
return 0;
- if ( 0 == compare_values (&g->id, &p->v.g_value[1], p->indep_var))
+ if ( 0 == compare_values
_short
(&g->id, &p->v.g_value[1], p->indep_var))
return 1;
return 2;
return 1;
return 2;