Changeset: 2be14e6f7321 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2be14e6f7321
Modified Files:
monetdb5/modules/kernel/microbenchmark.c
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (25 lines):
diff --git a/monetdb5/modules/kernel/microbenchmark.c
b/monetdb5/modules/kernel/microbenchmark.c
--- a/monetdb5/modules/kernel/microbenchmark.c
+++ b/monetdb5/modules/kernel/microbenchmark.c
@@ -260,10 +260,12 @@ BATnormal(BAT **bn, oid *base, wrd *size
assert(sizeof(unsigned int) == sizeof(flt));
+#if SIZEOF_BUN > 4
if (n >= ((ulng) 1 << 32)) {
GDKerror("BATnormal: size must be less than 2^32 = "LLFMT,
(lng) 1 << 32);
return GDK_FAIL;
}
+#endif
if (*size > (wrd)BUN_MAX) {
GDKerror("BATnormal: size must not exceed BUN_MAX");
return GDK_FAIL;
@@ -307,7 +309,7 @@ BATnormal(BAT **bn, oid *base, wrd *size
const dbl j_m = (dbl) j - m;
const dbl tmp = j_m * j_m / s_s_2;
- rel[j] = pow(M_E, -tmp) / s_sqrt_2_pi;
+ rel[j] = (flt) (pow(M_E, -tmp) / s_sqrt_2_pi);
tot += rel[j];
}
/* just in case we get tot != 1 due to. e.g.,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
