Changeset: 44bc95265835 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44bc95265835 Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_none.stable.out monetdb5/modules/kernel/algebra.mal Branch: Oct2014 Log Message:
Use BATcalcavg instead of ALGavg for the implementation of aggr.avg. The problem with ALGavg is that it returns nil if there are nils in the column to be averaged. This is not something we want. ALGavg is now not used anymore and can be deleted in the next release. diffs (250 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -138,32 +138,32 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:dbl]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:dbl]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:flt]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:flt]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:lng]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:lng]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:wrd]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:wrd]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:int]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:int]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:sht]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:sht]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:bte]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:bte]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out --- a/clients/Tests/MAL-signatures_fits_geom.stable.out +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out @@ -138,32 +138,32 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:dbl]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:dbl]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:flt]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:flt]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:lng]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:lng]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:wrd]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:wrd]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:int]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:int]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:sht]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:sht]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:bte]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:bte]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; diff --git a/clients/Tests/MAL-signatures_geom.stable.out b/clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_geom.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -138,32 +138,32 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:dbl]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:dbl]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:flt]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:flt]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:lng]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:lng]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:wrd]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:wrd]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:int]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:int]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:sht]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:sht]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:bte]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:bte]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; diff --git a/clients/Tests/MAL-signatures_none.stable.out b/clients/Tests/MAL-signatures_none.stable.out --- a/clients/Tests/MAL-signatures_none.stable.out +++ b/clients/Tests/MAL-signatures_none.stable.out @@ -137,32 +137,32 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:dbl]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:dbl]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:flt]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:flt]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:lng]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:lng]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:wrd]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:wrd]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:int]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:int]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:sht]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:sht]):dbl +address CMDcalcavg; comment Gives the avg of all tail values -command aggr.avg(b:bat[:oid,:bte]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:bte]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; diff --git a/monetdb5/modules/kernel/algebra.mal b/monetdb5/modules/kernel/algebra.mal --- a/monetdb5/modules/kernel/algebra.mal +++ b/monetdb5/modules/kernel/algebra.mal @@ -653,32 +653,32 @@ command max(b:bat[:any_1,:any_2]):any_2 address ALGmaxany comment "Return the highest tail value or nil."; -command avg (b:bat[:oid,:bte] ) :dbl -address ALGavg +pattern avg (b:bat[:oid,:bte] ) :dbl +address CMDcalcavg comment "Gives the avg of all tail values"; -command avg (b:bat[:oid,:sht] ) :dbl -address ALGavg +pattern avg (b:bat[:oid,:sht] ) :dbl +address CMDcalcavg comment "Gives the avg of all tail values"; -command avg (b:bat[:oid,:int] ) :dbl -address ALGavg +pattern avg (b:bat[:oid,:int] ) :dbl +address CMDcalcavg comment "Gives the avg of all tail values"; -command avg (b:bat[:oid,:wrd] ) :dbl -address ALGavg +pattern avg (b:bat[:oid,:wrd] ) :dbl +address CMDcalcavg comment "Gives the avg of all tail values"; -command avg (b:bat[:oid,:lng] ) :dbl -address ALGavg +pattern avg (b:bat[:oid,:lng] ) :dbl +address CMDcalcavg comment "Gives the avg of all tail values"; -command avg (b:bat[:oid,:flt] ) :dbl -address ALGavg +pattern avg (b:bat[:oid,:flt] ) :dbl +address CMDcalcavg comment "Gives the avg of all tail values"; -command avg (b:bat[:oid,:dbl] ) :dbl -address ALGavg +pattern avg (b:bat[:oid,:dbl] ) :dbl +address CMDcalcavg comment "Gives the avg of all tail values"; # Standard deviation _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
