Changeset: fd5423e0e885 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd5423e0e885
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
Branch: sciql
Log Message:
approved new array.sum() & array.avg() signatures
as per changesets b30cb43e538a & 6de49b473d10
diffs (62 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -629,7 +629,7 @@ end main;
[ "slice", "pattern", "mat",
"(first:lng,last:lng,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:int,last:int,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:wrd,last:wrd,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
-[ "avg", "pattern", "array",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesAvg;" ]
+[ "avg", "pattern", "array",
"(val:any,any:any...):dbl ",
"ARRAYtilesAvg;" ]
[ "embed", "pattern", "array",
"(shapes:bat[:oid,:any]...):bat[:oid,:oid] ",
"ARRAYembed;" ]
[ "filler_", "function", "array", "(cnt:lng,v:any_1)
(id:bat[:oid,:lng],cellval:bat[:oid,:any_1]);",
"nil" ]
[ "filler", "pattern", "array",
"(cnt:lng,v:any_1):bat[:oid,:any_1] ",
"ARRAYfiller;" ]
@@ -641,7 +641,7 @@ end main;
[ "product", "command", "array",
"(b:bat[:any_3,:any_1],c:bat[:any_4,:any_2]):bat[:any_1,:any_2] ",
"ARRAYproduct;" ]
[ "replace", "pattern", "array",
"(v1:bat[:oid,:any_1],idx:bat[:oid,:oid],v2:bat[:oid,:any_1]):bat[:oid,:any_1]
", "ARRAYreplace;" ]
[ "replace", "pattern", "array",
"(v1:bat[:oid,:any_1],idx:bat[:oid,:oid],v2:any_1):bat[:oid,:any_1] ",
"ARRAYreplaceScalar;" ]
-[ "sum", "pattern", "array",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesSum;" ]
+[ "sum", "pattern", "array",
"(val:any_1,any:any...):any_1 ",
"ARRAYtilesSum;" ]
[ "series_", "function", "array",
"(start:dbl,step:dbl,stop:dbl,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:dbl]);", "nil"
]
[ "series", "command", "array",
"(start:dbl,step:dbl,stop:dbl,N:int,M:int):bat[:oid,:dbl] ",
"ARRAYseries_dbl;" ]
[ "series_", "function", "array",
"(start:flt,step:flt,stop:flt,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:flt]);", "nil"
]
@@ -658,8 +658,8 @@ end main;
[ "series", "command", "array",
"(start:oid,step:oid,stop:oid,N:int,M:int):bat[:oid,:oid] ",
"ARRAYseries_oid;" ]
[ "tiles", "pattern", "array",
"(cells:bat[:oid,:any_1],template:bat[:oid,:oid]):bat[:oid,:oid] ",
"ARRAYtiles;" ]
[ "unmap", "pattern", "array",
"(cells:bat[:oid,:oid],dims:bat[:oid,:any]...):bat[:oid,:any]... ",
"ARRAYumap;" ]
-[ "avg", "pattern", "batarray",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesAvg;" ]
-[ "sum", "pattern", "batarray",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesSum;" ]
+[ "avg", "pattern", "batarray",
"(val:bat[:oid,:any],any:any...):bat[:oid,:dbl] ",
"ARRAYtilesAvg;" ]
+[ "sum", "pattern", "batarray",
"(val:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesSum;" ]
[ "makeBids", "pattern", "trader",
"(bidtype:sht,fnname1:str...):lng... ",
"TRADERmakeBids;"
]
[ "makeBid", "pattern", "trader",
"(fnname:str,bidtype:sht):lng ",
"TRADERmakeBid;"
]
[ "bind_dbat", "function", "remote",
"(dbconn:str,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -623,7 +623,7 @@ end main;
[ "slice", "pattern", "mat",
"(first:lng,last:lng,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:int,last:int,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:wrd,last:wrd,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
-[ "avg", "pattern", "array",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesAvg;" ]
+[ "avg", "pattern", "array",
"(val:any,any:any...):dbl ",
"ARRAYtilesAvg;" ]
[ "embed", "pattern", "array",
"(shapes:bat[:oid,:any]...):bat[:oid,:oid] ",
"ARRAYembed;" ]
[ "filler_", "function", "array", "(cnt:lng,v:any_1)
(id:bat[:oid,:lng],cellval:bat[:oid,:any_1]);",
"nil" ]
[ "filler", "pattern", "array",
"(cnt:lng,v:any_1):bat[:oid,:any_1] ",
"ARRAYfiller;" ]
@@ -635,7 +635,7 @@ end main;
[ "product", "command", "array",
"(b:bat[:any_3,:any_1],c:bat[:any_4,:any_2]):bat[:any_1,:any_2] ",
"ARRAYproduct;" ]
[ "replace", "pattern", "array",
"(v1:bat[:oid,:any_1],idx:bat[:oid,:oid],v2:bat[:oid,:any_1]):bat[:oid,:any_1]
", "ARRAYreplace;" ]
[ "replace", "pattern", "array",
"(v1:bat[:oid,:any_1],idx:bat[:oid,:oid],v2:any_1):bat[:oid,:any_1] ",
"ARRAYreplaceScalar;" ]
-[ "sum", "pattern", "array",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesSum;" ]
+[ "sum", "pattern", "array",
"(val:any_1,any:any...):any_1 ",
"ARRAYtilesSum;" ]
[ "series_", "function", "array",
"(start:dbl,step:dbl,stop:dbl,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:dbl]);", "nil"
]
[ "series", "command", "array",
"(start:dbl,step:dbl,stop:dbl,N:int,M:int):bat[:oid,:dbl] ",
"ARRAYseries_dbl;" ]
[ "series_", "function", "array",
"(start:flt,step:flt,stop:flt,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:flt]);", "nil"
]
@@ -652,6 +652,8 @@ end main;
[ "series", "command", "array",
"(start:oid,step:oid,stop:oid,N:int,M:int):bat[:oid,:oid] ",
"ARRAYseries_oid;" ]
[ "tiles", "pattern", "array",
"(cells:bat[:oid,:any_1],template:bat[:oid,:oid]):bat[:oid,:oid] ",
"ARRAYtiles;" ]
[ "unmap", "pattern", "array",
"(cells:bat[:oid,:oid],dims:bat[:oid,:any]...):bat[:oid,:any]... ",
"ARRAYumap;" ]
+[ "avg", "pattern", "batarray",
"(val:bat[:oid,:any],any:any...):bat[:oid,:dbl] ",
"ARRAYtilesAvg;" ]
+[ "sum", "pattern", "batarray",
"(val:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesSum;" ]
[ "makeBids", "pattern", "trader",
"(bidtype:sht,fnname1:str...):lng... ",
"TRADERmakeBids;"
]
[ "makeBid", "pattern", "trader",
"(fnname:str,bidtype:sht):lng ",
"TRADERmakeBid;"
]
[ "bind_dbat", "function", "remote",
"(dbconn:str,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil" ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
