Changeset: 183a81443366 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=183a81443366
Modified Files:
Branch: sciql
Log Message:
merge
diffs (25 lines):
diff --git a/monetdb5/modules/mal/Tests/array04.stable.out
b/monetdb5/modules/mal/Tests/array04.stable.out
--- a/monetdb5/modules/mal/Tests/array04.stable.out
+++ b/monetdb5/modules/mal/Tests/array04.stable.out
@@ -43,8 +43,8 @@ function user.main():void;
t0 := array.series(-1,1,2,3,1);
t1 := array.series(-2,1,1,1,3);
io.print(t0,t1);
- gs := array.sum(mv,mx,my,t0,t1,4,4);
- ga := array.avg(mv,mx,my,t0,t1,4,4);
+ gs := array.sum(mv,mx,t0,4,my,t1,4);
+ ga := array.avg(mv,mx,t0,4,my,t1,4);
io.print(mx,my,mv,gs,ga);
#create array M(x int dimension[0:1:4], y int dimension[0:1:4], v int default
x*4+y);
mv := bat.new(:oid,:int);
@@ -64,8 +64,8 @@ function user.main():void;
mv := bat.append(mv,13);
mv := bat.append(mv,14);
mv := bat.append(mv,15);
- gs := array.sum(mv,mx,my,t0,t1,4,4);
- ga := array.avg(mv,mx,my,t0,t1,4,4);
+ gs := array.sum(mv,mx,t0,4,my,t1,4);
+ ga := array.avg(mv,mx,t0,4,my,t1,4);
io.print(mx,my,mv,gs,ga);
#template:= array.map(mx,my,t0,t1);
#io.print(template);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
