Changeset: ed5b91d2caea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed5b91d2caea
Modified Files:
geom/monetdb5/grid.c
Branch: grid
Log Message:
forgot to uncomment some code
diffs (19 lines):
diff --git a/geom/monetdb5/grid.c b/geom/monetdb5/grid.c
--- a/geom/monetdb5/grid.c
+++ b/geom/monetdb5/grid.c
@@ -926,11 +926,11 @@ GRIDdistancesubjoin(bat *res1, bat * res
size_t R[] = {min, min, min,
min, min+1, min+g1->cellsX, min+g1->cellsX+1};
size_t S[] = {min+g1->cellsX, min+g1->cellsX+1, min+1,
min, min, min, min };
for (size_t k = 0; k < 7; k++) {
-// if (GRIDcount(g1,R[k]) > GRIDcount(g2,S[k])) {
+ if (GRIDcount(g1,R[k]) > GRIDcount(g2,S[k])) {
GRIDcmp(x1Vals, y1Vals, g1, x2Vals,
y2Vals, g2, R[k], S[k], r1, r2, seq1, seq2, msg);
-// } else {
-// GRIDcmp(x2Vals, y2Vals, g2, x1Vals,
y1Vals, g1, S[k], R[k], r2, r1, seq2, seq1, msg);
-// }
+ } else {
+ GRIDcmp(x2Vals, y2Vals, g2, x1Vals,
y1Vals, g1, S[k], R[k], r2, r1, seq2, seq1, msg);
+ }
}
}
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
