projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Damn! Forgot to change casenum_t in *.q
[pspp]
/
src
/
language
/
stats
/
correlations.q
diff --git
a/src/language/stats/correlations.q
b/src/language/stats/correlations.q
index f998e1df1a16a1feb1694b2d3f156ec4d0a6979f..4564ec2cfa721e576ff13f1873b2ca2d03e2f3c8 100644
(file)
--- a/
src/language/stats/correlations.q
+++ b/
src/language/stats/correlations.q
@@
-41,17
+41,17
@@
struct cor_set
size_t nv1, nv2;
};
size_t nv1, nv2;
};
-struct cor_set *cor_list, *cor_last;
+st
atic st
ruct cor_set *cor_list, *cor_last;
-struct file_handle *matrix_file;
+st
atic st
ruct file_handle *matrix_file;
static void free_correlations_state (void);
static void free_correlations_state (void);
-static int internal_cmd_correlations (
void
);
+static int internal_cmd_correlations (
struct dataset *ds
);
int
int
-cmd_correlations (
void
)
+cmd_correlations (
struct dataset *ds
)
{
{
- int result = internal_cmd_correlations ();
+ int result = internal_cmd_correlations (
ds
);
free_correlations_state ();
return result;
}
free_correlations_state ();
return result;
}
@@
-59,8
+59,8
@@
cmd_correlations (void)
/* (specification)
"CORRELATIONS" (cor_):
*variables=custom;
/* (specification)
"CORRELATIONS" (cor_):
*variables=custom;
-
+
missing=miss:!pairwise/listwise,
-
inc:include/exclude;
+ missing=miss:!pairwise/listwise,
+ inc:include/exclude;
+print=tail:!twotail/onetail,
sig:!sig/nosig;
+format=fmt:!matrix/serial;
+print=tail:!twotail/onetail,
sig:!sig/nosig;
+format=fmt:!matrix/serial;
@@
-71,22
+71,23
@@
cmd_correlations (void)
/* (functions) */
int
/* (functions) */
int
-internal_cmd_correlations (
void
)
+internal_cmd_correlations (
struct dataset *ds
)
{
struct cmd_correlations cmd;
cor_list = cor_last = NULL;
matrix_file = NULL;
{
struct cmd_correlations cmd;
cor_list = cor_last = NULL;
matrix_file = NULL;
- if (!parse_correlations (
&cmd
))
+ if (!parse_correlations (
ds, &cmd, NULL
))
return CMD_FAILURE;
return CMD_FAILURE;
+
free_correlations (&cmd);
return CMD_SUCCESS;
}
static int
free_correlations (&cmd);
return CMD_SUCCESS;
}
static int
-cor_custom_variables (struct
cmd_correlations *cmd
UNUSED)
+cor_custom_variables (struct
dataset *ds, struct cmd_correlations *cmd UNUSED, void *aux
UNUSED)
{
struct variable **v1, **v2;
size_t nv1, nv2;
{
struct variable **v1, **v2;
size_t nv1, nv2;
@@
-94,18
+95,18
@@
cor_custom_variables (struct cmd_correlations *cmd UNUSED)
/* Ensure that this is a VARIABLES subcommand. */
if (!lex_match_id ("VARIABLES")
/* Ensure that this is a VARIABLES subcommand. */
if (!lex_match_id ("VARIABLES")
- && (token != T_ID || dict_lookup_var (d
efault_dict
, tokid) != NULL)
+ && (token != T_ID || dict_lookup_var (d
ataset_dict (ds)
, tokid) != NULL)
&& token != T_ALL)
return 2;
lex_match ('=');
&& token != T_ALL)
return 2;
lex_match ('=');
- if (!parse_variables (d
efault_dict
, &v1, &nv1,
+ if (!parse_variables (d
ataset_dict (ds)
, &v1, &nv1,
PV_NO_DUPLICATE | PV_NUMERIC))
return 0;
if (lex_match (T_WITH))
{
PV_NO_DUPLICATE | PV_NUMERIC))
return 0;
if (lex_match (T_WITH))
{
- if (!parse_variables (d
efault_dict
, &v2, &nv2,
+ if (!parse_variables (d
ataset_dict (ds)
, &v2, &nv2,
PV_NO_DUPLICATE | PV_NUMERIC))
{
free (v1);
PV_NO_DUPLICATE | PV_NUMERIC))
{
free (v1);
@@
-133,7
+134,7
@@
cor_custom_variables (struct cmd_correlations *cmd UNUSED)
}
static int
}
static int
-cor_custom_matrix (struct
cmd_correlations *cmd
UNUSED)
+cor_custom_matrix (struct
dataset *ds UNUSED, struct cmd_correlations *cmd UNUSED, void *aux
UNUSED)
{
if (!lex_force_match ('('))
return 0;
{
if (!lex_force_match ('('))
return 0;