Make pspp_linreg_with_cov() void, since it doesn't actually return a value.

[pspp-builds.git] / src / math / linreg.c

diff --git a/src/math/linreg.c b/src/math/linreg.c
index a7fa15657344bd1cf52aad870acffd80c9d661f6..48db78a82c5af8340a017f2e97da25dba1c0c6c5 100644 (file)
--- a/src/math/linreg.c
+++ b/src/math/linreg.c
@@ -96,10 +96,10 @@ linreg_mean_std (gsl_vector_const_view v, double *mp, double *sp, double *ssp)
   The return value is the number of distinct variables found.
  */
 int
-pspp_linreg_get_vars (const void *c_, struct variable **v)
+pspp_linreg_get_vars (const void *c_, const struct variable **v)
 {
   const pspp_linreg_cache *c = c_;
-  struct variable *tmp;
+  const struct variable *tmp;
   int i;
   int j;
   int result = 0;
@@ -663,7 +663,7 @@ void pspp_linreg_set_indep_variable_mean (pspp_linreg_cache *c, const struct var
 static struct design_matrix *
 rearrange_covariance_matrix (const struct design_matrix *cov, pspp_linreg_cache *c)
 {
-  struct variable **model_vars;
+  const struct variable **model_vars;
   struct design_matrix *result;
   size_t *permutation;
   size_t i;
@@ -674,7 +674,7 @@ rearrange_covariance_matrix (const struct design_matrix *cov, pspp_linreg_cache
   assert (c != NULL);
   assert (cov->m->size1 > 0);
   assert (cov->m->size2 == cov->m->size1);
-  permutation = xnmalloc (cov->m->size2, sizeof (*permutation));
+  permutation = xnmalloc (1 + c->n_indeps, sizeof (*permutation));
   model_vars = xnmalloc (1 + c->n_indeps, sizeof (*model_vars));
 
   /*
@@ -688,17 +688,18 @@ rearrange_covariance_matrix (const struct design_matrix *cov, pspp_linreg_cache
   result = covariance_matrix_create (1 + c->n_indeps, model_vars);
   for (j = 0; j < cov->m->size2; j++)
     {
-      for (k = 0; k < result->m->size2; k++)
+      k = 0;
+      while (k < result->m->size2)
        {
          if (design_matrix_col_to_var (cov, j) == design_matrix_col_to_var (result, k)) 
            {
              permutation[k] = j;
-             break;
            }
+         k++;
        }
     }
-  for (j = 0; j < result->m->size2; j++)
-    for (i = 0; i < result->m->size1; i++)
+  for (i = 0; i < result->m->size1; i++)
+    for (j = 0; j < result->m->size2; j++)
       {
        gsl_matrix_set (result->m, i, j, gsl_matrix_get (cov->m, permutation[i], permutation[j]));
       }
@@ -718,7 +719,7 @@ rearrange_covariance_matrix (const struct design_matrix *cov, pspp_linreg_cache
   having to alter it. The problem is that this means the caller must
   set CACHE->N_COEFFS.
 */
-int
+void
 pspp_linreg_with_cov (const struct design_matrix *full_cov, 
                      pspp_linreg_cache * cache)
 {