/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "linreg/sweep.h"
#include "tukey/tukey.h"
#include "math/categoricals.h"
+#include "math/interaction.h"
#include "math/covariance.h"
#include "math/levene.h"
#include "math/moments.h"
}
static void *
-makeit (void *aux1, void *aux2 UNUSED)
+makeit (const void *aux1, void *aux2 UNUSED)
{
const struct variable *var = aux1;
}
static void
-updateit (void *user_data,
- enum mv_class exclude,
- const struct variable *wv,
- const struct variable *catvar UNUSED,
- const struct ccase *c,
- void *aux1, void *aux2)
+updateit (const void *aux1, void *aux2, void *user_data,
+ const struct ccase *c, double weight)
{
struct descriptive_data *dd = user_data;
struct descriptive_data *dd_total = aux2;
- double weight;
-
- if ( var_is_value_missing (varp, valx, exclude))
- return;
-
- weight = wv != NULL ? case_data (c, wv)->f : 1.0;
-
moments1_add (dd->mom, valx->f, weight);
if (valx->f < dd->minimum)
dd->minimum = valx->f;
for (v = 0; v < cmd->n_vars; ++v)
{
- ws.vws[v].cat = categoricals_create (&cmd->indep_var, 1, cmd->wv,
- cmd->exclude, makeit, updateit,
- CONST_CAST (struct variable *,
- cmd->vars[v]),
- ws.dd_total[v]);
+ struct interaction *inter = interaction_create (cmd->indep_var);
+
+ struct payload payload;
+ payload.create = makeit;
+ payload.update = updateit;
+
+ ws.vws[v].cat = categoricals_create (&inter, 1, cmd->wv,
+ cmd->exclude);
+
+ categoricals_set_payload (ws.vws[v].cat, &payload,
+ CONST_CAST (struct variable *, cmd->vars[v]),
+ ws.dd_total[v]);
+
ws.vws[v].cov = covariance_2pass_create (1, &cmd->vars[v],
ws.vws[v].cat,
for (v = 0; v < cmd->n_vars; ++v)
{
+ gsl_matrix *cm;
struct per_var_ws *pvw = &ws.vws[v];
- gsl_matrix *cm = covariance_calculate_unnormalized (pvw->cov);
const struct categoricals *cats = covariance_get_categoricals (pvw->cov);
+ const bool ok = categoricals_done (cats);
+
+ if ( ! ok)
+ {
+ msg (MW,
+ _("Dependent variable %s has no non-missing values. No analysis for this variable will be done."),
+ var_get_name (cmd->vars[v]));
+ continue;
+ }
+
+ cm = covariance_calculate_unnormalized (pvw->cov);
moments1_calculate (ws.dd_total[v]->mom, &pvw->n, NULL, NULL, NULL, NULL);
pvw->ssa = pvw->sst - pvw->sse;
- pvw->n_groups = categoricals_total (cats);
+ pvw->n_groups = categoricals_n_total (cats);
pvw->mse = (pvw->sst - pvw->ssa) / (pvw->n - pvw->n_groups);
{
const struct categoricals *cats = covariance_get_categoricals (ws.vws[v].cov);
- categoricals_done (cats);
-
- if (categoricals_total (cats) > ws.actual_number_of_groups)
- ws.actual_number_of_groups = categoricals_total (cats);
+ if ( ! categoricals_is_complete (cats))
+ {
+ continue;
+ }
+
+ if (categoricals_n_total (cats) > ws.actual_number_of_groups)
+ ws.actual_number_of_groups = categoricals_n_total (cats);
}
casereader_destroy (input);
if (ll_count (cl) != ws->actual_number_of_groups)
{
msg (SW,
- _("In contrast list %zu, the number of coefficients (%d) does not equal the number of groups (%d). This contrast list will be ignored."),
+ _("In contrast list %zu, the number of coefficients (%zu) does not equal the number of groups (%d). This contrast list will be ignored."),
i, ll_count (cl), ws->actual_number_of_groups);
ll_remove (&coeff_list->ll);
{
int v;
for (v = 0 ; v < cmd->n_vars; ++v)
- show_comparisons (cmd, ws, v);
+ {
+ const struct categoricals *cats = covariance_get_categoricals (ws->vws[v].cov);
+
+ if ( categoricals_is_complete (cats))
+ show_comparisons (cmd, ws, v);
+ }
}
}
if ( v > 0)
tab_hline (t, TAL_1, 0, n_cols - 1, row);
- for (count = 0; count < categoricals_total (cats); ++count)
+ for (count = 0; count < categoricals_n_total (cats); ++count)
{
double T;
double n, mean, variance;
struct string vstr;
- const union value *gval = categoricals_get_value_by_category (cats, count);
+ const struct ccase *gcc = categoricals_get_case_by_category (cats, count);
const struct descriptive_data *dd = categoricals_get_user_data_by_category (cats, count);
moments1_calculate (dd->mom, &n, &mean, &variance, NULL, NULL);
ds_init_empty (&vstr);
- var_append_value_name (cmd->indep_var, gval, &vstr);
+ var_append_value_name (cmd->indep_var, case_data (gcc, cmd->indep_var), &vstr);
tab_text (t, 1, row + count,
TAB_LEFT | TAT_TITLE,
tab_double (t, 9, row + count, 0, dd->maximum, fmt);
}
+ if (categoricals_is_complete (cats))
{
double T;
double n, mean, variance;
tab_double (t, 7, row + count, 0,
mean + T * std_error, NULL);
+
/* Min and Max */
tab_double (t, 8, row + count, 0, ws->dd_total[v]->minimum, fmt);
tab_double (t, 9, row + count, 0, ws->dd_total[v]->maximum, fmt);
}
- row += categoricals_total (cats) + 1;
+ row += categoricals_n_total (cats) + 1;
}
tab_submit (t);
++count, coeffi = ll_next (coeffi))
{
const struct categoricals *cats = covariance_get_categoricals (cov);
- const union value *val = categoricals_get_value_by_category (cats, count);
+ const struct ccase *gcc = categoricals_get_case_by_category (cats, count);
struct coeff_node *coeffn = ll_data (coeffi, struct coeff_node, ll);
struct string vstr;
ds_init_empty (&vstr);
- var_append_value_name (cmd->indep_var, val, &vstr);
+ var_append_value_name (cmd->indep_var, case_data (gcc, cmd->indep_var), &vstr);
tab_text (t, count + 2, 1, TAB_CENTER | TAT_TITLE, ds_cstr (&vstr));
struct string vstr;
int j;
struct descriptive_data *dd_i = categoricals_get_user_data_by_category (cat, i);
- const union value *gval = categoricals_get_value_by_category (cat, i);
+ const struct ccase *gcc = categoricals_get_case_by_category (cat, i);
+
ds_init_empty (&vstr);
- var_append_value_name (cmd->indep_var, gval, &vstr);
+ var_append_value_name (cmd->indep_var, case_data (gcc, cmd->indep_var), &vstr);
if ( i != 0)
tab_hline (t, TAL_1, 1, n_cols - 1, r);
double std_err;
double weight_j, mean_j, var_j;
double half_range;
+ const struct ccase *cc;
struct descriptive_data *dd_j = categoricals_get_user_data_by_category (cat, j);
if (j == i)
continue;
ds_clear (&vstr);
- gval = categoricals_get_value_by_category (cat, j);
- var_append_value_name (cmd->indep_var, gval, &vstr);
+ cc = categoricals_get_case_by_category (cat, j);
+ var_append_value_name (cmd->indep_var, case_data (cc, cmd->indep_var), &vstr);
tab_text (t, 2, r + rx, TAB_LEFT | TAT_TITLE, ds_cstr (&vstr));
moments1_calculate (dd_j->mom, &weight_j, &mean_j, &var_j, 0, 0);
projects / pspp-builds.git / blobdiff