Changeset: 69fd1a70c546 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69fd1a70c546
Modified Files:
sql/test/sciql/Tests/teleios_noa_bsm.sql
Branch: SciQL-2
Log Message:
teleios_noa_bsm.sql: removed obsolete work-around
diffs (40 lines):
diff --git a/sql/test/sciql/Tests/teleios_noa_bsm.sql
b/sql/test/sciql/Tests/teleios_noa_bsm.sql
--- a/sql/test/sciql/Tests/teleios_noa_bsm.sql
+++ b/sql/test/sciql/Tests/teleios_noa_bsm.sql
@@ -112,10 +112,6 @@ UPDATE fire SET f = x * size_y + y WHERE
---- version 1:
---- Clump adjacent pixels using 4-connected,
---- i.e., each pixel has 4 neighbors: N, E, S, W
----- For now, we use a work-around the fact the the SciQL implementation
----- does not yet support structural grouping (tiling) with non-rectangular
----- windows (tiles).
----- The SciQL implementation does not support this non-rectangular GROUP BY,
yet:
CREATE FUNCTION clump_4connected_1()
RETURNS TABLE (i INT, a INT)
BEGIN
@@ -129,25 +125,6 @@ BEGIN
) AS t
GROUP BY i;
END;
----- Hence, we work-around using two rectangular GROUP BY's:
---CREATE FUNCTION clump_4connected_1()
---RETURNS TABLE (i INT, a INT)
---BEGIN
--- RETURN
--- SELECT i, MAX(a)
--- FROM (
--- SELECT f AS i, MAX(f) AS a
--- FROM fire
--- GROUP BY fire[x][y-1:y+2]
--- HAVING f IS NOT NULL and f <> MAX(f)
--- UNION ALL
--- SELECT f AS i, MAX(f) AS a
--- FROM fire
--- GROUP BY fire[x-1:x+2][y]
--- HAVING f IS NOT NULL and f <> MAX(f)
--- ) AS t
--- GROUP BY i;
---END;
CREATE FUNCTION clump_4connected()
RETURNS TABLE (i1 INT, i2 INT)
BEGIN
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
