Mercurial > hg > MonetDB-gsl

changeset 12:24da5bf5b263 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated to lastest version of MonetDB which uses NaN for floating point NULL.
author Sjoerd Mullender <sjoerd@acm.org>
date Fri, 25 May 2018 15:19:01 +0200 (2018-05-25)
parents 14b8c4bacde5
children
files MonetDB-gsl.spec gsl.c
diffstat 2 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/MonetDB-gsl.spec	Fri May 25 15:18:38 2018 +0200
+++ b/MonetDB-gsl.spec	Fri May 25 15:19:01 2018 +0200
@@ -1,5 +1,5 @@
 Name:		MonetDB-gsl
-Version:	1.1
+Version:	1.2
 Release:	1%{?dist}
 Summary:	MonetDB5 SQL interface to the gsl library
 
@@ -8,9 +8,9 @@
 Source0:	http://dev.monetdb.org/downloads/sources/%{name}-%{version}.tar.bz2
 
 BuildRequires:	gsl-devel
-BuildRequires:	MonetDB-devel >= 11.25.0
-BuildRequires:	MonetDB5-server-devel >= 11.25.0
-Requires:	MonetDB5-server%{?_isa} >= 11.26.0
+BuildRequires:	MonetDB-devel >= 11.29.0
+BuildRequires:	MonetDB5-server-devel >= 11.29.0
+Requires:	MonetDB5-server%{?_isa} >= 11.29.0
 Obsoletes:	MonetDB-gsl-MonetDB5
 
 %description
@@ -43,6 +43,9 @@
 %{_libdir}/monetdb5/lib_gsl.so
 
 %changelog
+* Fri May 25 2018 Sjoerd Mullender <sjoerd@acm.org> - 1.2-1
+- Updated to lastest version of MonetDB which uses NaN for floating point NULL.
+
 * Wed Jul  5 2017 Sjoerd Mullender <sjoerd@acm.org> - 1.1-1
 - Error checking.
 
--- a/gsl.c	Fri May 25 15:18:38 2018 +0200
+++ b/gsl.c	Fri May 25 15:19:01 2018 +0200
@@ -33,9 +33,9 @@
 gsl_chisqprob(dbl *retval, dbl chi2, dbl datapoints)
 {
 	*retval = dbl_nil;
-	if (chi2 == dbl_nil || chi2 < 0)
+	if (is_dbl_nil(chi2) || chi2 < 0)
 		throw(MAL, "gsl.chi2prob", "Wrong value for chi2");
-	if (datapoints == dbl_nil || datapoints < 0)
+	if (is_dbl_nil(datapoints) || datapoints < 0)
 		throw(MAL, "gsl.chi2prob", "Wrong value for datapoints");
 	*retval = gsl_cdf_chisq_Q(chi2, datapoints);
 	return MAL_SUCCEED;
@@ -49,7 +49,7 @@
 	BUN p, q;
 	dbl r;
 
-	if (datapoints == dbl_nil)
+	if (is_dbl_nil(datapoints))
 		throw(MAL, "GSLbat_chisqprob_cst", "Parameter datapoints should not be nil");
 	if (datapoints < 0)
 		throw(MAL, "gsl.chi2prob", "Wrong value for datapoints");
@@ -65,7 +65,7 @@
 	}
 	BATloop(b, p, q) {
 		dbl d = *(dbl *) BUNtail(bi, p);
-		if (d == dbl_nil || d < 0) {
+		if (is_dbl_nil(d) || d < 0) {
 			BBPunfix(b->batCacheid);
 			BBPreclaim(bn);
 			throw(MAL, "gsl.chi2prob", "Wrong value for chi2");
@@ -91,7 +91,7 @@
 	BUN p, q;
 	dbl r;
 
-	if (chi2 == dbl_nil)
+	if (is_dbl_nil(chi2))
 		throw(MAL, "GSLbat_chisqprob_cst", "Parameter chi2 should not be nil");
 	if (chi2 < 0)
 		throw(MAL, "gsl.chi2prob", "Wrong value for chi2");
@@ -107,7 +107,7 @@
 	BATloop(b, p, q) {
 		dbl datapoints = *(dbl *) BUNtail(bi, p);
 
-		if (datapoints == dbl_nil || datapoints < 0) {
+		if (is_dbl_nil(datapoints) || datapoints < 0) {
 			BBPunfix(b->batCacheid);
 			BBPreclaim(bn);
 			throw(MAL, "gsl.chi2prob", "Wrong value for datapoints");
@@ -147,13 +147,13 @@
 	chi2p = (dbl *) Tloc(b, 0);
 	datapointsp = (dbl *) Tloc(c, 0);
 	for (i = 0; i < cnt; i++) {
-		if (chi2p[i] == dbl_nil || chi2p[i] < 0) {
+		if (is_dbl_nil(chi2p[i]) || chi2p[i] < 0) {
 			BBPunfix(b->batCacheid);
 			BBPunfix(c->batCacheid);
 			BBPreclaim(bn);
 			throw(MAL, "gsl.chi2prob", "Wrong value for chi2");
 		}
-		if (datapointsp[i] == dbl_nil || datapointsp[i] < 0) {
+		if (is_dbl_nil(datapointsp[i]) || datapointsp[i] < 0) {
 			BBPunfix(b->batCacheid);
 			BBPunfix(c->batCacheid);
 			BBPreclaim(bn);