Encapsulated lexer and updated calling functions accordingly.

[pspp] / src / math / linreg / predict.c

diff --git a/src/math/linreg/predict.c b/src/math/linreg/predict.c
index 06576d057d52cb9d05bdb6b119de35788375ee07..ca96ab097e198d248e6aacf5a2208fd1ac808c3c 100644 (file)
--- a/src/math/linreg/predict.c
+++ b/src/math/linreg/predict.c
@@ -19,7 +19,7 @@
  */
 
 #include <math/linreg/linreg.h>
-#include <math/linreg/coefficient.h>
+#include <math/coefficient.h>
 #include <gl/xalloc.h>
 
 /*
@@ -35,8 +35,8 @@ pspp_linreg_predict (const struct variable **predictors,
   const pspp_linreg_cache *c = c_;
   int i;
   int j;
-  const struct pspp_linreg_coeff **found;
-  const struct pspp_linreg_coeff *coe;
+  const struct pspp_coeff **found;
+  const struct pspp_coeff *coe;
   double result;
   double tmp;
 
@@ -69,7 +69,7 @@ pspp_linreg_predict (const struct variable **predictors,
       if (i < c->n_coeffs)
        {
          found[i] = coe;
-         tmp = pspp_linreg_coeff_get_est (coe);
+         tmp = pspp_coeff_get_est (coe);
          if (predictors[j]->type == NUMERIC)
            {
              tmp *= vals[j]->f;