Changeset: 77b696a38505 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77b696a38505 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 Branch: Jul2015 Log Message:
approved output after aggr renames (corr -> subcorr) diffs (89 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -754,6 +754,22 @@ command aggr.quantile(b:bat[:oid,:any_1] address AGGRquantile3; comment Grouped quantile aggregate +function aggr.subcorr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:hge]; +function aggr.subcovar(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:hge]; +function aggr.subcorr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:dbl]; +function aggr.subcovar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:dbl]; +function aggr.subcorr(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:flt]; +function aggr.subcovar(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:flt]; +function aggr.subcorr(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:lng]; +function aggr.subcovar(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:lng]; +function aggr.subcorr(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:wrd]; +function aggr.subcovar(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:wrd]; +function aggr.subcorr(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:int]; +function aggr.subcovar(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:int]; +function aggr.subcorr(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:sht]; +function aggr.subcovar(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:sht]; +function aggr.subcorr(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:bte]; +function aggr.subcovar(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:bte]; pattern aggr.sum(b:bat[:oid,:dbl],s:bat[:oid,:oid],nil_if_empty:bit):dbl address CMDBATsum; comment Calculate aggregate sum of B with candidate list. diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -153,36 +153,20 @@ pattern aggr.avg(b:bat[:oid,:any_2]):dbl address CMDcalcavg; comment Gives the avg of all tail values -function aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge]; -function aggr.covar(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge]; function aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge]):hge; function aggr.covar(e1:bat[:oid,:hge],e2:bat[:oid,:hge]):hge; -function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; -function aggr.covar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl; function aggr.covar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl; -function aggr.corr(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt]; -function aggr.covar(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt]; function aggr.corr(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt; function aggr.covar(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt; -function aggr.corr(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng]; -function aggr.covar(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng]; function aggr.corr(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng; function aggr.covar(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng; -function aggr.corr(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd]; -function aggr.covar(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd]; function aggr.corr(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd]):wrd; function aggr.covar(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd]):wrd; -function aggr.corr(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int]; -function aggr.covar(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int]; function aggr.corr(e1:bat[:oid,:int],e2:bat[:oid,:int]):int; function aggr.covar(e1:bat[:oid,:int],e2:bat[:oid,:int]):int; -function aggr.corr(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht]; -function aggr.covar(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht]; function aggr.corr(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht; function aggr.covar(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht; -function aggr.corr(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte]; -function aggr.covar(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte]; function aggr.corr(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte; function aggr.covar(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte; command aggr.count_no_nil(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd] @@ -929,6 +913,22 @@ command aggr.quantile(b:bat[:oid,:any_1] address AGGRquantile3; comment Grouped quantile aggregate +function aggr.subcorr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:hge]; +function aggr.subcovar(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:hge]; +function aggr.subcorr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:dbl]; +function aggr.subcovar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:dbl]; +function aggr.subcorr(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:flt]; +function aggr.subcovar(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:flt]; +function aggr.subcorr(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:lng]; +function aggr.subcovar(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:lng]; +function aggr.subcorr(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:wrd]; +function aggr.subcovar(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:wrd]; +function aggr.subcorr(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:int]; +function aggr.subcovar(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:int]; +function aggr.subcorr(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:sht]; +function aggr.subcovar(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:sht]; +function aggr.subcorr(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:bte]; +function aggr.subcovar(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2],f:bit):bat[:oid,:bte]; pattern aggr.sum(b:bat[:oid,:dbl],s:bat[:oid,:oid],nil_if_empty:bit):dbl address CMDBATsum; comment Calculate aggregate sum of B with candidate list. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
