projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
QUICK CLUSTER: Remove sqrt from Euclidean distance calculations
[pspp]
/
src
/
language
/
stats
/
regression.c
diff --git
a/src/language/stats/regression.c
b/src/language/stats/regression.c
index 52009e29683a72e4722df66674aead46fd1e2562..d9409aae59bcc1301e16ed05770606457194915d 100644
(file)
--- a/
src/language/stats/regression.c
+++ b/
src/language/stats/regression.c
@@
-225,8
+225,7
@@
cmd_regression (struct lexer *lexer, struct dataset *ds)
if (lex_match_id (lexer, "DEPENDENT"))
{
if (lex_match_id (lexer, "DEPENDENT"))
{
- if (!lex_force_match (lexer, T_EQUALS))
- goto error;
+ lex_match (lexer, T_EQUALS);
free (regression.dep_vars);
regression.n_dep_vars = 0;
free (regression.dep_vars);
regression.n_dep_vars = 0;
@@
-248,6
+247,7
@@
cmd_regression (struct lexer *lexer, struct dataset *ds)
}
else if (lex_match_id (lexer, "STATISTICS"))
{
}
else if (lex_match_id (lexer, "STATISTICS"))
{
+ unsigned long statistics = 0;
lex_match (lexer, T_EQUALS);
while (lex_token (lexer) != T_ENDCMD
lex_match (lexer, T_EQUALS);
while (lex_token (lexer) != T_ENDCMD
@@
-255,31
+255,31
@@
cmd_regression (struct lexer *lexer, struct dataset *ds)
{
if (lex_match (lexer, T_ALL))
{
{
if (lex_match (lexer, T_ALL))
{
-
regression.stat
s = ~0;
+
statistic
s = ~0;
}
else if (lex_match_id (lexer, "DEFAULTS"))
{
}
else if (lex_match_id (lexer, "DEFAULTS"))
{
-
regression.stat
s |= STATS_DEFAULT;
+
statistic
s |= STATS_DEFAULT;
}
else if (lex_match_id (lexer, "R"))
{
}
else if (lex_match_id (lexer, "R"))
{
-
regression.stat
s |= STATS_R;
+
statistic
s |= STATS_R;
}
else if (lex_match_id (lexer, "COEFF"))
{
}
else if (lex_match_id (lexer, "COEFF"))
{
-
regression.stat
s |= STATS_COEFF;
+
statistic
s |= STATS_COEFF;
}
else if (lex_match_id (lexer, "ANOVA"))
{
}
else if (lex_match_id (lexer, "ANOVA"))
{
-
regression.stat
s |= STATS_ANOVA;
+
statistic
s |= STATS_ANOVA;
}
else if (lex_match_id (lexer, "BCOV"))
{
}
else if (lex_match_id (lexer, "BCOV"))
{
-
regression.stat
s |= STATS_BCOV;
+
statistic
s |= STATS_BCOV;
}
else if (lex_match_id (lexer, "CI"))
{
}
else if (lex_match_id (lexer, "CI"))
{
-
regression.stat
s |= STATS_CI;
+
statistic
s |= STATS_CI;
if (lex_match (lexer, T_LPAREN))
{
if (lex_match (lexer, T_LPAREN))
{
@@
-294,6
+294,10
@@
cmd_regression (struct lexer *lexer, struct dataset *ds)
goto error;
}
}
goto error;
}
}
+
+ if (statistics)
+ regression.stats = statistics;
+
}
else if (lex_match_id (lexer, "SAVE"))
{
}
else if (lex_match_id (lexer, "SAVE"))
{