#include "linreg/sweep.h"
#include "math/categoricals.h"
#include "math/covariance.h"
+#include "math/interaction.h"
#include "math/moments.h"
#include "output/tab.h"
size_t n_factor_vars;
const struct variable **factor_vars;
- /* In the current implementation, design_vars will
- normally be the same as factor_vars.
- This will change once interactions, nested variables
- and repeated measures become involved.
- */
- size_t n_design_vars;
- const struct variable **design_vars;
+ size_t n_interactions;
+ struct interaction **interactions;
enum mv_class exclude;
int
cmd_glm (struct lexer *lexer, struct dataset *ds)
{
+ int i;
struct const_var_set *factors = NULL;
struct glm_spec glm;
bool design = false;
glm.dict = dataset_dict (ds);
glm.n_dep_vars = 0;
glm.n_factor_vars = 0;
- glm.n_design_vars = 0;
+ glm.n_interactions = 0;
+ glm.interactions = NULL;
glm.dep_vars = NULL;
glm.factor_vars = NULL;
- glm.design_vars = NULL;
glm.exclude = MV_ANY;
glm.intercept = true;
glm.wv = dict_get_weight (glm.dict);
if (! parse_design_spec (lexer, &glm))
goto error;
- if ( glm.n_design_vars == 0)
+ if ( glm.n_interactions == 0)
{
msg (ME, _("One or more design variables must be given"));
goto error;
const_var_set_destroy (factors);
free (glm.factor_vars);
- free (glm.design_vars);
+ for (i = 0 ; i < glm.n_interactions; ++i)
+ interaction_destroy (glm.interactions[i]);
+ free (glm.interactions);
free (glm.dep_vars);
const_var_set_destroy (factors);
free (glm.factor_vars);
- free (glm.design_vars);
+ for (i = 0 ; i < glm.n_interactions; ++i)
+ interaction_destroy (glm.interactions[i]);
+
+ free (glm.interactions);
free (glm.dep_vars);
return CMD_FAILURE;
}
static void
-get_ssq (struct covariance *cov, gsl_vector * ssq, const struct glm_spec *cmd)
+get_ssq (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd)
{
- const struct variable **vars;
- gsl_matrix *small_cov = NULL;
gsl_matrix *cm = covariance_calculate_unnormalized (cov);
size_t i;
size_t j;
size_t k;
- size_t n;
- size_t m;
- size_t *dropped;
- size_t n_dropped;
-
- dropped = xcalloc (covariance_dim (cov), sizeof (*dropped));
- vars = xcalloc (covariance_dim (cov), sizeof (*vars));
- covariance_get_var_indices (cov, vars);
+ size_t *dropped = xcalloc (covariance_dim (cov), sizeof (*dropped));
+ const struct categoricals *cats = covariance_get_categoricals (cov);
- for (k = 0; k < cmd->n_design_vars; k++)
+ for (k = 0; k < cmd->n_interactions; k++)
{
- n_dropped = 0;
- for (i = 1; i < covariance_dim (cov); i++)
+ size_t n = 0;
+ size_t m = 0;
+ gsl_matrix *small_cov = NULL;
+ size_t n_dropped = 0;
+ for (i = cmd->n_dep_vars; i < covariance_dim (cov); i++)
{
- if (vars[i] == cmd->design_vars[k])
+ if (categoricals_get_interaction_by_subscript (cats, i - cmd->n_dep_vars)
+ == cmd->interactions[k])
{
+ assert (n_dropped < covariance_dim (cov));
dropped[n_dropped++] = i;
}
}
small_cov =
gsl_matrix_alloc (cm->size1 - n_dropped, cm->size2 - n_dropped);
gsl_matrix_set (small_cov, 0, 0, gsl_matrix_get (cm, 0, 0));
- n = 0;
- m = 0;
for (i = 0; i < cm->size1; i++)
{
if (not_dropped (i, dropped, n_dropped))
}
free (dropped);
- free (vars);
gsl_matrix_free (cm);
}
struct glm_workspace ws;
struct covariance *cov;
- ws.cats = categoricals_create (cmd->design_vars, cmd->n_design_vars,
+
+ ws.cats = categoricals_create (cmd->interactions, cmd->n_interactions,
cmd->wv, cmd->exclude,
NULL, NULL, NULL, NULL);
}
casereader_destroy (reader);
- categoricals_done (ws.cats);
-
for (reader = input;
(c = casereader_read (reader)) != NULL; case_unref (c))
{
reg_sweep (cm, 0);
/*
- Store the overall SSE.
- */
+ Store the overall SSE.
+ */
ws.ssq = gsl_vector_alloc (cm->size1);
gsl_vector_set (ws.ssq, 0, gsl_matrix_get (cm, 0, 0));
get_ssq (cov, ws.ssq, cmd);
struct tab_table *t;
const int nc = 6;
- int nr = heading_rows + 4 + cmd->n_design_vars;
+ int nr = heading_rows + 4 + cmd->n_interactions;
if (cmd->intercept)
nr++;
if (cmd->intercept)
df_corr += 1.0;
- for (f = 0; f < cmd->n_design_vars; ++f)
- df_corr += categoricals_n_count (ws->cats, f) - 1.0;
+ df_corr += categoricals_df_total (ws->cats);
mse = gsl_vector_get (ws->ssq, 0) / (n_total - df_corr);
r++;
}
- for (f = 0; f < cmd->n_design_vars; ++f)
+ for (f = 0; f < cmd->n_interactions; ++f)
{
- const double df = categoricals_n_count (ws->cats, f) - 1.0;
+ struct string str = DS_EMPTY_INITIALIZER;
+ const double df = categoricals_df (ws->cats, f);
const double ssq = gsl_vector_get (ws->ssq, f + 1);
const double F = ssq / df / mse;
- tab_text (t, 0, r, TAB_LEFT | TAT_TITLE,
- var_to_string (cmd->design_vars[f]));
+ interaction_to_string (cmd->interactions[f], &str);
+ tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, ds_cstr (&str));
+ ds_destroy (&str);
tab_double (t, 1, r, 0, ssq, NULL);
tab_double (t, 2, r, 0, df, wfmt);
tab_double (t, 5, r, 0, gsl_cdf_fdist_Q (F, df, n_total - df_corr),
NULL);
-
-
r++;
}
/* An interaction is a variable followed by {*, BY} followed by an interaction */
static bool
-parse_design_interaction (struct lexer *lexer, struct glm_spec *glm)
+parse_design_interaction (struct lexer *lexer, struct glm_spec *glm, struct interaction **iact)
{
const struct variable *v = NULL;
+ assert (iact);
+
switch (lex_next_token (lexer, 1))
{
case T_ENDCMD:
}
if (! lex_match_variable (lexer, glm, &v))
- return false;
+ {
+ interaction_destroy (*iact);
+ *iact = NULL;
+ return false;
+ }
+
+ assert (v);
+
+ if ( *iact == NULL)
+ *iact = interaction_create (v);
+ else
+ interaction_add_variable (*iact, v);
if ( lex_match (lexer, T_ASTERISK) || lex_match (lexer, T_BY))
{
- lex_error (lexer, "Interactions are not yet implemented"); return false;
- return parse_design_interaction (lexer, glm);
+ // lex_error (lexer, "Interactions are not yet implemented"); return false;
+ return parse_design_interaction (lexer, glm, iact);
}
- glm->n_design_vars++;
- glm->design_vars = xrealloc (glm->design_vars, sizeof (*glm->design_vars) * glm->n_design_vars);
- glm->design_vars[glm->n_design_vars - 1] = v;
-
return true;
}
static bool
parse_design_term (struct lexer *lexer, struct glm_spec *glm)
{
- if (parse_design_interaction (lexer, glm))
- return true;
+ struct interaction *iact = NULL;
+ if (parse_design_interaction (lexer, glm, &iact))
+ {
+ /* Interaction parsing successful. Add to list of interactions */
+ glm->interactions = xrealloc (glm->interactions, sizeof *glm->interactions * ++glm->n_interactions);
+ glm->interactions[glm->n_interactions - 1] = iact;
+ return true;
+ }
if ( parse_nested_variable (lexer, glm))
return true;
projects / pspp / blobdiff