X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcoefficient.c;h=44b7c0d3219b764b827f704a6b807c60a9adf2e0;hb=7ed50d6a12512276156477061ba54ba4836f2831;hp=eb2ee3174e42721e9b74147807453dc09f64caab;hpb=b57bac17a6057cc0642e6ecea792e058596f92bb;p=pspp-builds.git

diff --git a/src/math/coefficient.c b/src/math/coefficient.c
index eb2ee317..44b7c0d3 100644
--- a/src/math/coefficient.c
+++ b/src/math/coefficient.c
@@ -1,26 +1,23 @@
-/*
-  src/math/coefficient.c
-  
-  Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H Stover.
-  
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU General Public License as published by the Free
-  Software Foundation; either version 2 of the License, or (at your option)
-  any later version.
-  
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-  
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc., 51
-  Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
-*/
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 /*
   Accessor functions for matching coefficients and variables.
  */
+#include <config.h>
 #include <math/coefficient.h>
 #include <math/linreg/linreg.h>
 #include "src/math/design-matrix.h"
@@ -64,21 +61,20 @@ pspp_coeff_init (struct pspp_coeff ** c, const struct design_matrix *X)
       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. 
+				   interaction terms are written.
 				 */
       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);
+      c[i]->v_info->v = design_matrix_col_to_var (X, i);
 
-      if (c[i]->v_info->v->type == ALPHA)
+      if (var_is_alpha (c[i]->v_info->v))
 	{
 	  size_t k;
 	  k = design_matrix_var_to_column (X, c[i]->v_info->v);
 	  assert (k <= i);
 	  k = i - k;
 	  c[i]->v_info->val =
-	    cat_subscript_to_value (k, (struct variable *) c[i]->v_info->v);
+	    cat_subscript_to_value (k, c[i]->v_info->v);
 	}
     }
 }
@@ -162,14 +158,14 @@ pspp_coeff_get_value (struct pspp_coeff *c,
     {
       return NULL;
     }
-  if (v->type == NUMERIC)
+  if (var_is_numeric (v))
     {
       return NULL;
     }
   while (i < c->n_vars)
     {
       candidate = pspp_coeff_get_var (c, i);
-      if (v->index == candidate->index)
+      if (v == candidate)
 	{
 	  return (c->v_info + i)->val;
 	}
@@ -201,7 +197,7 @@ pspp_linreg_get_coeff (const pspp_linreg_cache * c,
 
   result = c->coeff[i];
   tmp = pspp_coeff_get_var (result, 0);
-  while (tmp->index != v->index && i < c->n_coeffs)
+  while (tmp != v && i < c->n_coeffs)
     {
       result = c->coeff[i];
       tmp = pspp_coeff_get_var (result, 0);
@@ -211,7 +207,7 @@ pspp_linreg_get_coeff (const pspp_linreg_cache * c,
     {
       return NULL;
     }
-  if (v->type == NUMERIC)
+  if (var_is_numeric (v))
     {
       return result;
     }
@@ -221,9 +217,9 @@ pspp_linreg_get_coeff (const pspp_linreg_cache * c,
          If v is categorical, we need to ensure the coefficient
          matches the VAL.
        */
-      while (tmp->index != v->index && i < c->n_coeffs
+      while (tmp != v && i < c->n_coeffs
 	     && compare_values (pspp_coeff_get_value (result, tmp),
-				val, v->width))
+				val, var_get_width (v)))
 	{			/* FIX THIS */
 	  i++;
 	  result = c->coeff[i];