Added result_class parameter to tab_double and updated all callers. Removed tab_fixed

[pspp] / src / language / stats / correlations.c

diff --git a/src/language/stats/correlations.c b/src/language/stats/correlations.c
index c76f5984abfcfe76ac6abff735dc6f3d064b0e42..133eece4f240de477fe500041c3934d9627244f2 100644 (file)
--- a/src/language/stats/correlations.c
+++ b/src/language/stats/correlations.c
@@ -149,7 +149,7 @@ output_descriptives (const struct corr *corr, const gsl_matrix *means,
              NOT_REACHED ();
            };
          
-         tab_double (t, c, r + heading_rows, 0, x, NULL);
+         tab_double (t, c, r + heading_rows, 0, x, NULL, RC_OTHER);
        }
     }
 
@@ -188,6 +188,7 @@ output_correlation (const struct corr *corr, const struct corr_opts *opts,
   nr += heading_rows;
 
   t = tab_create (nc, nr);
+  tab_set_format (t, RC_WEIGHT, wfmt);
   tab_title (t, _("Correlations"));
 
   tab_headers (t, heading_columns, 0, heading_rows, 0);
@@ -210,6 +211,7 @@ output_correlation (const struct corr *corr, const struct corr_opts *opts,
 
   tab_vline (t, TAL_1, 1, heading_rows, nr - 1);
 
+  /* Row Headers */
   for (r = 0 ; r < corr->n_vars1 ; ++r)
     {
       tab_text (t, 0, 1 + r * rows_per_variable, TAB_LEFT | TAT_TITLE, 
@@ -231,6 +233,7 @@ output_correlation (const struct corr *corr, const struct corr_opts *opts,
       tab_hline (t, TAL_1, 0, nc - 1, r * rows_per_variable + 1);
     }
 
+  /* Column Headers */
   for (c = 0 ; c < matrix_cols ; ++c)
     {
       const struct variable *v = corr->n_vars_total > corr->n_vars1 ?
@@ -245,22 +248,22 @@ output_correlation (const struct corr *corr, const struct corr_opts *opts,
        {
          unsigned char flags = 0; 
          const int col_index = corr->n_vars_total > corr->n_vars1 ? 
-           corr->n_vars_total - corr->n_vars1 - 1  + c : 
+           corr->n_vars1 + c : 
            c;
          double pearson = gsl_matrix_get (cm, r, col_index);
          double w = gsl_matrix_get (samples, r, col_index);
          double sig = opts->tails * significance_of_correlation (pearson, w);
 
          if ( opts->missing_type != CORR_LISTWISE )
-           tab_double (t, c + heading_columns, row + rows_per_variable - 1, 0, w, wfmt);
+           tab_double (t, c + heading_columns, row + rows_per_variable - 1, 0, w, NULL, RC_WEIGHT);
 
-         if ( c != r)
-           tab_double (t, c + heading_columns, row + 1, 0,  sig, NULL);
+         if ( col_index != r)
+           tab_double (t, c + heading_columns, row + 1, 0,  sig, NULL, RC_PVALUE);
 
-         if ( opts->sig && c != r && sig < 0.05)
+         if ( opts->sig && col_index != r && sig < 0.05)
            flags = TAB_EMPH;
          
-         tab_double (t, c + heading_columns, row, flags, pearson, NULL);
+         tab_double (t, c + heading_columns, row, flags, pearson, NULL, RC_OTHER);
 
          if (opts->statistics & STATS_XPROD)
            {
@@ -268,8 +271,8 @@ output_correlation (const struct corr *corr, const struct corr_opts *opts,
              const double xprod_dev = cov * w;
              cov *= w / (w - 1.0);
 
-             tab_double (t, c + heading_columns, row + 2, 0, xprod_dev, NULL);
-             tab_double (t, c + heading_columns, row + 3, 0, cov, NULL);
+             tab_double (t, c + heading_columns, row + 2, 0, xprod_dev, NULL, RC_OTHER);
+             tab_double (t, c + heading_columns, row + 3, 0, cov, NULL, RC_OTHER);
            }
        }
     }