X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fhelpers.h;h=2465d63e80a70fadb91bc1d2d488079cc4ba7304;hb=3b54533821614d17afc61f1cd3b87d3a06fbf4da;hp=54e56bbdb1873e1e0d305cc85fca9fb32092e5a5;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp
diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h
index 54e56bbdb1..2465d63e80 100644
--- a/src/language/expressions/helpers.h
+++ b/src/language/expressions/helpers.h
@@ -1,4 +1,22 @@
-#ifndef EXPRESSIONS_HELPERS_H
+/*
+PSPP - a program for statistical analysis.
+Copyright (C) 2017 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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+
+#ifndef EXPRESSIONS_HELPERS_H
#define EXPRESSIONS_HELPERS_H
#include
@@ -9,26 +27,30 @@
#include
#include
#include
-#include "case.h"
-#include "compiler.h"
-#include "data-in.h"
-#include "dictionary.h"
-#include "message.h"
-#include "calendar.h"
-#include "gsl-extras/gsl-extras.h"
-#include "misc.h"
-#include "moments.h"
-#include "random.h"
-#include "settings.h"
-#include "str.h"
-#include "value.h"
-#include "variable.h"
-#include "procedure.h"
+
+#include "data/calendar.h"
+#include "data/case.h"
+#include "data/data-in.h"
+#include "data/data-out.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/settings.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "data/vector.h"
+#include "language/expressions/public.h"
+#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "math/moments.h"
+#include "math/random.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-static inline double check_errno (double x)
+static inline double check_errno (double x)
{
return errno == 0 ? x : SYSMIS;
}
@@ -41,25 +63,30 @@ static inline double check_errno (double x)
#define H_MIN 60. /* Minutes per hour. */
#define MIN_S 60. /* Seconds per minute. */
#define WEEK_DAY 7. /* Days per week. */
+#define WEEK_S (WEEK_DAY * DAY_S) /* Seconds per week. */
-extern const struct fixed_string empty_string;
+extern const struct substring empty_string;
-int compare_string (const struct fixed_string *, const struct fixed_string *);
+int compare_string_3way (const struct substring *, const struct substring *);
double expr_ymd_to_date (double year, double month, double day);
double expr_ymd_to_ofs (double year, double month, double day);
double expr_wkyr_to_date (double wk, double yr);
double expr_yrday_to_date (double yr, double day);
double expr_yrmoda (double year, double month, double day);
+double expr_date_difference (double date1, double date2,
+ struct substring unit);
+double expr_date_sum (double date, double quantity, struct substring unit_name,
+ struct substring method_name);
-struct fixed_string alloc_string (struct expression *, size_t length);
-struct fixed_string copy_string (struct expression *,
- const char *, size_t length);
+struct substring alloc_string (struct expression *, size_t length);
+struct substring copy_string (struct expression *,
+ const char *, size_t length);
static inline bool
-is_valid (double d)
+is_valid (double d)
{
- return finite (d) && d != SYSMIS;
+ return isfinite (d) && d != SYSMIS;
}
size_t count_valid (double *, size_t);
@@ -72,4 +99,15 @@ double cdf_bvnor (double x0, double x1, double r);
double idf_fdist (double P, double a, double b);
+double round_nearest (double x, double mult, double fuzzbits);
+double round_zero (double x, double mult, double fuzzbits);
+
+struct substring replace_string (struct expression *,
+ struct substring haystack,
+ struct substring needle,
+ struct substring replacement,
+ double n);
+
+double median (double *, size_t n);
+
#endif /* expressions/helpers.h */