Miscellaneous cleanup to categorical values, linreg and design matrix code.

[pspp-builds.git] / src / math / design-matrix.h

diff --git a/src/math/design-matrix.h b/src/math/design-matrix.h
index ce17e5963cedd928a8ce581fb64d7d8e6a787229..2b6bae508a2522e2dad22d2030b1da35096e4340 100644 (file)
--- a/src/math/design-matrix.h
+++ b/src/math/design-matrix.h
@@ -26,7 +26,7 @@
 #include <gsl/gsl_matrix.h>
 #include <stdbool.h>
 #include <data/category.h>
-#include <data/cat-routines.h>
+
 struct design_matrix_var
 {
   size_t first_column;         /* First column for this variable in
@@ -40,6 +40,7 @@ struct design_matrix_var
   size_t last_column;
   const struct variable *v;
 };
+
 struct design_matrix
 {
   gsl_matrix *m;
@@ -61,7 +62,7 @@ struct design_matrix
                                         */
   size_t n_vars;
 };
-union value *cat_vector_to_value (const gsl_vector *, struct variable *);
+
 
 struct design_matrix *design_matrix_create (int, const struct variable *[],
                                            const size_t);
@@ -73,12 +74,13 @@ void design_matrix_set_categorical (struct design_matrix *, size_t,
                                    const union value *);
 
 void design_matrix_set_numeric (struct design_matrix *, size_t,
-                               const struct variable *, const union value *);
+                                   const struct variable *,
+                                   const union value *);
 
 size_t design_matrix_var_to_column (const struct design_matrix *,
                                    const struct variable *);
 
-struct variable *design_matrix_col_to_var (const struct design_matrix *,
+const struct variable *design_matrix_col_to_var (const struct design_matrix *,
                                           size_t);
 
 #endif