Descriptives: Constness

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

diff --git a/src/language/stats/regression.c b/src/language/stats/regression.c
index a200cdaadc307dc0038542b548f2208573102f60..9ca056943eb52d4631394cdd90937dcb136170df 100644 (file)
--- a/src/language/stats/regression.c
+++ b/src/language/stats/regression.c
@@ -60,7 +60,7 @@
 #define STATS_OUTS   8
 #define STATS_CI    16
 #define STATS_BCOV  32
-#define STATS_COLLIN 64
+#define STATS_TOL   64
 
 #define STATS_DEFAULT  (STATS_R | STATS_COEFF | STATS_ANOVA | STATS_OUTS)
 
@@ -309,9 +309,9 @@ cmd_regression (struct lexer *lexer, struct dataset *ds)
                 {
                  statistics |= STATS_BCOV;
                 }
-              else if (lex_match_id (lexer, "COLLIN"))
+              else if (lex_match_id (lexer, "TOL"))
                 {
-                 statistics |= STATS_COLLIN;
+                 statistics |= STATS_TOL;
                 }
               else if (lex_match_id (lexer, "CI"))
                 {
@@ -649,22 +649,22 @@ fill_covariance (gsl_matrix * cov, struct covariance *all_cov,
 
 \f
 
+struct model_container
+{
+  struct linreg **models;
+};
+
 /*
   STATISTICS subcommand output functions.
 */
 static void reg_stats_r (const struct linreg *,     const struct variable *);
-static void reg_stats_coeff (const struct regression *,
-                            const struct linreg *, const struct linreg *,
-                            const gsl_matrix *, const struct variable *);
+static void reg_stats_coeff (const struct regression *, const struct linreg *,
+                            const struct model_container *, const gsl_matrix *,
+                            const struct variable *);
 static void reg_stats_anova (const struct linreg *, const struct variable *);
 static void reg_stats_bcov (const struct linreg *,  const struct variable *);
 
 
-struct model_container
-{
-  struct linreg **models;
-};
-
 static struct linreg **
 run_regression_get_models (const struct regression *cmd,
                           struct casereader *input,
@@ -678,7 +678,7 @@ run_regression_get_models (const struct regression *cmd,
   struct covariance *cov;
   struct casereader *reader;
 
-  if (cmd->stats & STATS_COLLIN)
+  if (cmd->stats & STATS_TOL)
     {
       for (i = 0; i < cmd->n_vars; i++)
        {
@@ -716,8 +716,7 @@ run_regression_get_models (const struct regression *cmd,
   reader = casereader_clone (input);
   reader = casereader_create_filter_missing (reader, all_vars, n_all_vars,
                                              MV_ANY, NULL, NULL);
-
-  {
+{
     struct casereader *r = casereader_clone (reader);
 
     for (; (c = casereader_read (r)) != NULL; case_unref (c))
@@ -760,12 +759,12 @@ run_regression_get_models (const struct regression *cmd,
 
              if (cmd->stats & STATS_COEFF)
                reg_stats_coeff (cmd, models[k],
-                                model_container[k].models ? model_container[k].models[0] : NULL,
+                                model_container,
                                 cov_matrix, dep_var);
 
              if (cmd->stats & STATS_BCOV)
                reg_stats_bcov  (models[k], dep_var);
-            }
+           }
         }
       else
         {
@@ -882,9 +881,9 @@ reg_stats_r (const struct linreg * c, const struct variable *var)
   Table showing estimated regression coefficients.
 */
 static void
-reg_stats_coeff (const struct regression *cmd,
-                const struct linreg *c, const struct linreg *c_x,
-                const gsl_matrix *cov, const struct variable *var)
+reg_stats_coeff (const struct regression *cmd, const struct linreg *c,
+                const struct model_container *mc, const gsl_matrix *cov,
+                const struct variable *var)
 {
   struct pivot_table *table = pivot_table_create__ (
     pivot_value_new_text_format (N_("Coefficients (%s)"),
@@ -909,7 +908,7 @@ reg_stats_coeff (const struct regression *cmd,
                                     N_("Upper Bound"));
     }
 
-  if (cmd->stats & STATS_COLLIN)
+  if (cmd->stats & STATS_TOL)
     pivot_category_create_group (statistics->root,
                                 N_("Collinearity Statistics"),
                                 N_("Tolerance"), N_("VIF"));
@@ -991,19 +990,14 @@ reg_stats_coeff (const struct regression *cmd,
                              pivot_value_new_number (interval_entries[i]));
        }
 
-      if (cmd->stats & STATS_COLLIN)
+      if (cmd->stats & STATS_TOL)
        {
-         assert (c_x);
-         double rsq = linreg_ssreg (c_x) / linreg_sst (c_x);
-
-         double collin_entries[] = {
-           1.0 - rsq,
-           1.0 / (1.0 - rsq),
-         };
-
-         for (size_t i = 0; i < sizeof collin_entries / sizeof *collin_entries; i++)
-           pivot_table_put2 (table, col++, var_idx,
-                             pivot_value_new_number (collin_entries[i]));
+         {
+           struct linreg *m = mc[j].models[0];
+           double rsq = linreg_ssreg (m) / linreg_sst (m);
+           pivot_table_put2 (table, col++, var_idx, pivot_value_new_number (1.0 - rsq));
+           pivot_table_put2 (table, col++, var_idx, pivot_value_new_number (1.0 / (1.0 - rsq)));
+         }
        }
     }