projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* command-line.c (pre_syntax_message): Use term "syntax" instead
[pspp-builds.git]
/
src
/
math
/
percentiles.c
diff --git
a/src/math/percentiles.c
b/src/math/percentiles.c
index 372bd4ca08bfd2dedc38c116e3f3cdf11c5da41d..b72a98a1261778ae24fa372e09bdbddb87db8adc 100644
(file)
--- a/
src/math/percentiles.c
+++ b/
src/math/percentiles.c
@@
-19,18
+19,18
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
-#include "compiler.h"
+#include <assert.h>
+#include <libpspp/compiler.h>
#include "factor-stats.h"
#include "percentiles.h"
#include "factor-stats.h"
#include "percentiles.h"
-#include "misc.h"
+#include <libpspp/misc.h>
+
+#include "minmax.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-#include <assert.h>
-
-
struct ptile_params
{
double g1, g1_star;
struct ptile_params
{
double g1, g1_star;
@@
-39,7
+39,7
@@
struct ptile_params
};
};
-const char *ptile_alg_desc[] = {
+const char *
const
ptile_alg_desc[] = {
"",
N_("HAverage"),
N_("Weighted Average"),
"",
N_("HAverage"),
N_("Weighted Average"),
@@
-337,7
+337,7
@@
tukey_hinges(const struct weighted_value **wv,
for ( i = 0 ; i < n_data ; ++i )
{
for ( i = 0 ; i < n_data ; ++i )
{
- c_star =
min
(c_star, wv[i]->w);
+ c_star =
MIN
(c_star, wv[i]->w);
}
if ( c_star > 1 ) c_star = 1;
}
if ( c_star > 1 ) c_star = 1;