Changeset: 65f7605c0501 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65f7605c0501 Modified Files: gdk/gdk_imprints.c Branch: Oct2014 Log Message:
deal with nils in an easier way (they do not count for either min/max nor
count++)
diffs (32 lines):
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -453,22 +453,13 @@ do {
\
} \
GETBIN##B(bin,col[i]); \
mask = IMPSsetBit(B,mask,bin); \
- if (!cnt_bins[bin]++) { \
- min_bins[bin] = max_bins[bin] = i; \
- } else { \
- /* nil value can not be min */ \
- if ((bin == 0) && (col[i] != nil)) { \
- /* in case the first value was nil and
min_bin[0] \
- * has been initialized with it */ \
- if (col[min_bins[0]] == nil) { \
- min_bins[0] = i; \
- } else if (col[i] < col[min_bins[0]]) { \
- min_bins[0] = i; \
- } \
- } else { \
- if (col[i] < col[min_bins[bin]]) min_bins[bin]
= i; \
+ if (col[i] != nil) { /* do not count nils */
\
+ if (!cnt_bins[bin]++) {
\
+ min_bins[bin] = max_bins[bin] = i;
\
+ } else {
\
+ if (col[i] < col[min_bins[bin]]) min_bins[bin]
= i; \
+ if (col[i] > col[max_bins[bin]]) max_bins[bin]
= i; \
} \
- if (col[i] > col[max_bins[bin]]) max_bins[bin] = i; \
} \
} \
/* one last left */ \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
