X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcat.h;h=47c4ba54bc8c8b3a795c2f09db7b8d6914796f8d;hb=012b055f5f7b4ddd2a608e64c53eaae101b5634e;hp=700f4a30a6eb2c5a5891d964dd0526994885c891;hpb=494a50b0d023c55b61caf33e3887379332166d07;p=pspp-builds.git

diff --git a/src/cat.h b/src/cat.h
index 700f4a30..47c4ba54 100644
--- a/src/cat.h
+++ b/src/cat.h
@@ -1,4 +1,4 @@
-/* PSPP - linear regression.
+/* PSPP - Binary encodings for categorical variables.
    Copyright (C) 2005 Free Software Foundation, Inc.
    Written by Jason H Stover <jason@sakla.net>.
 
@@ -31,138 +31,26 @@
   sub-row of a matrix, we need to know which sub-row corresponds to
   the variable 'cat_var'.
 
-  The data structures defined here will be placed in the variable 
-  structure in the future. When that happens, the useful code
-  in this file will be that which refers to design matrices.
  */
 
 #ifndef CAT_H
-#define CAT_H 1
-
-#include <gsl/gsl_matrix.h>
+#define CAT_H
+#define CAT_VALUE_NOT_FOUND -2
+#include <stdbool.h>
+#include "val.h"
+#include "var.h"
 /*
-  This structure contains the binary encoding of a 
+  This structure contains the observed values of a 
   categorical variable.
  */
-struct recoded_categorical
+struct cat_vals
 {
-  const struct variable *v;	/* Original variable. */
-  union value **vals;
-  gsl_matrix *m;		/* Vector-encoded values of the original
-				   variable. The ith row of the matrix corresponds
-				   to the ith value of a categorical variable.
-				 */
+  union value *vals;
   size_t n_categories;
-  size_t first_column;		/* First column of the gsl_matrix which
-				   contains recoded values of the categorical
-				   variable.
-				 */
-  size_t last_column;		/* Last column containing the recoded
-				   categories.  The practice of keeping only the
-				   first and last columns of the matrix implies
-				   those columns corresponding to v must be
-				   contiguous.
-				 */
-  size_t n_allocated_categories;	/* This is used only during initialization
-					   to keep track of the number of values
-					   stored. 
-					 */
-};
-
-/*
-  There are usually multiple categorical variables to recode.  Get rid
-  of this structure immediately when the variable structure has been
-  modified to contain the binary encoding.
- */
-struct recoded_categorical_array
-{
-  struct recoded_categorical **a;
-  size_t n_vars;
-};
-/*
-  The design matrix structure holds the design
-  matrix and an array to tell us which columns
-  correspond to which variables. This structure 
-  is not restricted to categorical variables, and
-  perhaps should be moved to its own module.
-*/
-
-struct design_matrix_var
-{
-  int first_column;		/* First column for this variable in the
-				   design_matix. If this variable is categorical,
-				   its values are stored in multiple, contiguous
-				   columns, as dictated by its vector encoding
-				   in the variable's struct recoded_categorical.
-				 */
-  int last_column;
-  struct variable *v;
-};
-struct design_matrix
-{
-  gsl_matrix *m;
-  struct design_matrix_var *vars;	/* Element i is the the variable whose
-					   values are stored in column i of m. If that
-					   variable is categorical with more than two
-					   categories, its values are stored in multiple,
-					   contiguous columns. In this case, element i is
-					   the first column for that variable. The
-					   variable's values are then stored in the
-					   columns first_column through
-					   last_column. first_column and last_column for
-					   a categorical variable are stored in the
-					   variable's recoded_categorical structure.
+  size_t n_allocated_categories;	/* This is used only during
+					   initialization to keep
+					   track of the number of
+					   values stored.
 					 */
-  size_t n_vars;
 };
-const union value *cr_vector_to_value (const gsl_vector *,
-				       struct recoded_categorical *);
-
-void cr_value_update (struct recoded_categorical *, const union value *);
-
-int cr_free_recoded_array (struct recoded_categorical_array *);
-
-struct recoded_categorical_array *cr_recoded_cat_ar_create (int,
-							    struct variable
-							    *[]);
-
-struct recoded_categorical *cr_recoded_categorical_create (const struct
-							   variable *);
-
-void cr_create_value_matrices (struct recoded_categorical_array *);
-
-struct recoded_categorical *cr_var_to_recoded_categorical (const struct
-							   variable *,
-							   struct
-							   recoded_categorical_array
-							   *);
-
-struct design_matrix *design_matrix_create (int, const struct variable *[],
-					    struct
-					    recoded_categorical_array *,
-					    const size_t);
-
-void design_matrix_destroy (struct design_matrix *);
-
-void design_matrix_set_categorical (struct design_matrix *, size_t,
-				    const struct variable *,
-				    const union value *,
-				    struct recoded_categorical *);
-
-void design_matrix_set_numeric (struct design_matrix *, size_t,
-				const struct variable *, const union value *);
-
-size_t design_matrix_var_to_column (const struct design_matrix *,
-				    const struct variable *);
-
-const struct variable *design_matrix_col_to_var (const struct design_matrix *,
-						 size_t);
-
-void
-design_matrix_set (struct design_matrix *, size_t,
-		   const struct variable *, const union value *,
-		   struct recoded_categorical *);
-
-void cr_recoded_categorical_destroy (struct recoded_categorical *);
-
 #endif