Changeset: b891ad66d8a6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b891ad66d8a6 Modified Files: sql/test/sciql/Tests/07_tiling_03.stable.out Branch: sciql Log Message:
07_tiling_03: approved correct stable output after changeset 37e870c97eb8 diffs (truncated from 345 to 300 lines): diff --git a/sql/test/sciql/Tests/07_tiling_03.stable.out b/sql/test/sciql/Tests/07_tiling_03.stable.out --- a/sql/test/sciql/Tests/07_tiling_03.stable.out +++ b/sql/test/sciql/Tests/07_tiling_03.stable.out @@ -55,13 +55,13 @@ Ready. % 1, 1, 24, 1, 2 # length [ 0, 0, 13.75, 1, 25 ] [ 0, 1, 13.75, 1, 25 ] -[ 0, 2, 14.5, 1, 25 ] +[ 0, 2, 14.5, 4, 25 ] [ 1, 0, 13.75, 1, 25 ] [ 1, 1, 13.75, 1, 25 ] -[ 1, 2, 14.5, 1, 25 ] -[ 2, 0, 14.5, 1, 25 ] -[ 2, 1, 14.5, 1, 25 ] -[ 2, 2, 4, 1, 25 ] +[ 1, 2, 14.5, 4, 25 ] +[ 2, 0, 14.5, 4, 25 ] +[ 2, 1, 14.5, 4, 25 ] +[ 2, 2, 4, 4, 4 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, L3 # name @@ -69,13 +69,13 @@ Ready. % 1, 1, 1, 24, 1, 2 # length [ 0, 0, 2, 13.75, 1, 25 ] [ 0, 1, 5, 13.75, 1, 25 ] -[ 0, 2, 2, 14.5, 1, 25 ] +[ 0, 2, 2, 14.5, 4, 25 ] [ 1, 0, 5, 13.75, 1, 25 ] [ 1, 1, 1, 13.75, 1, 25 ] -[ 1, 2, 5, 14.5, 1, 25 ] -[ 2, 0, 2, 14.5, 1, 25 ] -[ 2, 1, 5, 14.5, 1, 25 ] -[ 2, 2, 2, 4, 1, 25 ] +[ 1, 2, 5, 14.5, 4, 25 ] +[ 2, 0, 2, 14.5, 4, 25 ] +[ 2, 1, 5, 14.5, 4, 25 ] +[ 2, 2, 2, 4, 4, 4 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) as f_avg from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, f_avg # name @@ -83,13 +83,13 @@ Ready. % 1, 1, 1, 24, 1, 2 # length [ 0, 0, 2, 13.75, 1, 25 ] [ 0, 1, 5, 13.75, 1, 25 ] -[ 0, 2, 2, 14.5, 1, 25 ] +[ 0, 2, 2, 14.5, 4, 25 ] [ 1, 0, 5, 13.75, 1, 25 ] [ 1, 1, 1, 13.75, 1, 25 ] -[ 1, 2, 5, 14.5, 1, 25 ] -[ 2, 0, 2, 14.5, 1, 25 ] -[ 2, 1, 5, 14.5, 1, 25 ] -[ 2, 2, 2, 4, 1, 25 ] +[ 1, 2, 5, 14.5, 4, 25 ] +[ 2, 0, 2, 14.5, 4, 25 ] +[ 2, 1, 5, 14.5, 4, 25 ] +[ 2, 2, 2, 4, 4, 4 ] #drop array a; #create array a ( x integer dimension[0:1:3], y integer dimension[0:1:3], f float); @@ -102,13 +102,13 @@ Ready. % 1, 1, 24, 1, 2 # length [ 0, 0, 13.75, 1, 25 ] [ 0, 1, 13.75, 1, 25 ] -[ 0, 2, 14.5, 1, 25 ] +[ 0, 2, 14.5, 4, 25 ] [ 1, 0, 13.75, 1, 25 ] [ 1, 1, 13.75, 1, 25 ] -[ 1, 2, 14.5, 1, 25 ] -[ 2, 0, 14.5, 1, 25 ] -[ 2, 1, 14.5, 1, 25 ] -[ 2, 2, 4, 1, 25 ] +[ 1, 2, 14.5, 4, 25 ] +[ 2, 0, 14.5, 4, 25 ] +[ 2, 1, 14.5, 4, 25 ] +[ 2, 2, 4, 4, 4 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, L3 # name @@ -116,13 +116,13 @@ Ready. % 1, 1, 1, 24, 1, 2 # length [ 0, 0, 2, 13.75, 1, 25 ] [ 0, 1, 5, 13.75, 1, 25 ] -[ 0, 2, 2, 14.5, 1, 25 ] +[ 0, 2, 2, 14.5, 4, 25 ] [ 1, 0, 5, 13.75, 1, 25 ] [ 1, 1, 1, 13.75, 1, 25 ] -[ 1, 2, 5, 14.5, 1, 25 ] -[ 2, 0, 2, 14.5, 1, 25 ] -[ 2, 1, 5, 14.5, 1, 25 ] -[ 2, 2, 2, 4, 1, 25 ] +[ 1, 2, 5, 14.5, 4, 25 ] +[ 2, 0, 2, 14.5, 4, 25 ] +[ 2, 1, 5, 14.5, 4, 25 ] +[ 2, 2, 2, 4, 4, 4 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) as f_avg from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, f_avg # name @@ -130,13 +130,13 @@ Ready. % 1, 1, 1, 24, 1, 2 # length [ 0, 0, 2, 13.75, 1, 25 ] [ 0, 1, 5, 13.75, 1, 25 ] -[ 0, 2, 2, 14.5, 1, 25 ] +[ 0, 2, 2, 14.5, 4, 25 ] [ 1, 0, 5, 13.75, 1, 25 ] [ 1, 1, 1, 13.75, 1, 25 ] -[ 1, 2, 5, 14.5, 1, 25 ] -[ 2, 0, 2, 14.5, 1, 25 ] -[ 2, 1, 5, 14.5, 1, 25 ] -[ 2, 2, 2, 4, 1, 25 ] +[ 1, 2, 5, 14.5, 4, 25 ] +[ 2, 0, 2, 14.5, 4, 25 ] +[ 2, 1, 5, 14.5, 4, 25 ] +[ 2, 2, 2, 4, 4, 4 ] #drop array a; #create array a ( x integer dimension[0:1:3], y integer dimension[0:1:3], f float); @@ -149,13 +149,13 @@ Ready. % 1, 1, 24, 1, 2 # length [ 0, 0, 13.75, 1, 25 ] [ 0, 1, 13.75, 1, 25 ] -[ 0, 2, 14.5, 1, 25 ] +[ 0, 2, 14.5, 4, 25 ] [ 1, 0, 13.75, 1, 25 ] [ 1, 1, 13.75, 1, 25 ] -[ 1, 2, 14.5, 1, 25 ] -[ 2, 0, 14.5, 1, 25 ] -[ 2, 1, 14.5, 1, 25 ] -[ 2, 2, 4, 1, 25 ] +[ 1, 2, 14.5, 4, 25 ] +[ 2, 0, 14.5, 4, 25 ] +[ 2, 1, 14.5, 4, 25 ] +[ 2, 2, 4, 4, 4 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, L3 # name @@ -163,13 +163,13 @@ Ready. % 1, 1, 1, 24, 1, 2 # length [ 0, 0, 2, 13.75, 1, 25 ] [ 0, 1, 5, 13.75, 1, 25 ] -[ 0, 2, 2, 14.5, 1, 25 ] +[ 0, 2, 2, 14.5, 4, 25 ] [ 1, 0, 5, 13.75, 1, 25 ] [ 1, 1, 1, 13.75, 1, 25 ] -[ 1, 2, 5, 14.5, 1, 25 ] -[ 2, 0, 2, 14.5, 1, 25 ] -[ 2, 1, 5, 14.5, 1, 25 ] -[ 2, 2, 2, 4, 1, 25 ] +[ 1, 2, 5, 14.5, 4, 25 ] +[ 2, 0, 2, 14.5, 4, 25 ] +[ 2, 1, 5, 14.5, 4, 25 ] +[ 2, 2, 2, 4, 4, 4 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) as f_avg from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, f_avg # name @@ -177,13 +177,13 @@ Ready. % 1, 1, 1, 24, 1, 2 # length [ 0, 0, 2, 13.75, 1, 25 ] [ 0, 1, 5, 13.75, 1, 25 ] -[ 0, 2, 2, 14.5, 1, 25 ] +[ 0, 2, 2, 14.5, 4, 25 ] [ 1, 0, 5, 13.75, 1, 25 ] [ 1, 1, 1, 13.75, 1, 25 ] -[ 1, 2, 5, 14.5, 1, 25 ] -[ 2, 0, 2, 14.5, 1, 25 ] -[ 2, 1, 5, 14.5, 1, 25 ] -[ 2, 2, 2, 4, 1, 25 ] +[ 1, 2, 5, 14.5, 4, 25 ] +[ 2, 0, 2, 14.5, 4, 25 ] +[ 2, 1, 5, 14.5, 4, 25 ] +[ 2, 2, 2, 4, 4, 4 ] #drop array a; #create array a ( x integer dimension[0:1:3], y integer dimension[0:1:3], f float); @@ -196,13 +196,13 @@ Ready. % 1, 1, 24, 1, 2 # length [ 0, 0, 13.75, 1, 25 ] [ 0, 1, 13.75, 1, 25 ] -[ 0, 2, 14.5, 1, 25 ] +[ 0, 2, 14.5, 4, 25 ] [ 1, 0, 13.75, 1, 25 ] [ 1, 1, 13.75, 1, 25 ] -[ 1, 2, 14.5, 1, 25 ] -[ 2, 0, 14.5, 1, 25 ] -[ 2, 1, 14.5, 1, 25 ] -[ 2, 2, 4, 1, 25 ] +[ 1, 2, 14.5, 4, 25 ] +[ 2, 0, 14.5, 4, 25 ] +[ 2, 1, 14.5, 4, 25 ] +[ 2, 2, 4, 4, 4 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, L3 # name @@ -210,13 +210,13 @@ Ready. % 1, 1, 1, 24, 1, 2 # length [ 0, 0, 2, 13.75, 1, 25 ] [ 0, 1, 5, 13.75, 1, 25 ] -[ 0, 2, 2, 14.5, 1, 25 ] +[ 0, 2, 2, 14.5, 4, 25 ] [ 1, 0, 5, 13.75, 1, 25 ] [ 1, 1, 1, 13.75, 1, 25 ] -[ 1, 2, 5, 14.5, 1, 25 ] -[ 2, 0, 2, 14.5, 1, 25 ] -[ 2, 1, 5, 14.5, 1, 25 ] -[ 2, 2, 2, 4, 1, 25 ] +[ 1, 2, 5, 14.5, 4, 25 ] +[ 2, 0, 2, 14.5, 4, 25 ] +[ 2, 1, 5, 14.5, 4, 25 ] +[ 2, 2, 2, 4, 4, 4 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) as f_avg from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, f_avg # name @@ -224,13 +224,13 @@ Ready. % 1, 1, 1, 24, 1, 2 # length [ 0, 0, 2, 13.75, 1, 25 ] [ 0, 1, 5, 13.75, 1, 25 ] -[ 0, 2, 2, 14.5, 1, 25 ] +[ 0, 2, 2, 14.5, 4, 25 ] [ 1, 0, 5, 13.75, 1, 25 ] [ 1, 1, 1, 13.75, 1, 25 ] -[ 1, 2, 5, 14.5, 1, 25 ] -[ 2, 0, 2, 14.5, 1, 25 ] -[ 2, 1, 5, 14.5, 1, 25 ] -[ 2, 2, 2, 4, 1, 25 ] +[ 1, 2, 5, 14.5, 4, 25 ] +[ 2, 0, 2, 14.5, 4, 25 ] +[ 2, 1, 5, 14.5, 4, 25 ] +[ 2, 2, 2, 4, 4, 4 ] #drop array a; #create array a ( x integer dimension[0:1:3], y integer dimension[0:1:3], f float); @@ -243,13 +243,13 @@ Ready. % 1, 1, 24, 15, 15 # length [ 0, 0, 0.3850000007, 0.0400000028, 1 ] [ 0, 1, 0.3850000007, 0.0400000028, 1 ] -[ 0, 2, 0.1450000014, 0.0400000028, 1 ] +[ 0, 2, 0.1450000014, 0.0400000028, 0.25 ] [ 1, 0, 0.3850000007, 0.0400000028, 1 ] [ 1, 1, 0.3850000007, 0.0400000028, 1 ] -[ 1, 2, 0.1450000014, 0.0400000028, 1 ] -[ 2, 0, 0.1450000014, 0.0400000028, 1 ] -[ 2, 1, 0.1450000014, 0.0400000028, 1 ] -[ 2, 2, 0.04000000283, 0.0400000028, 1 ] +[ 1, 2, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 0, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 1, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 2, 0.04000000283, 0.0400000028, 0.0400000028 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, L3 # name @@ -257,13 +257,13 @@ Ready. % 1, 1, 15, 24, 15, 15 # length [ 0, 0, 0.200000003, 0.3850000007, 0.0400000028, 1 ] [ 0, 1, 0.5, 0.3850000007, 0.0400000028, 1 ] -[ 0, 2, 0.200000003, 0.1450000014, 0.0400000028, 1 ] +[ 0, 2, 0.200000003, 0.1450000014, 0.0400000028, 0.25 ] [ 1, 0, 0.5, 0.3850000007, 0.0400000028, 1 ] [ 1, 1, 1, 0.3850000007, 0.0400000028, 1 ] -[ 1, 2, 0.5, 0.1450000014, 0.0400000028, 1 ] -[ 2, 0, 0.200000003, 0.1450000014, 0.0400000028, 1 ] -[ 2, 1, 0.5, 0.1450000014, 0.0400000028, 1 ] -[ 2, 2, 0.200000003, 0.04000000283, 0.0400000028, 1 ] +[ 1, 2, 0.5, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 0, 0.200000003, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 1, 0.5, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 2, 0.200000003, 0.04000000283, 0.0400000028, 0.0400000028 ] #select x,y, f, avg(f * f), min(f * f), max(f * f) as f_avg from a group by a[x:x+2][y:y+2]; % sys.a, sys.a, sys.a, sys., sys., sys. # table_name % x, y, f, L1, L2, f_avg # name @@ -271,13 +271,13 @@ Ready. % 1, 1, 15, 24, 15, 15 # length [ 0, 0, 0.200000003, 0.3850000007, 0.0400000028, 1 ] [ 0, 1, 0.5, 0.3850000007, 0.0400000028, 1 ] -[ 0, 2, 0.200000003, 0.1450000014, 0.0400000028, 1 ] +[ 0, 2, 0.200000003, 0.1450000014, 0.0400000028, 0.25 ] [ 1, 0, 0.5, 0.3850000007, 0.0400000028, 1 ] [ 1, 1, 1, 0.3850000007, 0.0400000028, 1 ] -[ 1, 2, 0.5, 0.1450000014, 0.0400000028, 1 ] -[ 2, 0, 0.200000003, 0.1450000014, 0.0400000028, 1 ] -[ 2, 1, 0.5, 0.1450000014, 0.0400000028, 1 ] -[ 2, 2, 0.200000003, 0.04000000283, 0.0400000028, 1 ] +[ 1, 2, 0.5, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 0, 0.200000003, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 1, 0.5, 0.1450000014, 0.0400000028, 0.25 ] +[ 2, 2, 0.200000003, 0.04000000283, 0.0400000028, 0.0400000028 ] #drop array a; #create array a ( x integer dimension[0:1:3], y integer dimension[0:1:3], f float); @@ -290,13 +290,13 @@ Ready. % 1, 1, 24, 24, 24 # length [ 0, 0, 0.385, 0.04, 1 ] [ 0, 1, 0.385, 0.04, 1 ] -[ 0, 2, 0.145, 0.04, 1 ] +[ 0, 2, 0.145, 0.04, 0.25 ] [ 1, 0, 0.385, 0.04, 1 ] [ 1, 1, 0.385, 0.04, 1 ] -[ 1, 2, 0.145, 0.04, 1 ] -[ 2, 0, 0.145, 0.04, 1 ] -[ 2, 1, 0.145, 0.04, 1 ] -[ 2, 2, 0.04, 0.04, 1 ] _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
