projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
language
/
stats
/
npar.q
diff --git
a/src/language/stats/npar.q
b/src/language/stats/npar.q
index 4caa112aefe8895555add598c773518078f5415d..bbccce671f075b161b1e95170d07197c6a3ac69d 100644
(file)
--- a/
src/language/stats/npar.q
+++ b/
src/language/stats/npar.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis. -*-c-*-
/* PSPP - a program for statistical analysis. -*-c-*-
- Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2008
, 2009
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
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
@@
-31,6
+31,7
@@
#include <language/stats/binomial.h>
#include <language/stats/chisquare.h>
#include <language/stats/wilcoxon.h>
#include <language/stats/binomial.h>
#include <language/stats/chisquare.h>
#include <language/stats/wilcoxon.h>
+#include <language/stats/sign.h>
#include <libpspp/hash.h>
#include <libpspp/pool.h>
#include <libpspp/taint.h>
#include <libpspp/hash.h>
#include <libpspp/pool.h>
#include <libpspp/taint.h>
@@
-159,7
+160,7
@@
cmd_npar_tests (struct lexer *lexer, struct dataset *ds)
test->insert_variables (test, var_hash);
}
test->insert_variables (test, var_hash);
}
- npar_specs.vv = (const struct variable **) const_hsh_
data
(var_hash);
+ npar_specs.vv = (const struct variable **) const_hsh_
sort
(var_hash);
npar_specs.n_vars = const_hsh_count (var_hash);
if ( cmd.sbc_statistics )
npar_specs.n_vars = const_hsh_count (var_hash);
if ( cmd.sbc_statistics )
@@
-557,8
+558,7
@@
npar_custom_sign (struct lexer *lexer, struct dataset *ds,
struct npar_specs *specs = aux;
struct two_sample_test *tp = pool_alloc(specs->pool, sizeof(*tp));
struct npar_specs *specs = aux;
struct two_sample_test *tp = pool_alloc(specs->pool, sizeof(*tp));
- ((struct npar_test *)tp)->execute = NULL;
-
+ ((struct npar_test *) tp)->execute = sign_execute;
if (!parse_two_sample_related_test (lexer, dataset_dict (ds), cmd,
tp, specs->pool) )
if (!parse_two_sample_related_test (lexer, dataset_dict (ds), cmd,
tp, specs->pool) )