X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fmath%2Fcovariance.c;h=8aa652b5bded81924b6f9317b9353043168a1c5f;hb=fd4e9badbdbfe798239f8741ad278d98073f2300;hp=a8c71dc0b357289a65751814f0e5c9499ac73478;hpb=6e097c89af440da90b43ce90864394c4d0c843d5;p=pspp diff --git a/src/math/covariance.c b/src/math/covariance.c index a8c71dc0b3..8aa652b5bd 100644 --- a/src/math/covariance.c +++ b/src/math/covariance.c @@ -70,6 +70,9 @@ resize_matrix (gsl_matrix *in, size_t new_size) struct covariance { + /* True if the covariances are centerered. (ie Real covariances) */ + bool centered; + /* The variables for which the covariance matrix is to be calculated. */ size_t n_vars; const struct variable *const *vars; @@ -138,11 +141,13 @@ covariance_moments (const struct covariance *cov, int m) */ struct covariance * covariance_1pass_create (size_t n_vars, const struct variable *const *vars, - const struct variable *weight, enum mv_class exclude) + const struct variable *weight, enum mv_class exclude, + bool centered) { size_t i; struct covariance *cov = xzalloc (sizeof *cov); + cov->centered = centered; cov->passes = 1; cov->state = 0; cov->pass_one_first_case_seen = cov->pass_two_first_case_seen = false; @@ -178,11 +183,13 @@ covariance_1pass_create (size_t n_vars, const struct variable *const *vars, struct covariance * covariance_2pass_create (size_t n_vars, const struct variable *const *vars, struct categoricals *cats, - const struct variable *wv, enum mv_class exclude) + const struct variable *wv, enum mv_class exclude, + bool centered) { size_t i; struct covariance *cov = xmalloc (sizeof *cov); + cov->centered = centered; cov->passes = 2; cov->state = 0; cov->pass_one_first_case_seen = cov->pass_two_first_case_seen = false; @@ -584,19 +591,22 @@ covariance_calculate_single_pass (struct covariance *cov) } } - /* Centre the moments */ - for ( j = 0 ; j < cov->dim - 1; ++j) + if (cov->centered) { - for (i = j + 1 ; i < cov->dim; ++i) + /* Centre the moments */ + for ( j = 0 ; j < cov->dim - 1; ++j) { - double *x = &cov->cm [cm_idx (cov, i, j)]; + for (i = j + 1 ; i < cov->dim; ++i) + { + double *x = &cov->cm [cm_idx (cov, i, j)]; - *x /= gsl_matrix_get (cov->moments[0], i, j); + *x /= gsl_matrix_get (cov->moments[0], i, j); - *x -= - gsl_matrix_get (cov->moments[MOMENT_MEAN], i, j) - * - gsl_matrix_get (cov->moments[MOMENT_MEAN], j, i); + *x -= + gsl_matrix_get (cov->moments[MOMENT_MEAN], i, j) + * + gsl_matrix_get (cov->moments[MOMENT_MEAN], j, i); + } } } @@ -642,29 +652,33 @@ covariance_calculate_single_pass_unnormalized (struct covariance *cov) { size_t i, j; - for (i = 0 ; i < cov->dim; ++i) + if (cov->centered) { - for (j = 0 ; j < cov->dim; ++j) + for (i = 0 ; i < cov->dim; ++i) { - double *x = gsl_matrix_ptr (cov->moments[MOMENT_VARIANCE], i, j); - *x -= pow2 (gsl_matrix_get (cov->moments[MOMENT_MEAN], i, j)) - / gsl_matrix_get (cov->moments[MOMENT_NONE], i, j); + for (j = 0 ; j < cov->dim; ++j) + { + double *x = gsl_matrix_ptr (cov->moments[MOMENT_VARIANCE], i, j); + *x -= pow2 (gsl_matrix_get (cov->moments[MOMENT_MEAN], i, j)) + / gsl_matrix_get (cov->moments[MOMENT_NONE], i, j); + } } - } - for ( j = 0 ; j < cov->dim - 1; ++j) - { - for (i = j + 1 ; i < cov->dim; ++i) + + for ( j = 0 ; j < cov->dim - 1; ++j) { - double *x = &cov->cm [cm_idx (cov, i, j)]; + for (i = j + 1 ; i < cov->dim; ++i) + { + double *x = &cov->cm [cm_idx (cov, i, j)]; - *x -= - gsl_matrix_get (cov->moments[MOMENT_MEAN], i, j) - * - gsl_matrix_get (cov->moments[MOMENT_MEAN], j, i) - / gsl_matrix_get (cov->moments[MOMENT_NONE], i, j); + *x -= + gsl_matrix_get (cov->moments[MOMENT_MEAN], i, j) + * + gsl_matrix_get (cov->moments[MOMENT_MEAN], j, i) + / gsl_matrix_get (cov->moments[MOMENT_NONE], i, j); + } } } - + return cm_to_gsl (cov); } @@ -740,62 +754,46 @@ covariance_dim (const struct covariance * cov) */ #include "libpspp/str.h" -#include "output/tab.h" +#include "output/pivot-table.h" #include "data/format.h" /* Create a table which can be populated with the encodings for the covariance matrix COV */ -struct tab_table * -covariance_dump_enc_header (const struct covariance *cov, int length) +struct pivot_table * +covariance_dump_enc_header (const struct covariance *cov) { - struct tab_table *t = tab_create (cov->dim, length); - int n; - int i; - - tab_title (t, "Covariance Encoding"); - - tab_box (t, - TAL_2, TAL_2, 0, 0, - 0, 0, tab_nc (t) - 1, tab_nr (t) - 1); - - tab_hline (t, TAL_2, 0, tab_nc (t) - 1, 1); - - - for (i = 0 ; i < cov->n_vars; ++i) - { - tab_text (t, i, 0, TAT_TITLE, var_get_name (cov->vars[i])); - tab_vline (t, TAL_1, i + 1, 0, tab_nr (t) - 1); - } - - n = 0; - while (i < cov->dim) + struct pivot_table *table = pivot_table_create ("Covariance Encoding"); + + struct pivot_dimension *factors = pivot_dimension_create ( + table, PIVOT_AXIS_COLUMN, "Factor"); + for (size_t i = 0 ; i < cov->n_vars; ++i) + pivot_category_create_leaf (factors->root, + pivot_value_new_variable (cov->vars[i])); + for (size_t i = 0, n = 0; i < cov->dim - cov->n_vars; n++) { - struct string str; - int idx = i - cov->n_vars; const struct interaction *iact = - categoricals_get_interaction_by_subscript (cov->categoricals, idx); - int df; + categoricals_get_interaction_by_subscript (cov->categoricals, i); - ds_init_empty (&str); + struct string str = DS_EMPTY_INITIALIZER; interaction_to_string (iact, &str); + struct pivot_category *group = pivot_category_create_group__ ( + factors->root, + pivot_value_new_user_text_nocopy (ds_steal_cstr (&str))); - df = categoricals_df (cov->categoricals, n); - - tab_joint_text (t, - i, 0, - i + df - 1, 0, - TAT_TITLE, ds_cstr (&str)); - - if (i + df < tab_nr (t) - 1) - tab_vline (t, TAL_1, i + df, 0, tab_nr (t) - 1); + int df = categoricals_df (cov->categoricals, n); + for (int j = 0; j < df; j++) + pivot_category_create_leaf_rc (group, pivot_value_new_integer (j), + PIVOT_RC_INTEGER); i += df; - n++; - ds_destroy (&str); } - return t; + struct pivot_dimension *matrix = pivot_dimension_create ( + table, PIVOT_AXIS_ROW, "Matrix", "Matrix"); + matrix->hide_all_labels = true; + + return table; } @@ -805,14 +803,13 @@ covariance_dump_enc_header (const struct covariance *cov, int length) */ void covariance_dump_enc (const struct covariance *cov, const struct ccase *c, - struct tab_table *t) + struct pivot_table *table) { - static int row = 0; - int i; - ++row; - for (i = 0 ; i < cov->dim; ++i) - { - double v = get_val (cov, i, c); - tab_double (t, i, row, 0, v, i < cov->n_vars ? NULL : &F_8_0, RC_OTHER); - } + int row = pivot_category_create_leaf ( + table->dimensions[1]->root, + pivot_value_new_integer (table->dimensions[1]->n_leaves)); + + for (int i = 0 ; i < cov->dim; ++i) + pivot_table_put2 ( + table, i, row, pivot_value_new_number (get_val (cov, i, c))); }