projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6fad548
)
fixed update of moments
author
Jason H Stover
<jhs@math.gcsu.edu>
Mon, 12 Jan 2009 21:21:13 +0000
(16:21 -0500)
committer
Jason H Stover
<jhs@math.gcsu.edu>
Mon, 12 Jan 2009 21:21:13 +0000
(16:21 -0500)
src/math/covariance-matrix.c
patch
|
blob
|
history
diff --git
a/src/math/covariance-matrix.c
b/src/math/covariance-matrix.c
index 32ca9bca9f7a20f1d7bd6d899027af54b6639998..b6411fb3d78262e2450f3cbbdd1bccd1844f9184 100644
(file)
--- a/
src/math/covariance-matrix.c
+++ b/
src/math/covariance-matrix.c
@@
-26,6
+26,7
@@
#include <libpspp/hash.h>
#include <libpspp/hash-functions.h>
#include <math/covariance-matrix.h>
#include <libpspp/hash.h>
#include <libpspp/hash-functions.h>
#include <math/covariance-matrix.h>
+#include <math/interaction.h>
#include <math/moments.h>
#include <string.h>
#include <xalloc.h>
#include <math/moments.h>
#include <string.h>
#include <xalloc.h>
@@
-588,7
+589,7
@@
covariance_accumulate_pairwise (struct covariance_matrix *cov,
if (!var_is_value_missing (v_variables[i], val1, cov->missing_value))
{
cat_value_update (v_variables[i], val1);
if (!var_is_value_missing (v_variables[i], val1, cov->missing_value))
{
cat_value_update (v_variables[i], val1);
- if (var_is_
alpha
(v_variables[i]))
+ if (var_is_
numeric
(v_variables[i]))
cov->update_moments (cov, i, val1->f);
for (j = i; j < cov->n_variables; j++)
cov->update_moments (cov, i, val1->f);
for (j = i; j < cov->n_variables; j++)
@@
-643,7
+644,7
@@
covariance_accumulate_listwise (struct covariance_matrix *cov,
{
val1 = case_data (ccase, v_variables[i]);
cat_value_update (v_variables[i], val1);
{
val1 = case_data (ccase, v_variables[i]);
cat_value_update (v_variables[i], val1);
- if (var_is_
alpha
(v_variables[i]))
+ if (var_is_
numeric
(v_variables[i]))
cov->update_moments (cov, i, val1->f);
for (j = i; j < cov->n_variables; j++)
cov->update_moments (cov, i, val1->f);
for (j = i; j < cov->n_variables; j++)