projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix PR 13054.
[pspp]
/
src
/
factor_stats.h
diff --git
a/src/factor_stats.h
b/src/factor_stats.h
index fcddb5f4720b6c64563f5db815a9a335c3192c81..02a69db32e42d82add7516c812da94d4041857d1 100644
(file)
--- a/
src/factor_stats.h
+++ b/
src/factor_stats.h
@@
-15,8
+15,8
@@
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
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., 5
9 Temple Place - Suite 330
, Boston, MA
-0211
1-1307
, USA. */
+Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+0211
0-1301
, USA. */
#ifndef FACTOR_STATS
#define FACTOR_STATS
#ifndef FACTOR_STATS
#define FACTOR_STATS
@@
-27,7
+27,10
@@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include "hash.h"
#include "val.h"
#include "hash.h"
#include "val.h"
-
+#include <string.h>
+#include <gsl/gsl_histogram.h>
+#include "subclist.h"
+#include "percentiles.h"
struct moments1;
struct moments1;
@@
-43,7
+46,7
@@
struct metrics
double mean;
double mean;
- double s
tderr
;
+ double s
e_mean
;
double var;
double var;
@@
-51,27
+54,39
@@
struct metrics
struct moments1 *moments;
struct moments1 *moments;
+ gsl_histogram *histogram;
+
double skewness;
double kurtosis;
double trimmed_mean;
double skewness;
double kurtosis;
double trimmed_mean;
- /* A hash of data for this factor.
- */
+ /* A hash of data for this factor. */
struct hsh_table *ordered_data;
/* A Pointer to this hash table AFTER it has been SORTED and crunched */
struct weighted_value **wvp;
struct hsh_table *ordered_data;
/* A Pointer to this hash table AFTER it has been SORTED and crunched */
struct weighted_value **wvp;
-
/* The number of values in the above array
(if all the weights are 1, then this will
be the same as n) */
int n_data;
/* The number of values in the above array
(if all the weights are 1, then this will
be the same as n) */
int n_data;
-};
+ /* Percentile stuff */
+
+ /* A hash of struct percentiles */
+ struct hsh_table *ptile_hash;
+ /* Algorithm to be used for calculating percentiles */
+ enum pc_alg ptile_alg;
+ /* Tukey's Hinges */
+ double hinge[3];
+
+};
+
+
+struct metrics * metrics_create(void);
void metrics_precalc(struct metrics *m);
void metrics_precalc(struct metrics *m);
@@
-80,6
+95,9
@@
void metrics_calc(struct metrics *m, const union value *f, double weight,
void metrics_postcalc(struct metrics *m);
void metrics_postcalc(struct metrics *m);
+void metrics_destroy(struct metrics *m);
+
+
/* Linked list of case nos */
struct case_node
/* Linked list of case nos */
struct case_node
@@
-121,6
+139,8
@@
struct factor_statistics {
/* The an array stats for this factor, one for each dependent var */
struct metrics *m;
/* The an array stats for this factor, one for each dependent var */
struct metrics *m;
+ /* The number of dependent variables */
+ int n_var;
};
};