moved knowledge of pspp_linreg_cache out of pspp_coeff_init

diff --git a/src/language/stats/ChangeLog b/src/language/stats/ChangeLog
index 0a0abfb6fa41567928be8dd931df697de1090fab..eb943c6066c2f483c69f0f9e4a787eb6327e3be5 100644 (file)
--- a/src/language/stats/ChangeLog
+++ b/src/language/stats/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-14  Jason Stover  <jhs@math.gcsu.edu>
+
+       * regression.q (run_regression): New function to move knowledge of
+       pspp_linreg_cache out of math/coefficient.[ch].
+
 Sat Jul  1 17:41:46 2006  Ben Pfaff  <blp@gnu.org>
 
        Fix bug #11612, "q2c documentation does not agree with code".

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index 4e82a9231c6062d6a73e46c96e9e97e0451a8db9..3706760a38ed9689b64b4d0afaedd7a05908fb0a 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -1078,7 +1078,14 @@ prepare_data (int n_data, int is_missing_case[],
 
   return n_data;
 }
-
+static void
+coeff_init (pspp_linreg_cache *c, struct design_matrix *dm)
+{
+  c->coeff = xnmalloc (dm->m->size2 + 1, sizeof (*c->coeff));
+  c->coeff[0] = xmalloc (sizeof (*(c->coeff[0]))); /* The first coefficient is the intercept. */
+  c->coeff[0]->v_info = NULL;  /* Intercept has no associated variable. */
+  pspp_coeff_init (c->coeff + 1, dm);
+}
 static bool
 run_regression (const struct ccase *first,
                 const struct casefile *cf, void *cmd_ UNUSED)
@@ -1213,8 +1220,8 @@ run_regression (const struct ccase *first,
          and store pointers to the variables that correspond to the
          coefficients.
        */
-      pspp_coeff_init (models[k], X);
-
+      coeff_init (models[k], X);
+      
       /* 
          Find the least-squares estimates and other statistics.
        */

diff --git a/src/math/ChangeLog b/src/math/ChangeLog
index 86186777709d8bb86df84582cb6d6d49c565218b..1d99752ecd9d92fa78ad07009c95e88cbf55ae75 100644 (file)
--- a/src/math/ChangeLog
+++ b/src/math/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-14  Jason Stover  <jhs@math.gcsu.edu>
+
+       * coefficient.c (pspp_coeff_init): Removed use of
+       pspp_linreg_cache to make the routines more generally useful.
+
 2006-05-19  Jason Stover  <jhs@math.gcsu.edu>
 
        * coefficient.h: Renamed pspp_linreg_coeff to pspp_coeff.

diff --git a/src/math/coefficient.c b/src/math/coefficient.c
index ef3eadfa17a1d1776dcd30d55f96da290b8a8469..fcd7425e1761737c55f7ab7a4c385bbc74354b30 100644 (file)
--- a/src/math/coefficient.c
+++ b/src/math/coefficient.c
@@ -53,39 +53,32 @@ pspp_coeff_free (struct pspp_coeff *c)
   coefficient structures for the linear model.
  */
 void
-pspp_coeff_init (pspp_linreg_cache * c, struct design_matrix *X)
+pspp_coeff_init (struct pspp_coeff ** c, struct design_matrix *X)
 {
   size_t i;
-  size_t j;
   int n_vals = 1;
-  struct pspp_coeff *coeff;
 
-  c->coeff = xnmalloc (X->m->size2 + 1, sizeof (*c->coeff));
-  c->coeff[0] = xmalloc (sizeof (*c->coeff[0]));
-  c->coeff[0]->v_info = NULL;  /* Intercept has no associated variable. */
   for (i = 0; i < X->m->size2; i++)
     {
-      j = i + 1;               /* The first coefficient is the intercept. */
-      c->coeff[j] = xmalloc (sizeof (*c->coeff[j]));
-      coeff = c->coeff[j];
-      coeff->n_vars = n_vals;  /* Currently, no procedures allow
+      c[i] = xmalloc (sizeof (*c[i]));
+      c[i]->n_vars = n_vals;   /* Currently, no procedures allow
                                   interactions.  This line will have to
                                   change when procedures that allow
                                   interaction terms are written. 
                                 */
-      coeff->v_info = xnmalloc (coeff->n_vars, sizeof (*coeff->v_info));
-      assert (coeff->v_info != NULL);
-      coeff->v_info->v =
+      c[i]->v_info = xnmalloc (c[i]->n_vars, sizeof (*c[i]->v_info));
+      assert (c[i]->v_info != NULL);
+      c[i]->v_info->v =
        (const struct variable *) design_matrix_col_to_var (X, i);
 
-      if (coeff->v_info->v->type == ALPHA)
+      if (c[i]->v_info->v->type == ALPHA)
        {
          size_t k;
-         k = design_matrix_var_to_column (X, coeff->v_info->v);
+         k = design_matrix_var_to_column (X, c[i]->v_info->v);
          assert (k <= i);
          k = i - k;
-         coeff->v_info->val =
-           cat_subscript_to_value (k, (struct variable *) coeff->v_info->v);
+         c[i]->v_info->val =
+           cat_subscript_to_value (k, (struct variable *) c[i]->v_info->v);
        }
     }
 }

diff --git a/src/math/coefficient.h b/src/math/coefficient.h
index 7f11e8f1f2c54e3147c237f872762dbca5935c2b..4019c549b33253c57da77a646d11afff88e2a992 100644 (file)
--- a/src/math/coefficient.h
+++ b/src/math/coefficient.h
@@ -72,7 +72,7 @@ void pspp_coeff_free (struct pspp_coeff *);
   Initialize the variable and value pointers inside the
   coefficient structures for the linear model.
  */
-void pspp_coeff_init (pspp_linreg_cache *, struct design_matrix *);
+void pspp_coeff_init (struct pspp_coeff **, struct design_matrix *);
 
 
 void