X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flanguage%2Fstats%2Fnpar.c;h=e277d36acccd887eee8687b925943634e0484a9e;hb=f1cb9492fb8af446458607158c9cd01ad85a6768;hp=3260117d4f5e2fc71ebf20001dd7dea2f13f3c05;hpb=da1bf03a84fa10f04e8c5438f22b523f0480dd7d;p=pspp

diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c
index 3260117d4f..e277d36acc 100644
--- a/src/language/stats/npar.c
+++ b/src/language/stats/npar.c
@@ -37,6 +37,7 @@
 #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"
@@ -95,6 +96,7 @@ struct cmd_npar_tests
     int mann_whitney;
     int mcnemar;
     int median;
+    int jonckheere_terpstra;
     int missing;
     int method;
     int statistics;
@@ -138,6 +140,7 @@ static int npar_cochran (struct lexer *, struct dataset *, struct npar_specs *);
 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 *);
@@ -152,21 +155,26 @@ static int
 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 (;;)
     {
@@ -288,6 +296,24 @@ parse_npar_tests (struct lexer *lexer, struct dataset *ds, struct cmd_npar_tests
               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"))
         {
@@ -1317,6 +1343,30 @@ npar_mcnemar (struct lexer *lexer, struct dataset *ds,
 }
 
 
+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)