First step in making struct variable opaque: the boring mechanical

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

diff --git a/src/math/linreg/predict.c b/src/math/linreg/predict.c
index 6562d321e6c18e465c4aab41b0e396b88ac69fc9..9303ca6077e046be3084ebdd57d70852e5d6c58e 100644 (file)
--- a/src/math/linreg/predict.c
+++ b/src/math/linreg/predict.c
@@ -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,8 +69,8 @@ pspp_linreg_predict (const struct variable **predictors,
       if (i < c->n_coeffs)
        {
          found[i] = coe;
-         tmp = pspp_linreg_coeff_get_est (coe);
-         if (predictors[j]->type == NUMERIC)
+         tmp = pspp_coeff_get_est (coe);
+         if (var_is_numeric (predictors[j]))
            {
              tmp *= vals[j]->f;
            }