X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fkruskal-wallis.c;h=6d54bae78208d74b98db28007cf831d3cbc37c94;hb=3c916f0eb51c047746deb363db03471370a5007b;hp=62c49e48482cd05b5b0d09d7e0f5f231b4a6a4c8;hpb=b525a9596e60d5ae4c6c464b4a426b77ade3dd72;p=pspp diff --git a/src/language/stats/kruskal-wallis.c b/src/language/stats/kruskal-wallis.c index 62c49e4848..6d54bae782 100644 --- a/src/language/stats/kruskal-wallis.c +++ b/src/language/stats/kruskal-wallis.c @@ -1,5 +1,5 @@ /* Pspp - a program for statistical analysis. - Copyright (C) 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2010, 2011, 2022 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 @@ -44,16 +44,32 @@ #define N_(msgid) msgid #define _(msgid) gettext (msgid) -/* Returns true iff the independent variable lies in the range [nst->val1, nst->val2] */ +/* Returns true iff the independent variable lies between nst->val1 and nst->val2 */ static bool include_func (const struct ccase *c, void *aux) { const struct n_sample_test *nst = aux; - if (0 < value_compare_3way (&nst->val1, case_data (c, nst->indep_var), var_get_width (nst->indep_var))) + const union value *smaller = 0; + const union value *larger = 0; + int x = value_compare_3way (&nst->val1, &nst->val2, var_get_width (nst->indep_var)); + if (x < 0) + { + smaller = &nst->val1; + larger = &nst->val2; + } + else + { + smaller = &nst->val2; + larger = &nst->val1; + } + + if (0 < value_compare_3way (smaller, case_data (c, nst->indep_var), + var_get_width (nst->indep_var))) return false; - if (0 > value_compare_3way (&nst->val2, case_data (c, nst->indep_var), var_get_width (nst->indep_var))) + if (0 > value_compare_3way (larger, case_data (c, nst->indep_var), + var_get_width (nst->indep_var))) return false; return true;