projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed warnings generated by gcc 4.1.2
[pspp]
/
src
/
language
/
stats
/
oneway.q
diff --git
a/src/language/stats/oneway.q
b/src/language/stats/oneway.q
index ab221e03fa0e16c85c0e1d5a32ce2de2b1286778..bdf1ec90a22c3a41d812562526dce4145dfe8c6f 100644
(file)
--- a/
src/language/stats/oneway.q
+++ b/
src/language/stats/oneway.q
@@
-32,6
+32,7
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
#include <data/value-labels.h>
#include <data/variable.h>
#include <language/command.h>
#include <data/value-labels.h>
#include <data/variable.h>
#include <language/command.h>
+#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <language/lexer/lexer.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
@@
-56,17
+57,17
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
/* (specification)
"ONEWAY" (oneway_):
*^variables=custom;
/* (specification)
"ONEWAY" (oneway_):
*^variables=custom;
-
+
missing=miss:!analysis/listwise,
- incl:include/!exclude;
- contrast= double list;
- statistics[st_]=descriptives,homogeneity.
+ missing=miss:!analysis/listwise,
+
incl:include/!exclude;
+
+
contrast= double list;
+
+
statistics[st_]=descriptives,homogeneity.
*/
/* (declarations) */
/* (functions) */
*/
/* (declarations) */
/* (functions) */
-static
int bad_weight_warn = 1
;
+static
bool bad_weight_warn = true
;
static struct cmd_oneway cmd;
static struct cmd_oneway cmd;
@@
-94,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 */
@@
-119,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 */
@@
-221,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('=');
@@
-892,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,
@@
-913,7
+917,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
size_t i;
const double weight =
size_t i;
const double weight =
- dict_get_case_weight
(default_dict,&c,
&bad_weight_warn);
+ dict_get_case_weight
(default_dict, &c,
&bad_weight_warn);
const union value *indep_val = case_data (&c, indep_var->fv);
const union value *indep_val = case_data (&c, indep_var->fv);