Changeset: 47ccfc6efe60 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47ccfc6efe60 Modified Files: sql/test/sciql/Tests/All sql/test/sciql/Tests/smooth.sql Branch: sciql Log Message:
Enable the new test and minor changes in smooth.sql diffs (38 lines): diff --git a/sql/test/sciql/Tests/All b/sql/test/sciql/Tests/All --- a/sql/test/sciql/Tests/All +++ b/sql/test/sciql/Tests/All @@ -49,6 +49,8 @@ 05_select_01 06_slice_01 +07_tiling_01 + #texture #smooth #ngram diff --git a/sql/test/sciql/Tests/smooth.sql b/sql/test/sciql/Tests/smooth.sql --- a/sql/test/sciql/Tests/smooth.sql +++ b/sql/test/sciql/Tests/smooth.sql @@ -1,11 +1,11 @@ -create array weight ( x integer dimension[0:3], y integer dimension[0:3], w float); +create array weight ( x integer dimension[0:1:3], y integer dimension[0:1:3], w float); insert into weight values (0,0,0.2), (0,1,0.5), (0,2,0.2), (1,0,0.5), (1,1,1.0), (1,2,0.5), (2,0,0.2), (2,1,0.5), (2,2,0.2); -create array matrix2( x integer dimension[0:7], y integer dimension[0:7], f float default 1.0); +create array matrix2( x integer dimension[0:1:7], y integer dimension[0:1:7], f float default 1.0); update matrix2 set f = 0 where x>=5 or y>=5; update matrix2 set f = sin(x * f) where x <5 and y < 5; @@ -13,7 +13,5 @@ update matrix2 set f = sin(x * f) where select * from matrix2; -- smoothing using a reference array using dot product (*) -select [x],[y], avg( f * weight) -from matrix2 -group by matrix2[x:x+2][y:y+2]; +select x,y, avg( f * weight.w) from matrix2, weight group by matrix2[x:x+2][y:y+2]; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
