Set final element in covariance matrix. Use accessor functions for linreg struct...

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index 4841c66ea536a4a05c5efd9c30643c88ba51bb50..0718b8d4d0bccce1da5ff3269ae0fd1b5ecc9157 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -144,8 +144,8 @@ reg_stats_r (linreg * c)
   double std_error;
 
   assert (c != NULL);
-  rsq = c->ssm / c->sst;
-  adjrsq = 1.0 - (1.0 - rsq) * (c->n_obs - 1.0) / (c->n_obs - c->n_indeps);
+  rsq = linreg_ssreg (c) / linreg_sst (c);
+  adjrsq = 1.0 - (1.0 - rsq) * (linreg_n_obs (c) - 1.0) / (linreg_n_obs (c) - linreg_n_coeffs (c));
   std_error = sqrt (linreg_mse (c));
   t = tab_create (n_cols, n_rows, 0);
   tab_dim (t, tab_natural_dimensions, NULL);
@@ -293,9 +293,9 @@ reg_stats_anova (linreg * c)
   tab_text (t, 1, 3, TAB_LEFT | TAT_TITLE, _("Total"));
 
   /* Sums of Squares */
-  tab_double (t, 2, 1, 0, c->ssm, NULL);
-  tab_double (t, 2, 3, 0, c->sst, NULL);
-  tab_double (t, 2, 2, 0, c->sse, NULL);
+  tab_double (t, 2, 1, 0, linreg_ssreg (c), NULL);
+  tab_double (t, 2, 3, 0, linreg_sst (c), NULL);
+  tab_double (t, 2, 2, 0, linreg_sse (c), NULL);
 
 
   /* Degrees of freedom */
@@ -858,6 +858,8 @@ fill_covariance (gsl_matrix *cov, struct covariance *all_cov,
          result = gsl_matrix_get (ssizes, rows[i], dep_subscript);
        }
     }
+  gsl_matrix_set (cov, cov->size1 - 1, cov->size1 - 1, 
+                 gsl_matrix_get (cm, dep_subscript, dep_subscript));
   free (rows);
   return result;
 }

diff --git a/src/math/linreg.c b/src/math/linreg.c
index c5ecf5ac9495ba10ccd7fa3bc1372a93224cf71c..6a0d57f4c3eb20bb67026ff2c36959580cac4174 100644 (file)
--- a/src/math/linreg.c
+++ b/src/math/linreg.c
@@ -72,7 +72,7 @@ linreg_alloc (const struct variable *depvar, const struct variable **indep_vars,
   linreg *c;
   size_t i;
 
-  c = xmalloc (sizeof (linreg));
+  c = xmalloc (sizeof (*c));
   c->depvar = depvar;
   c->indep_vars = xnmalloc (p, sizeof (*indep_vars));
   for (i = 0; i < p; i++)
@@ -100,8 +100,8 @@ linreg_alloc (const struct variable *depvar, const struct variable **indep_vars,
      Default settings.
    */
   c->method = LINREG_SWEEP;
-  c->resid = NULL;             /* The variable storing my residuals. */
-  c->pred = NULL;              /* The variable storing my predicted values. */
+  c->pred = NULL;
+  c->resid = NULL;
 
   return c;
 }
@@ -365,6 +365,7 @@ linreg_fit (const gsl_matrix *cov, linreg *l)
 
   params = gsl_matrix_calloc (cov->size1, cov->size2);
   gsl_matrix_memcpy (params, cov);
+  l->sst = gsl_matrix_get (cov, cov->size1 - 1, cov->size2 - 1);
 
   if (l->method == LINREG_SWEEP)
     {
@@ -419,10 +420,21 @@ linreg_n_obs (const linreg *c)
   return c->n_obs;
 }
 
+double
+linreg_sse (const linreg *c)
+{
+  return c->sse;
+}
+
 double
 linreg_ssreg (const linreg *c)
 {
-  return c->ssm;
+  return (c->sst - c->sse);
+}
+
+double linreg_sst (const linreg *c)
+{
+  return c->sst;
 }
 
 double 

diff --git a/src/math/linreg.h b/src/math/linreg.h
index f6c7e2e8c43d3f37d4fa451e1fb2e835fede9d4c..17fe3c733c990e45df1b3a4012baf6b84a3d9608 100644 (file)
--- a/src/math/linreg.h
+++ b/src/math/linreg.h
@@ -151,9 +151,8 @@ struct linreg_struct
    */
   gsl_matrix *hat;
 
-  struct variable *resid;
   struct variable *pred;
-
+  struct variable *resid;
 };
 
 typedef struct linreg_struct linreg;
@@ -199,6 +198,8 @@ double linreg_coeff (const linreg *, size_t);
 const struct variable * linreg_indep_var (const linreg *, size_t);
 size_t linreg_n_coeffs (const linreg *);
 size_t linreg_n_obs (const linreg *);
+double linreg_sse (const linreg *);
 double linreg_ssreg (const linreg *);
 double linreg_dfmodel (const linreg *);
+double linreg_sst (const linreg *);
 #endif