projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command: Remove superfluous trailing spaces from command names.
[pspp]
/
src
/
math
/
covariance.c
diff --git
a/src/math/covariance.c
b/src/math/covariance.c
index dc3166923d7ddff670d903274caef1dfe548beb4..aa7f41771c1ac9f3d55ff90d5a418010e5e032a8 100644
(file)
--- a/
src/math/covariance.c
+++ b/
src/math/covariance.c
@@
-68,7
+68,7
@@
struct covariance
{
/* The variables for which the covariance matrix is to be calculated. */
size_t n_vars;
{
/* The variables for which the covariance matrix is to be calculated. */
size_t n_vars;
- const struct variable **vars;
+ const struct variable *
const
*vars;
/* Categorical variables. */
struct categoricals *categoricals;
/* Categorical variables. */
struct categoricals *categoricals;
@@
-131,11
+131,11
@@
covariance_moments (const struct covariance *cov, int m)
/* Create a covariance struct.
*/
struct covariance *
/* Create a covariance struct.
*/
struct covariance *
-covariance_1pass_create (size_t n_vars, const struct variable **vars,
+covariance_1pass_create (size_t n_vars, const struct variable *
const
*vars,
const struct variable *weight, enum mv_class exclude)
{
size_t i;
const struct variable *weight, enum mv_class exclude)
{
size_t i;
- struct covariance *cov = x
m
alloc (sizeof *cov);
+ struct covariance *cov = x
z
alloc (sizeof *cov);
cov->passes = 1;
cov->state = 0;
cov->passes = 1;
cov->state = 0;
@@
-156,7
+156,8
@@
covariance_1pass_create (size_t n_vars, const struct variable **vars,
cov->n_cm = (n_vars * (n_vars - 1) ) / 2;
cov->n_cm = (n_vars * (n_vars - 1) ) / 2;
- cov->cm = xcalloc (sizeof *cov->cm, cov->n_cm);
+ if (cov->n_cm > 0)
+ cov->cm = xcalloc (sizeof *cov->cm, cov->n_cm);
cov->categoricals = NULL;
return cov;
cov->categoricals = NULL;
return cov;
@@
-169,8
+170,8
@@
covariance_1pass_create (size_t n_vars, const struct variable **vars,
until then.
*/
struct covariance *
until then.
*/
struct covariance *
-covariance_2pass_create (size_t n_vars, const struct variable **vars,
- s
ize_t n_catvars, const struct variable **catvars,
+covariance_2pass_create (size_t n_vars, const struct variable *
const
*vars,
+ s
truct categoricals *cats,
const struct variable *wv, enum mv_class exclude)
{
size_t i;
const struct variable *wv, enum mv_class exclude)
{
size_t i;
@@
-196,7
+197,7
@@
covariance_2pass_create (size_t n_vars, const struct variable **vars,
cov->n_cm = -1;
cov->cm = NULL;
cov->n_cm = -1;
cov->cm = NULL;
- cov->categoricals = cat
egoricals_create (catvars, n_catvars, wv, exclude)
;
+ cov->categoricals = cat
s
;
return cov;
}
return cov;
}
@@
-266,6
+267,7
@@
get_val (const struct covariance *cov, int i, const struct ccase *c)
return categoricals_get_binary_by_subscript (cov->categoricals, i - cov->n_vars, c);
}
return categoricals_get_binary_by_subscript (cov->categoricals, i - cov->n_vars, c);
}
+#if 0
void
dump_matrix (const gsl_matrix *m)
{
void
dump_matrix (const gsl_matrix *m)
{
@@
-278,6
+280,7
@@
dump_matrix (const gsl_matrix *m)
printf ("\n");
}
}
printf ("\n");
}
}
+#endif
/* Call this function for every case in the data set */
void
/* Call this function for every case in the data set */
void
@@
-293,7
+296,8
@@
covariance_accumulate_pass1 (struct covariance *cov, const struct ccase *c)
cov->state = 1;
}
cov->state = 1;
}
- categoricals_update (cov->categoricals, c);
+ if (cov->categoricals)
+ categoricals_update (cov->categoricals, c);
for (i = 0 ; i < cov->dim; ++i)
{
for (i = 0 ; i < cov->dim; ++i)
{
@@
-339,8
+343,11
@@
covariance_accumulate_pass2 (struct covariance *cov, const struct ccase *c)
assert (cov->state == 1);
cov->state = 2;
assert (cov->state == 1);
cov->state = 2;
- cov->dim = cov->n_vars +
- categoricals_total (cov->categoricals) - categoricals_get_n_variables (cov->categoricals);
+ cov->dim = cov->n_vars;
+
+ if (cov->categoricals)
+ cov->dim += categoricals_total (cov->categoricals)
+ - categoricals_get_n_variables (cov->categoricals);
cov->n_cm = (cov->dim * (cov->dim - 1) ) / 2;
cov->cm = xcalloc (sizeof *cov->cm, cov->n_cm);
cov->n_cm = (cov->dim * (cov->dim - 1) ) / 2;
cov->cm = xcalloc (sizeof *cov->cm, cov->n_cm);
@@
-352,7
+359,8
@@
covariance_accumulate_pass2 (struct covariance *cov, const struct ccase *c)
cov->moments[i] = resize_matrix (cov->moments[i], cov->dim);
}
cov->moments[i] = resize_matrix (cov->moments[i], cov->dim);
}
- categoricals_done (cov->categoricals);
+ if (cov->categoricals)
+ categoricals_done (cov->categoricals);
/* Populate the moments matrices with the categorical value elements */
for (i = cov->n_vars; i < cov->dim; ++i)
/* Populate the moments matrices with the categorical value elements */
for (i = cov->n_vars; i < cov->dim; ++i)
@@
-598,7
+606,8
@@
covariance_calculate_single_pass (struct covariance *cov)
const gsl_matrix *
covariance_calculate (struct covariance *cov)
{
const gsl_matrix *
covariance_calculate (struct covariance *cov)
{
- assert ( cov->state > 0 );
+ if ( cov->state <= 0 )
+ return NULL;
switch (cov->passes)
{
switch (cov->passes)
{
@@
-642,7
+651,6
@@
static const gsl_matrix *
covariance_calculate_single_pass_unnormalized (struct covariance *cov)
{
size_t i, j;
covariance_calculate_single_pass_unnormalized (struct covariance *cov)
{
size_t i, j;
- size_t m;
for (i = 0 ; i < cov->dim; ++i)
{
for (i = 0 ; i < cov->dim; ++i)
{
@@
-679,7
+687,8
@@
covariance_calculate_single_pass_unnormalized (struct covariance *cov)
const gsl_matrix *
covariance_calculate_unnormalized (struct covariance *cov)
{
const gsl_matrix *
covariance_calculate_unnormalized (struct covariance *cov)
{
- assert ( cov->state > 0 );
+ if ( cov->state <= 0 )
+ return NULL;
switch (cov->passes)
{
switch (cov->passes)
{
@@
-694,6
+703,14
@@
covariance_calculate_unnormalized (struct covariance *cov)
}
}
}
}
+/* Function to access the categoricals used by COV
+ The return value is owned by the COV
+*/
+const struct categoricals *
+covariance_get_categoricals (const struct covariance *cov)
+{
+ return cov->categoricals;
+}
/* Destroy the COV object */
/* Destroy the COV object */