X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fdesign-matrix.h;h=b1cda5a9068d38be49ed45dd53a5016f78368056;hb=ff59ee87992b440aab8083ee041f9aecd2ce68ca;hp=8c268de42422f36504f75e87e05f2e8c85afa0d8;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp-builds.git

diff --git a/src/math/design-matrix.h b/src/math/design-matrix.h
index 8c268de4..b1cda5a9 100644
--- a/src/math/design-matrix.h
+++ b/src/math/design-matrix.h
@@ -1,21 +1,18 @@
-/* PSPP - Creates design matrices.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2005 Free Software Foundation, Inc.
-   Written by Jason H Stover <jason@sakla.net>.
 
-   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 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.
+   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
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 /*
   Create design matrices for procedures that need them.
@@ -27,7 +24,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
@@ -41,6 +38,7 @@ struct design_matrix_var
   size_t last_column;
   const struct variable *v;
 };
+
 struct design_matrix
 {
   gsl_matrix *m;
@@ -60,9 +58,12 @@ struct design_matrix
 					   design_matrix_var
 					   structure.
 					 */
+  size_t *n_cases; /* Element i is the number of valid cases for this
+		      variable.
+		    */
   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);
@@ -74,12 +75,26 @@ 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 *);
+
+struct design_matrix *design_matrix_clone (const struct design_matrix *);
 
 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);
+void design_matrix_increment_case_count (struct design_matrix *, const struct variable *);
+
+void design_matrix_set_case_count (struct design_matrix *, const struct variable *, size_t);
+
+size_t design_matrix_get_case_count (const struct design_matrix *, const struct variable *);
+size_t design_matrix_get_n_cols (const struct design_matrix *);
+size_t design_matrix_get_n_rows (const struct design_matrix *);
+double design_matrix_get_element (const struct design_matrix *, size_t, size_t);
+void design_matrix_set_element (const struct design_matrix *, size_t, size_t, double);
+size_t dm_get_exact_subscript (const struct design_matrix *, const struct variable *,
+				   const union value *);
 
 #endif