X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fstats%2Fwilcoxon.c;h=622db2292edc4b0a6cc8f19e44a0c5875ba9315a;hb=051724c1769c04a715f00f22f75c4a810f5bff11;hp=230e97df57f74ac51be8f7967c7f7ef74ee79d5e;hpb=5cab4cf3322f29c0ed7134d23740e07382914f20;p=pspp diff --git a/src/language/stats/wilcoxon.c b/src/language/stats/wilcoxon.c index 230e97df57..622db2292e 100644 --- a/src/language/stats/wilcoxon.c +++ b/src/language/stats/wilcoxon.c @@ -85,7 +85,7 @@ wilcoxon_execute (const struct dataset *ds, const struct dictionary *dict = dataset_dict (ds); const struct two_sample_test *t2s = UP_CAST (test, const struct two_sample_test, parent); - struct wilcoxon_state *ws = xcalloc (t2s->n_pairs, sizeof *ws); + struct wilcoxon_state *ws = XCALLOC (t2s->n_pairs, struct wilcoxon_state); const struct variable *weight = dict_get_weight (dict); struct variable *weightx = dict_create_internal_var (WEIGHT_IDX, 0); struct caseproto *proto; @@ -99,7 +99,7 @@ wilcoxon_execute (const struct dataset *ds, if (weight != NULL) proto = caseproto_add_width (proto, 0); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { struct casereader *r = casereader_clone (input); struct casewriter *writer; @@ -156,7 +156,7 @@ wilcoxon_execute (const struct dataset *ds, } caseproto_unref (proto); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { struct casereader *rr ; struct ccase *c; @@ -165,7 +165,7 @@ wilcoxon_execute (const struct dataset *ds, rr = casereader_create_append_rank (ws[i].reader, ws[i].absdiff, weight ? weightx : NULL, &err, distinct_callback, &ws[i] - ); + ); for (; (c = casereader_read (rr)) != NULL; case_unref (c)) { @@ -175,7 +175,7 @@ wilcoxon_execute (const struct dataset *ds, if (weight) w = case_data (c, weightx)->f; - if ( sign > 0 ) + if (sign > 0) { ws[i].positives.sum += rank * w; ws[i].positives.n += w; @@ -199,7 +199,7 @@ wilcoxon_execute (const struct dataset *ds, show_ranks_box (ws, t2s, dict); show_tests_box (ws, t2s, exact, timer); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { dict_destroy_internal_var (ws[i].sign); dict_destroy_internal_var (ws[i].absdiff);