projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Delete trailing whitespace at end of lines.
[pspp-builds.git]
/
src
/
language
/
stats
/
means.q
diff --git
a/src/language/stats/means.q
b/src/language/stats/means.q
index fb03f754518f1ede12c3f42bbc67a99afc14c125..e10d90145bce413ce0913607382a662271840796 100644
(file)
--- a/
src/language/stats/means.q
+++ b/
src/language/stats/means.q
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-44,7
+43,7
@@
name:!names/nonames,
val:!values/novalues,
fmt:!table/tree;
name:!names/nonames,
val:!values/novalues,
fmt:!table/tree;
-
+
missing=miss:!table/include/dependent;
+ missing=miss:!table/include/dependent;
+cells[cl_]=default,count,sum,mean,stddev,variance,all;
+statistics[st_]=anova,linearity,all,none.
*/
+cells[cl_]=default,count,sum,mean,stddev,variance,all;
+statistics[st_]=anova,linearity,all,none.
*/
@@
-52,27
+51,26
@@
/* (functions) */
/* TABLES: Variable lists for each dimension. */
/* (functions) */
/* TABLES: Variable lists for each dimension. */
-
int n_dim;
/* Number of dimensions. */
-s
ize_t *nv_dim;
/* Number of variables in each dimension. */
-st
ruct variable ***v_dim;
/* Variables in each dimension. */
+
static int n_dim;
/* Number of dimensions. */
+s
tatic size_t *nv_dim;
/* Number of variables in each dimension. */
+st
atic const struct variable ***v_dim;
/* Variables in each dimension. */
/* VARIABLES: List of variables. */
/* VARIABLES: List of variables. */
-int n_var;
-struct variable **v_var;
+static struct variable **v_var;
/* Parses and executes the T-TEST procedure. */
int
/* Parses and executes the T-TEST procedure. */
int
-cmd_means (
void
)
+cmd_means (
struct lexer *lexer, struct dataset *ds
)
{
struct cmd_means cmd;
int success = CMD_FAILURE;
{
struct cmd_means cmd;
int success = CMD_FAILURE;
-
+
n_dim = 0;
nv_dim = NULL;
v_dim = NULL;
v_var = NULL;
n_dim = 0;
nv_dim = NULL;
v_dim = NULL;
v_var = NULL;
- if (!parse_means (&cmd, NULL))
+ if (!parse_means (
lexer, ds,
&cmd, NULL))
goto free;
if (cmd.sbc_cells)
goto free;
if (cmd.sbc_cells)
@@
-110,28
+108,28
@@
cmd_means (void)
free:
{
int i;
free:
{
int i;
-
+
for (i = 0; i < n_dim; i++)
free (v_dim[i]);
free (nv_dim);
free (v_dim);
free (v_var);
}
for (i = 0; i < n_dim; i++)
free (v_dim[i]);
free (nv_dim);
free (v_dim);
free (v_var);
}
-
+
return success;
}
/* Parses the TABLES subcommand. */
static int
return success;
}
/* Parses the TABLES subcommand. */
static int
-mns_custom_tables (struct cmd_means *cmd, void *aux UNUSED)
+mns_custom_tables (struct
lexer *lexer, struct dataset *ds, struct
cmd_means *cmd, void *aux UNUSED)
{
{
- struct var_set *var_set;
-
- if (!lex_match_id ("TABLES")
- && (
token != T_ID || dict_lookup_var (default_dict, tokid
) == NULL)
- &&
token
!= T_ALL)
+ struct
const_
var_set *var_set;
+
+ if (!lex_match_id (
lexer,
"TABLES")
+ && (
lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)
) == NULL)
+ &&
lex_token (lexer)
!= T_ALL)
return 2;
return 2;
- lex_match ('=');
+ lex_match (
lexer,
'=');
if (cmd->sbc_tables)
{
if (cmd->sbc_tables)
{
@@
-140,18
+138,18
@@
mns_custom_tables (struct cmd_means *cmd, void *aux UNUSED)
return 0;
}
return 0;
}
- var_set =
var_set_create_from_dict (default_dict
);
+ var_set =
const_var_set_create_from_dict (dataset_dict (ds)
);
assert (var_set != NULL);
do
{
size_t nvl;
assert (var_set != NULL);
do
{
size_t nvl;
- struct variable **vl;
+
const
struct variable **vl;
- if (!parse_
var_set_vars (
var_set, &vl, &nvl,
- PV_NO_DUPLICATE | PV_NO_SCRATCH))
+ if (!parse_
const_var_set_vars (lexer,
var_set, &vl, &nvl,
+ PV_NO_DUPLICATE | PV_NO_SCRATCH))
goto lossage;
goto lossage;
-
+
n_dim++;
nv_dim = xnrealloc (nv_dim, n_dim, sizeof *nv_dim);
v_dim = xnrealloc (v_dim, n_dim, sizeof *v_dim);
n_dim++;
nv_dim = xnrealloc (nv_dim, n_dim, sizeof *nv_dim);
v_dim = xnrealloc (v_dim, n_dim, sizeof *v_dim);
@@
-159,17
+157,17
@@
mns_custom_tables (struct cmd_means *cmd, void *aux UNUSED)
nv_dim[n_dim - 1] = nvl;
v_dim[n_dim - 1] = vl;
}
nv_dim[n_dim - 1] = nvl;
v_dim[n_dim - 1] = vl;
}
- while (lex_match (T_BY));
+ while (lex_match (
lexer,
T_BY));
- var_set_destroy (var_set);
+
const_
var_set_destroy (var_set);
return 1;
lossage:
return 1;
lossage:
- var_set_destroy (var_set);
+
const_
var_set_destroy (var_set);
return 0;
}
return 0;
}
-/*
+/*
Local Variables:
mode: c
End:
Local Variables:
mode: c
End: