projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 7f13fe87d5bc276422ac9537142e6a1ce850c1d9..2b6bae508a2522e2dad22d2030b1da35096e4340 100644
(file)
--- a/
src/math/design-matrix.h
+++ b/
src/math/design-matrix.h
@@
-1,6
+1,5
@@
/* PSPP - Creates design matrices.
Copyright (C) 2005 Free Software Foundation, Inc.
/* PSPP - Creates design matrices.
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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-26,8
+25,8
@@
#include <gsl/gsl_matrix.h>
#include <stdbool.h>
#include <gsl/gsl_matrix.h>
#include <stdbool.h>
-#include
"category.h"
-#include "cat-routines.h"
+#include
<data/category.h>
+
struct design_matrix_var
{
size_t first_column; /* First column for this variable in
struct design_matrix_var
{
size_t first_column; /* First column for this variable in
@@
-41,6
+40,7
@@
struct design_matrix_var
size_t last_column;
const struct variable *v;
};
size_t last_column;
const struct variable *v;
};
+
struct design_matrix
{
gsl_matrix *m;
struct design_matrix
{
gsl_matrix *m;
@@
-62,7
+62,7
@@
struct design_matrix
*/
size_t n_vars;
};
*/
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);
struct design_matrix *design_matrix_create (int, const struct variable *[],
const size_t);
@@
-74,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 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 *);
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
size_t);
#endif