#include "language/stats/ks-one-sample.h"
#include "language/stats/cochran.h"
#include "language/stats/friedman.h"
+#include "language/stats/jonckheere-terpstra.h"
#include "language/stats/kruskal-wallis.h"
#include "language/stats/mann-whitney.h"
#include "language/stats/mcnemar.h"
+#include "language/stats/median.h"
#include "language/stats/npar-summary.h"
#include "language/stats/runs.h"
#include "language/stats/sign.h"
int kruskal_wallis;
int mann_whitney;
int mcnemar;
+ int median;
+ int jonckheere_terpstra;
int missing;
int method;
int statistics;
static int npar_wilcoxon (struct lexer *, struct dataset *, struct npar_specs *);
static int npar_sign (struct lexer *, struct dataset *, struct npar_specs *);
static int npar_kruskal_wallis (struct lexer *, struct dataset *, struct npar_specs *);
+static int npar_jonckheere_terpstra (struct lexer *, struct dataset *, struct npar_specs *);
static int npar_mann_whitney (struct lexer *, struct dataset *, struct npar_specs *);
static int npar_mcnemar (struct lexer *, struct dataset *, struct npar_specs *);
+static int npar_median (struct lexer *, struct dataset *, struct npar_specs *);
+
static int npar_method (struct lexer *, struct npar_specs *);
/* Command parsing functions. */
parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests *npt,
struct npar_specs *nps)
{
- npt->binomial = 0;
npt->chisquare = 0;
- npt->ks_one_sample = 0;
npt->cochran = 0;
+ npt->binomial = 0;
+ npt->ks_one_sample = 0;
+ npt->wilcoxon = 0;
+ npt->sign = 0;
+ npt->runs = 0;
npt->friedman = 0;
+ npt->kendall = 0;
npt->kruskal_wallis = 0;
npt->mann_whitney = 0;
npt->mcnemar = 0;
- npt->runs = 0;
- npt->sign = 0;
- npt->wilcoxon = 0;
- npt->missing = 0;
+ npt->median = 0;
+ npt->jonckheere_terpstra = 0;
+
npt->miss = MISS_ANALYSIS;
+ npt->missing = 0;
npt->method = 0;
npt->statistics = 0;
+
memset (npt->a_statistics, 0, sizeof npt->a_statistics);
for (;;)
{
NOT_REACHED ();
}
}
+ else if (lex_match_phrase (lexer, "J-T") ||
+ lex_match_phrase (lexer, "JONCKHEERE-TERPSTRA"))
+ {
+ lex_match (lexer, T_EQUALS);
+ npt->jonckheere_terpstra++;
+ switch (npar_jonckheere_terpstra (lexer, ds, nps))
+ {
+ case 0:
+ goto lossage;
+ case 1:
+ break;
+ case 2:
+ lex_error (lexer, NULL);
+ goto lossage;
+ default:
+ NOT_REACHED ();
+ }
+ }
else if (lex_match_phrase (lexer, "K-W") ||
lex_match_phrase (lexer, "KRUSKAL-WALLIS"))
{
default:
NOT_REACHED ();
}
+ }
+ else if (lex_match_phrase (lexer, "MEDIAN"))
+ {
+ npt->median++;
+
+ switch (npar_median (lexer, ds, nps))
+ {
+ case 0:
+ goto lossage;
+ case 1:
+ break;
+ case 2:
+ lex_error (lexer, NULL);
+ goto lossage;
+ default:
+ NOT_REACHED ();
+ }
}
else if (lex_match_id (lexer, "WILCOXON"))
{
npt->missing++;
if (npt->missing > 1)
{
- msg (SE, _("The %s subcommand may be given only once."), "MISSING");
+ lex_sbc_only_once ("MISSING");
goto lossage;
}
while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
npt->method++;
if (npt->method > 1)
{
- msg (SE, _("The %s subcommand may be given only once."), "METHOD");
+ lex_sbc_only_once ("METHOD");
goto lossage;
}
switch (npar_method (lexer, nps))
const struct npar_test *test = specs->test[t];
if ( NULL == test->execute )
{
- msg (SW, _("NPAR subcommand not currently implemented."));
+ msg (SW, _("%s subcommand not currently implemented."), "NPAR");
continue;
}
test->execute (ds, casereader_clone (input), specs->filter, test, specs->exact, specs->timer);
}
else
{
- lex_error (lexer, _("Expecting MEAN, MEDIAN, MODE or number"));
+ lex_error (lexer, _("Expecting %s, %s, %s or a number."), "MEAN", "MEDIAN", "MODE");
return 0;
}
{
cstp->ranged = true;
if ( ! lex_force_num (lexer)) return 0;
- cstp->lo = lex_integer (lexer);
+ cstp->lo = lex_number (lexer);
lex_get (lexer);
lex_force_match (lexer, T_COMMA);
if (! lex_force_num (lexer) ) return 0;
- cstp->hi = lex_integer (lexer);
+ cstp->hi = lex_number (lexer);
if ( cstp->lo >= cstp->hi )
{
msg (ME,
{
if (lex_match (lexer, T_LPAREN))
{
- lex_force_num (lexer);
+ if (! lex_force_num (lexer))
+ return 2;
btp->category1 = lex_number (lexer);
lex_get (lexer);
if ( lex_match (lexer, T_COMMA))
specs->test,
sizeof (*specs->test) * specs->n_tests);
- specs->test[specs->n_tests - 1] = kst;
+ specs->test[specs->n_tests - 1] = nt;
return 1;
}
if (!parse_variables_const_pool (lexer, pool,
dict,
&vlist1, &n_vlist1,
- PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
+ PV_NUMERIC | PV_NO_SCRATCH | PV_DUPLICATE) )
return false;
if ( lex_match (lexer, T_WITH))
with = true;
if ( !parse_variables_const_pool (lexer, pool, dict,
&vlist2, &n_vlist2,
- PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
+ PV_NUMERIC | PV_NO_SCRATCH | PV_DUPLICATE) )
return false;
paired = (lex_match (lexer, T_LPAREN) &&
if (paired)
{
if ( n_vlist1 != n_vlist2)
- msg (SE, _("PAIRED was specified but the number of variables "
+ {
+ msg (SE, _("PAIRED was specified but the number of variables "
"preceding WITH (%zu) did not match the number "
"following (%zu)."), n_vlist1, n_vlist2);
+ return false;
+ }
test_parameters->n_pairs = n_vlist1 ;
}
}
+static int
+npar_median (struct lexer *lexer,
+ struct dataset *ds,
+ struct npar_specs *specs)
+{
+ struct median_test *mt = pool_alloc (specs->pool, sizeof (*mt));
+ struct n_sample_test *tp = &mt->parent;
+ struct npar_test *nt = &tp->parent;
+
+ mt->median = SYSMIS;
+
+ if ( lex_match (lexer, T_LPAREN) && lex_force_num (lexer))
+ {
+ mt->median = lex_number (lexer);
+ lex_get (lexer);
+ lex_force_match (lexer, T_RPAREN);
+ }
+
+ lex_match (lexer, T_EQUALS);
+
+ nt->insert_variables = n_sample_insert_variables;
+ nt->execute = median_execute;
+
+ if (!parse_n_sample_related_test (lexer, dataset_dict (ds),
+ tp, specs->pool) )
+ return 0;
+
+ specs->n_tests++;
+ specs->test = pool_realloc (specs->pool,
+ specs->test,
+ sizeof (*specs->test) * specs->n_tests);
+ specs->test[specs->n_tests - 1] = nt;
+
+ return 1;
+}
static int
}
+static int
+npar_jonckheere_terpstra (struct lexer *lexer, struct dataset *ds,
+ struct npar_specs *specs)
+{
+ struct n_sample_test *tp = pool_alloc (specs->pool, sizeof (*tp));
+ struct npar_test *nt = &tp->parent;
+
+ nt->insert_variables = n_sample_insert_variables;
+
+ nt->execute = jonckheere_terpstra_execute;
+
+ if (!parse_n_sample_related_test (lexer, dataset_dict (ds),
+ tp, specs->pool) )
+ return 0;
+
+ specs->n_tests++;
+ specs->test = pool_realloc (specs->pool,
+ specs->test,
+ sizeof (*specs->test) * specs->n_tests);
+ specs->test[specs->n_tests - 1] = nt;
+
+ return 1;
+}
+
static int
npar_kruskal_wallis (struct lexer *lexer, struct dataset *ds,
struct npar_specs *specs)
projects / pspp / blobdiff