projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dropped use of casefiles
[pspp]
/
src
/
language
/
stats
/
oneway.q
diff --git
a/src/language/stats/oneway.q
b/src/language/stats/oneway.q
index a2d6ab9cb0bde3a4daf336674b97bce338bf9029..674cf710f085f4cbbeb2b81f07537921af86e6d7 100644
(file)
--- a/
src/language/stats/oneway.q
+++ b/
src/language/stats/oneway.q
@@
-19,31
+19,35
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <gsl/gsl_cdf.h>
#include <gsl/gsl_cdf.h>
-#include <
libpspp/message
.h>
+#include <
math
.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <math.h>
-#include <libpspp/alloc.h>
-#include <libpspp/str.h>
+
#include <data/case.h>
#include <data/case.h>
+#include <data/casefile.h>
#include <data/dictionary.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/command.h>
-#include <l
ibpspp/compiler
.h>
+#include <l
anguage/dictionary/split-file
.h>
#include <language/lexer/lexer.h>
#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
#include <libpspp/magic.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/misc.h>
-#include <output/table.h>
-#include <output/manager.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <procedure.h>
-#include <libpspp/hash.h>
-#include <data/casefile.h>
+#include <libpspp/str.h>
#include <math/group-proc.h>
#include <math/group.h>
#include <math/levene.h>
#include <math/group-proc.h>
#include <math/group.h>
#include <math/levene.h>
+#include <output/manager.h>
+#include <output/table.h>
+#include "sort-criteria.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-91,7
+95,8
@@
static int ostensible_number_of_groups=-1;
static is_missing_func *value_is_missing;
static is_missing_func *value_is_missing;
-static bool run_oneway(const struct casefile *cf, void *_mode);
+static bool run_oneway(const struct ccase *first,
+ const struct casefile *cf, void *_mode);
/* Routines to show the output tables */
/* Routines to show the output tables */
@@
-116,7
+121,7
@@
cmd_oneway(void)
int i;
bool ok;
int i;
bool ok;
- if ( !parse_oneway(&cmd) )
+ if ( !parse_oneway(&cmd
, NULL
) )
return CMD_FAILURE;
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
return CMD_FAILURE;
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
@@
-218,7
+223,7
@@
output_oneway(void)
/* Parser for the variables sub command */
static int
/* Parser for the variables sub command */
static int
-oneway_custom_variables(struct cmd_oneway *cmd UNUSED)
+oneway_custom_variables(struct cmd_oneway *cmd UNUSED
, void *aux UNUSED
)
{
lex_match('=');
{
lex_match('=');
@@
-355,7
+360,7
@@
show_anova_table(void)
}
}
- tab_title (t,
0,
_("ANOVA"));
+ tab_title (t, _("ANOVA"));
tab_submit (t);
tab_submit (t);
@@
-412,7
+417,7
@@
show_descriptives(void)
tab_text (t, 9, 1, TAB_CENTER | TAT_TITLE, _("Maximum"));
tab_text (t, 9, 1, TAB_CENTER | TAT_TITLE, _("Maximum"));
- tab_title (t,
0,
_("Descriptives"));
+ tab_title (t, _("Descriptives"));
row = 2;
row = 2;
@@
-428,7
+433,8
@@
show_descriptives(void)
const char *s = var_to_string(vars[v]);
const char *s = var_to_string(vars[v]);
- struct group_statistics *const *gs_array = hsh_sort(gp->group_hash);
+ struct group_statistics *const *gs_array =
+ (struct group_statistics *const *) hsh_sort(gp->group_hash);
int count = 0;
tab_text (t, 0, row, TAB_LEFT | TAT_TITLE, s);
int count = 0;
tab_text (t, 0, row, TAB_LEFT | TAT_TITLE, s);
@@
-541,7
+547,7
@@
show_homogeneity(void)
tab_text (t, 4, 0, TAB_CENTER | TAT_TITLE, _("Significance"));
tab_text (t, 4, 0, TAB_CENTER | TAT_TITLE, _("Significance"));
- tab_title (t,
0,
_("Test of Homogeneity of Variances"));
+ tab_title (t, _("Test of Homogeneity of Variances"));
for ( v=0 ; v < n_vars ; ++v )
{
for ( v=0 ; v < n_vars ; ++v )
{
@@
-611,7
+617,7
@@
show_contrast_coeffs(short *bad_contrast)
tab_vline(t, TAL_2, 2, 0, n_rows - 1);
tab_vline(t, TAL_2, 2, 0, n_rows - 1);
- tab_title (t,
0,
_("Contrast Coefficients"));
+ tab_title (t, _("Contrast Coefficients"));
tab_text (t, 0, 2, TAB_LEFT | TAT_TITLE, _("Contrast"));
tab_text (t, 0, 2, TAB_LEFT | TAT_TITLE, _("Contrast"));
@@
-678,7
+684,7
@@
show_contrast_tests(short *bad_contrast)
tab_vline(t, TAL_2, 3, 0, n_rows - 1);
tab_vline(t, TAL_2, 3, 0, n_rows - 1);
- tab_title (t,
0,
_("Contrast Tests"));
+ tab_title (t, _("Contrast Tests"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Contrast"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Value of Contrast"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Contrast"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Value of Contrast"));
@@
-888,13
+894,15
@@
precalc ( struct cmd_oneway *cmd UNUSED )
static bool
static bool
-run_oneway(const struct casefile *cf, void *cmd_)
+run_oneway(const struct c
case *first, const struct c
asefile *cf, void *cmd_)
{
struct casereader *r;
struct ccase c;
struct cmd_oneway *cmd = (struct cmd_oneway *) cmd_;
{
struct casereader *r;
struct ccase c;
struct cmd_oneway *cmd = (struct cmd_oneway *) cmd_;
+ output_split_file_values (first);
+
global_group_hash = hsh_create(4,
(hsh_compare_func *) compare_values,
(hsh_hash_func *) hash_value,
global_group_hash = hsh_create(4,
(hsh_compare_func *) compare_values,
(hsh_hash_func *) hash_value,