X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcovariance.h;h=2aee9f18b9e0c80a9fa684d58844bebe4442f4a2;hb=fbaa01a45afaa56c8aa46a99ff95864beebe2237;hp=ee096af6e0f758b0ddfc0710b6c00e024ebaf4e0;hpb=09e9433298a484353b1aac68018871553bee3d55;p=pspp

diff --git a/src/math/covariance.h b/src/math/covariance.h
index ee096af6e0..2aee9f18b9 100644
--- a/src/math/covariance.h
+++ b/src/math/covariance.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    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
@@ -18,28 +18,45 @@
 #ifndef COVARIANCE_H
 #define COVARIANCE_H
 
-#include <stddef.h>
-
-#include <data/missing-values.h>
 #include <gsl/gsl_matrix.h>
+#include <stddef.h>
+#include "data/missing-values.h"
 
 struct covariance;
 struct variable;
 struct ccase ;
+struct categoricals;
+
+struct covariance * covariance_1pass_create (size_t n_vars, const struct variable *const *vars, 
+					     const struct variable *wv, enum mv_class excl);
 
-struct covariance * covariance_create (size_t n_vars, const struct variable **vars, 
-				       const struct variable *wv, enum mv_class excl);
 struct covariance *
-covariance_2pass_create (size_t n_vars, const struct variable **vars,
-			 size_t n_catvars, const struct variable **catvars, 
-			 const struct variable *weight, enum mv_class excl);
+covariance_2pass_create (size_t n_vars, const struct variable *const *vars,
+			 struct categoricals *cats,
+			 const struct variable *wv, enum mv_class excl);
 
 void covariance_accumulate (struct covariance *, const struct ccase *);
+void covariance_accumulate_pass1 (struct covariance *, const struct ccase *);
+void covariance_accumulate_pass2 (struct covariance *, const struct ccase *);
 
-const gsl_matrix * covariance_calculate (struct covariance *cov);
+gsl_matrix * covariance_calculate (struct covariance *);
+const gsl_matrix * covariance_calculate_unnormalized (struct covariance *);
 
 void covariance_destroy (struct covariance *cov);
 
 const gsl_matrix *covariance_moments (const struct covariance *cov, int m);
 
+const struct categoricals * covariance_get_categoricals (const struct covariance *cov);
+size_t covariance_dim (const struct covariance * cov);
+
+struct tab_table ;
+void
+covariance_dump_enc (const struct covariance *cov, const struct ccase *c,
+		     struct tab_table *t);
+
+struct tab_table *
+covariance_dump_enc_header (const struct covariance *cov, int length);
+
+
+
 #endif