Changeset: 6b0174c86cdb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b0174c86cdb
Modified Files:
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/batcalc.c
Branch: oscar
Log Message:
Fix some comments.
diffs (170 lines):
diff --git a/monetdb5/modules/mal/01_batcalc.mal
b/monetdb5/modules/mal/01_batcalc.mal
--- a/monetdb5/modules/mal/01_batcalc.mal
+++ b/monetdb5/modules/mal/01_batcalc.mal
@@ -28655,57 +28655,57 @@ address CMDbatBETWEEN
comment "B between V1 and V2 (or vice versa)";
pattern
between(b:bat[:any_1],v1:bat[:any_1],v2:bat[:any_1],s:bat[:oid],s1:bat[:oid],s2:bat[:oid],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
-comment "B between V1 and V2 (or vice versa) with candidate list";
+comment "B between V1 and V2 (or vice versa) with candidates list";
pattern
between(b:bat[:any_1],v1:bat[:any_1],v2:any_1,sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
comment "B between V1 and V2 (or vice versa)";
pattern
between(b:bat[:any_1],v1:bat[:any_1],v2:any_1,s:bat[:oid],s1:bat[:oid],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
-comment "B between V1 and V2 (or vice versa) with candidate list";
+comment "B between V1 and V2 (or vice versa) with candidates list";
pattern
between(b:bat[:any_1],v1:any_1,v2:bat[:any_1],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
comment "B between V1 and V2 (or vice versa)";
pattern
between(b:bat[:any_1],v1:any_1,v2:bat[:any_1],s:bat[:oid],s2:bat[:oid],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
-comment "B between V1 and V2 (or vice versa) with candidate list";
+comment "B between V1 and V2 (or vice versa) with candidates list";
pattern
between(b:bat[:any_1],v1:any_1,v2:any_1,sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
comment "B between V1 and V2 (or vice versa)";
pattern
between(b:bat[:any_1],v1:any_1,v2:any_1,s:bat[:oid],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
-comment "B between V1 and V2 (or vice versa) with candidate list";
+comment "B between V1 and V2 (or vice versa) with candidates list";
pattern
between(b:bat[:any_1],v1:bat[:any_1],v2:bat[:any_1],r:bat[:bit],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
comment "B between V1 and V2 (or vice versa) with conditional execution bat";
pattern
between(b:bat[:any_1],v1:bat[:any_1],v2:bat[:any_1],s:bat[:oid],s1:bat[:oid],s2:bat[:oid],r:bat[:bit],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
-comment "B between V1 and V2 (or vice versa) with candidate list and
conditional execution bat";
+comment "B between V1 and V2 (or vice versa) with candidates list and
conditional execution bat";
pattern
between(b:bat[:any_1],v1:bat[:any_1],v2:any_1,r:bat[:bit],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
comment "B between V1 and V2 (or vice versa) with conditional execution bat";
pattern
between(b:bat[:any_1],v1:bat[:any_1],v2:any_1,s:bat[:oid],s1:bat[:oid],r:bat[:bit],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
-comment "B between V1 and V2 (or vice versa) with candidate list and
conditional execution bat";
+comment "B between V1 and V2 (or vice versa) with candidates list and
conditional execution bat";
pattern
between(b:bat[:any_1],v1:any_1,v2:bat[:any_1],r:bat[:bit],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
comment "B between V1 and V2 (or vice versa) with conditional execution bat";
pattern
between(b:bat[:any_1],v1:any_1,v2:bat[:any_1],s:bat[:oid],s2:bat[:oid],r:bat[:bit],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
-comment "B between V1 and V2 (or vice versa) with candidate list and
conditional execution bat";
+comment "B between V1 and V2 (or vice versa) with candidates list and
conditional execution bat";
pattern
between(b:bat[:any_1],v1:any_1,v2:any_1,r:bat[:bit],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
comment "B between V1 and V2 (or vice versa) with conditional execution bat";
pattern
between(b:bat[:any_1],v1:any_1,v2:any_1,s:bat[:oid],r:bat[:bit],sym:bit,linc:bit,hinc:bit,nils_false:bit,anti:bit)
:bat[:bit]
address CMDbatBETWEEN
-comment "B between V1 and V2 (or vice versa) with candidate list and
conditional execution bat";
+comment "B between V1 and V2 (or vice versa) with candidates list and
conditional execution bat";
pattern avg(b:bat[:bte]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B with candidates list";
+comment "average of non-nil values of B";
pattern avg(b:bat[:bte],s:bat[:oid]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B";
+comment "average of non-nil values of B with candidates list";
pattern avg(b:bat[:bte]) (:dbl, :lng)
address CMDcalcavg
comment "average and number of non-nil values of B";
@@ -28727,10 +28727,10 @@ comment "average and number of non-nil v
pattern avg(b:bat[:sht]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B with candidates list";
+comment "average of non-nil values of B";
pattern avg(b:bat[:sht],s:bat[:oid]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B";
+comment "average of non-nil values of B with candidates list";
pattern avg(b:bat[:sht]) (:dbl, :lng)
address CMDcalcavg
comment "average and number of non-nil values of B";
@@ -28752,10 +28752,10 @@ comment "average and number of non-nil v
pattern avg(b:bat[:int]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B with candidates list";
+comment "average of non-nil values of B";
pattern avg(b:bat[:int],s:bat[:oid]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B";
+comment "average of non-nil values of B with candidates list";
pattern avg(b:bat[:int]) (:dbl, :lng)
address CMDcalcavg
comment "average and number of non-nil values of B";
@@ -28777,10 +28777,10 @@ comment "average and number of non-nil v
pattern avg(b:bat[:lng]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B with candidates list";
+comment "average of non-nil values of B";
pattern avg(b:bat[:lng],s:bat[:oid]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B";
+comment "average of non-nil values of B with candidates list";
pattern avg(b:bat[:lng]) (:dbl, :lng)
address CMDcalcavg
comment "average and number of non-nil values of B";
@@ -28802,10 +28802,10 @@ comment "average and number of non-nil v
pattern avg(b:bat[:flt]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B with candidates list";
+comment "average of non-nil values of B";
pattern avg(b:bat[:flt],s:bat[:oid]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B";
+comment "average of non-nil values of B with candidates list";
pattern avg(b:bat[:flt]) (:dbl, :lng)
address CMDcalcavg
comment "average and number of non-nil values of B";
@@ -28827,10 +28827,10 @@ comment "average and number of non-nil v
pattern avg(b:bat[:dbl]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B with candidates list";
+comment "average of non-nil values of B";
pattern avg(b:bat[:dbl],s:bat[:oid]) :dbl
address CMDcalcavg
-comment "average of non-nil values of B";
+comment "average of non-nil values of B with candidates list";
pattern avg(b:bat[:dbl]) (:dbl, :lng)
address CMDcalcavg
comment "average and number of non-nil values of B";
diff --git a/monetdb5/modules/mal/batcalc.c b/monetdb5/modules/mal/batcalc.c
--- a/monetdb5/modules/mal/batcalc.c
+++ b/monetdb5/modules/mal/batcalc.c
@@ -2435,22 +2435,22 @@ static mel_func batcalc_init_funcs[] = {
pattern("batmmath", "fmod", CMDbatMODsignal, false, "", args(1,5,
batarg("",flt),batarg("x",flt),arg("y",flt),batarg("s",oid),batarg("r",bit))),
pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa)", args(1,9,
batarg("",bit),batargany("b",1),batargany("v1",1),batargany("v2",1),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
- pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidate list", args(1,12,
batarg("",bit),batargany("b",1),batargany("v1",1),batargany("v2",1),batarg("s",oid),batarg("s1",oid),batarg("s2",oid),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
+ pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidates list", args(1,12,
batarg("",bit),batargany("b",1),batargany("v1",1),batargany("v2",1),batarg("s",oid),batarg("s1",oid),batarg("s2",oid),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa)", args(1,9,
batarg("",bit),batargany("b",1),batargany("v1",1),argany("v2",1),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
- pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidate list", args(1,11,
batarg("",bit),batargany("b",1),batargany("v1",1),argany("v2",1),batarg("s",oid),batarg("s1",oid),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
+ pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidates list", args(1,11,
batarg("",bit),batargany("b",1),batargany("v1",1),argany("v2",1),batarg("s",oid),batarg("s1",oid),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa)", args(1,9,
batarg("",bit),batargany("b",1),argany("v1",1),batargany("v2",1),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
- pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidate list", args(1,11,
batarg("",bit),batargany("b",1),argany("v1",1),batargany("v2",1),batarg("s",oid),batarg("s2",oid),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
+ pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidates list", args(1,11,
batarg("",bit),batargany("b",1),argany("v1",1),batargany("v2",1),batarg("s",oid),batarg("s2",oid),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa)", args(1,9,
batarg("",bit),batargany("b",1),argany("v1",1),argany("v2",1),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
- pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidate list", args(1,10,
batarg("",bit),batargany("b",1),argany("v1",1),argany("v2",1),batarg("s",oid),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
+ pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidates list", args(1,10,
batarg("",bit),batargany("b",1),argany("v1",1),argany("v2",1),batarg("s",oid),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa)", args(1,10,
batarg("",bit),batargany("b",1),batargany("v1",1),batargany("v2",1),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
- pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidate list", args(1,13,
batarg("",bit),batargany("b",1),batargany("v1",1),batargany("v2",1),batarg("s",oid),batarg("s1",oid),batarg("s2",oid),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
+ pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidates list", args(1,13,
batarg("",bit),batargany("b",1),batargany("v1",1),batargany("v2",1),batarg("s",oid),batarg("s1",oid),batarg("s2",oid),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa)", args(1,10,
batarg("",bit),batargany("b",1),batargany("v1",1),argany("v2",1),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
- pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidate list", args(1,12,
batarg("",bit),batargany("b",1),batargany("v1",1),argany("v2",1),batarg("s",oid),batarg("s1",oid),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
+ pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidates list", args(1,12,
batarg("",bit),batargany("b",1),batargany("v1",1),argany("v2",1),batarg("s",oid),batarg("s1",oid),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa)", args(1,10,
batarg("",bit),batargany("b",1),argany("v1",1),batargany("v2",1),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
- pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidate list", args(1,12,
batarg("",bit),batargany("b",1),argany("v1",1),batargany("v2",1),batarg("s",oid),batarg("s2",oid),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
+ pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidates list", args(1,12,
batarg("",bit),batargany("b",1),argany("v1",1),batargany("v2",1),batarg("s",oid),batarg("s2",oid),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa)", args(1,10,
batarg("",bit),batargany("b",1),argany("v1",1),argany("v2",1),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
- pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidate list", args(1,11,
batarg("",bit),batargany("b",1),argany("v1",1),argany("v2",1),batarg("s",oid),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
+ pattern("batcalc", "between", CMDbatBETWEEN, false, "B between V1 and V2 (or
vice versa) with candidates list", args(1,11,
batarg("",bit),batargany("b",1),argany("v1",1),argany("v2",1),batarg("s",oid),batarg("ce",bit),arg("sym",bit),arg("linc",bit),arg("hinc",bit),arg("nils_false",bit),arg("anti",bit))),
pattern("aggr", "avg", CMDcalcavg, false, "Gives the avg of all tail values",
args(1,2, arg("",dbl),batargany("b",2))),
pattern("aggr", "avg", CMDcalcavg, false, "Gives the avg of all tail values",
args(1,3, arg("",dbl),batargany("b",2),arg("scale",int))),
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
