Changeset: faee64befbcf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=faee64befbcf
Modified Files:
sql/backends/monet5/sql_aggr_bte.mal
sql/backends/monet5/sql_aggr_flt.mal
sql/backends/monet5/sql_aggr_int.mal
sql/backends/monet5/sql_aggr_lng.mal
sql/backends/monet5/sql_aggr_sht.mal
sql/backends/monet5/sql_aggr_wrd.mal
Branch: default
Log Message:
Replace the @1 for their type name
diffs (truncated from 486 to 300 lines):
diff --git a/sql/backends/monet5/sql_aggr_bte.mal
b/sql/backends/monet5/sql_aggr_bte.mal
--- a/sql/backends/monet5/sql_aggr_bte.mal
+++ b/sql/backends/monet5/sql_aggr_bte.mal
@@ -1,49 +1,49 @@
-function aggr.covar(e1:bat[:oid,:@1], e2:bat[:oid,:@1]):@1;
- e0:bat[:oid,:@1] := batcalc.*(e1,e2);
- s0:@1 := aggr.sum(e0);
- s1:@1 := aggr.sum(e1);
- s2:@1 := aggr.sum(e2);
- v2:@1 := calc.*(s1,s2);
+function aggr.covar(e1:bat[:oid,:bte], e2:bat[:oid,:bte]):bte;
+ e0:bat[:oid,:bte] := batcalc.*(e1,e2);
+ s0:bte := aggr.sum(e0);
+ s1:bte := aggr.sum(e1);
+ s2:bte := aggr.sum(e2);
+ v2:bte := calc.*(s1,s2);
c := aggr.count(e1);
- n:@1 := calc.@1(c);
- v3:@1 := calc./(v2,n);
- v1:@1 := calc.-(s0,v3);
- v:@1 := calc./(v1,n);
+ n:bte := calc.bte(c);
+ v3:bte := calc./(v2,n);
+ v1:bte := calc.-(s0,v3);
+ v:bte := calc./(v1,n);
return v;
end aggr.covar;
-function aggr.corr(e1:bat[:oid,:@1], e2:bat[:oid,:@1]):@1;
- cv:@1 := aggr.covar(e1,e2);
+function aggr.corr(e1:bat[:oid,:bte], e2:bat[:oid,:bte]):bte;
+ cv:bte := aggr.covar(e1,e2);
sd1 := aggr.stdev(e1);
sd2 := aggr.stdev(e2);
sd := calc.*(sd1,sd2);
r := calc./(cv,sd);
- res := calc.@1(r);
+ res := calc.bte(r);
return res;
end aggr.corr;
-function aggr.covar(e1:bat[:oid,:@1], e2:bat[:oid,:@1], g:bat[:oid,:oid],
e:bat[:oid,:any_2]):bat[:oid,:@1];
- e0:bat[:oid,:@1] := batcalc.*(e1,e2);
- s0:bat[:oid,:@1] := aggr.sum(e0,g,e);
- s1:bat[:oid,:@1] := aggr.sum(e1,g,e);
- s2:bat[:oid,:@1] := aggr.sum(e2,g,e);
- v2:bat[:oid,:@1] := batcalc.*(s1,s2);
+function aggr.covar(e1:bat[:oid,:bte], e2:bat[:oid,:bte], g:bat[:oid,:oid],
e:bat[:oid,:any_2]):bat[:oid,:bte];
+ e0:bat[:oid,:bte] := batcalc.*(e1,e2);
+ s0:bat[:oid,:bte] := aggr.sum(e0,g,e);
+ s1:bat[:oid,:bte] := aggr.sum(e1,g,e);
+ s2:bat[:oid,:bte] := aggr.sum(e2,g,e);
+ v2:bat[:oid,:bte] := batcalc.*(s1,s2);
c := aggr.count(e1,g,e);
- n:bat[:oid,:@1] := batcalc.@1(c);
- v3:bat[:oid,:@1] := batcalc./(v2,n);
- v1:bat[:oid,:@1] := batcalc.-(s0,v3);
- v:bat[:oid,:@1] := batcalc./(v1,n);
+ n:bat[:oid,:bte] := batcalc.bte(c);
+ v3:bat[:oid,:bte] := batcalc./(v2,n);
+ v1:bat[:oid,:bte] := batcalc.-(s0,v3);
+ v:bat[:oid,:bte] := batcalc./(v1,n);
return v;
end aggr.covar;
-function aggr.corr(e1:bat[:oid,:@1], e2:bat[:oid,:@1],
g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:@1];
- cv:bat[:oid,:@1] := aggr.covar(e1,e2,g,e);
+function aggr.corr(e1:bat[:oid,:bte], e2:bat[:oid,:bte],
g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];
+ cv:bat[:oid,:bte] := aggr.covar(e1,e2,g,e);
sd1 := aggr.stdevp(e1,g,e);
sd2 := aggr.stdevp(e2,g,e);
sd := batcalc.*(sd1,sd2);
- sdn := batcalc.==(sd,0:@1);
- sds := batcalc.ifthenelse(sdn,1:@1,sd);
+ sdn := batcalc.==(sd,0:bte);
+ sds := batcalc.ifthenelse(sdn,1:bte,sd);
r := batcalc./(cv,sds);
- res := batcalc.@1(r);
+ res := batcalc.bte(r);
return res;
end aggr.corr;
diff --git a/sql/backends/monet5/sql_aggr_flt.mal
b/sql/backends/monet5/sql_aggr_flt.mal
--- a/sql/backends/monet5/sql_aggr_flt.mal
+++ b/sql/backends/monet5/sql_aggr_flt.mal
@@ -1,49 +1,49 @@
-function aggr.covar(e1:bat[:oid,:@1], e2:bat[:oid,:@1]):@1;
- e0:bat[:oid,:@1] := batcalc.*(e1,e2);
- s0:@1 := aggr.sum(e0);
- s1:@1 := aggr.sum(e1);
- s2:@1 := aggr.sum(e2);
- v2:@1 := calc.*(s1,s2);
+function aggr.covar(e1:bat[:oid,:flt], e2:bat[:oid,:flt]):flt;
+ e0:bat[:oid,:flt] := batcalc.*(e1,e2);
+ s0:flt := aggr.sum(e0);
+ s1:flt := aggr.sum(e1);
+ s2:flt := aggr.sum(e2);
+ v2:flt := calc.*(s1,s2);
c := aggr.count(e1);
- n:@1 := calc.@1(c);
- v3:@1 := calc./(v2,n);
- v1:@1 := calc.-(s0,v3);
- v:@1 := calc./(v1,n);
+ n:flt := calc.flt(c);
+ v3:flt := calc./(v2,n);
+ v1:flt := calc.-(s0,v3);
+ v:flt := calc./(v1,n);
return v;
end aggr.covar;
-function aggr.corr(e1:bat[:oid,:@1], e2:bat[:oid,:@1]):@1;
- cv:@1 := aggr.covar(e1,e2);
+function aggr.corr(e1:bat[:oid,:flt], e2:bat[:oid,:flt]):flt;
+ cv:flt := aggr.covar(e1,e2);
sd1 := aggr.stdev(e1);
sd2 := aggr.stdev(e2);
sd := calc.*(sd1,sd2);
r := calc./(cv,sd);
- res := calc.@1(r);
+ res := calc.flt(r);
return res;
end aggr.corr;
-function aggr.covar(e1:bat[:oid,:@1], e2:bat[:oid,:@1], g:bat[:oid,:oid],
e:bat[:oid,:any_2]):bat[:oid,:@1];
- e0:bat[:oid,:@1] := batcalc.*(e1,e2);
- s0:bat[:oid,:@1] := aggr.sum(e0,g,e);
- s1:bat[:oid,:@1] := aggr.sum(e1,g,e);
- s2:bat[:oid,:@1] := aggr.sum(e2,g,e);
- v2:bat[:oid,:@1] := batcalc.*(s1,s2);
+function aggr.covar(e1:bat[:oid,:flt], e2:bat[:oid,:flt], g:bat[:oid,:oid],
e:bat[:oid,:any_2]):bat[:oid,:flt];
+ e0:bat[:oid,:flt] := batcalc.*(e1,e2);
+ s0:bat[:oid,:flt] := aggr.sum(e0,g,e);
+ s1:bat[:oid,:flt] := aggr.sum(e1,g,e);
+ s2:bat[:oid,:flt] := aggr.sum(e2,g,e);
+ v2:bat[:oid,:flt] := batcalc.*(s1,s2);
c := aggr.count(e1,g,e);
- n:bat[:oid,:@1] := batcalc.@1(c);
- v3:bat[:oid,:@1] := batcalc./(v2,n);
- v1:bat[:oid,:@1] := batcalc.-(s0,v3);
- v:bat[:oid,:@1] := batcalc./(v1,n);
+ n:bat[:oid,:flt] := batcalc.flt(c);
+ v3:bat[:oid,:flt] := batcalc./(v2,n);
+ v1:bat[:oid,:flt] := batcalc.-(s0,v3);
+ v:bat[:oid,:flt] := batcalc./(v1,n);
return v;
end aggr.covar;
-function aggr.corr(e1:bat[:oid,:@1], e2:bat[:oid,:@1],
g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:@1];
- cv:bat[:oid,:@1] := aggr.covar(e1,e2,g,e);
+function aggr.corr(e1:bat[:oid,:flt], e2:bat[:oid,:flt],
g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];
+ cv:bat[:oid,:flt] := aggr.covar(e1,e2,g,e);
sd1 := aggr.stdevp(e1,g,e);
sd2 := aggr.stdevp(e2,g,e);
sd := batcalc.*(sd1,sd2);
- sdn := batcalc.==(sd,0:@1);
- sds := batcalc.ifthenelse(sdn,1:@1,sd);
+ sdn := batcalc.==(sd,0:flt);
+ sds := batcalc.ifthenelse(sdn,1:flt,sd);
r := batcalc./(cv,sds);
- res := batcalc.@1(r);
+ res := batcalc.flt(r);
return res;
end aggr.corr;
diff --git a/sql/backends/monet5/sql_aggr_int.mal
b/sql/backends/monet5/sql_aggr_int.mal
--- a/sql/backends/monet5/sql_aggr_int.mal
+++ b/sql/backends/monet5/sql_aggr_int.mal
@@ -1,49 +1,49 @@
-function aggr.covar(e1:bat[:oid,:@1], e2:bat[:oid,:@1]):@1;
- e0:bat[:oid,:@1] := batcalc.*(e1,e2);
- s0:@1 := aggr.sum(e0);
- s1:@1 := aggr.sum(e1);
- s2:@1 := aggr.sum(e2);
- v2:@1 := calc.*(s1,s2);
+function aggr.covar(e1:bat[:oid,:int], e2:bat[:oid,:int]):int;
+ e0:bat[:oid,:int] := batcalc.*(e1,e2);
+ s0:int := aggr.sum(e0);
+ s1:int := aggr.sum(e1);
+ s2:int := aggr.sum(e2);
+ v2:int := calc.*(s1,s2);
c := aggr.count(e1);
- n:@1 := calc.@1(c);
- v3:@1 := calc./(v2,n);
- v1:@1 := calc.-(s0,v3);
- v:@1 := calc./(v1,n);
+ n:int := calc.int(c);
+ v3:int := calc./(v2,n);
+ v1:int := calc.-(s0,v3);
+ v:int := calc./(v1,n);
return v;
end aggr.covar;
-function aggr.corr(e1:bat[:oid,:@1], e2:bat[:oid,:@1]):@1;
- cv:@1 := aggr.covar(e1,e2);
+function aggr.corr(e1:bat[:oid,:int], e2:bat[:oid,:int]):int;
+ cv:int := aggr.covar(e1,e2);
sd1 := aggr.stdev(e1);
sd2 := aggr.stdev(e2);
sd := calc.*(sd1,sd2);
r := calc./(cv,sd);
- res := calc.@1(r);
+ res := calc.int(r);
return res;
end aggr.corr;
-function aggr.covar(e1:bat[:oid,:@1], e2:bat[:oid,:@1], g:bat[:oid,:oid],
e:bat[:oid,:any_2]):bat[:oid,:@1];
- e0:bat[:oid,:@1] := batcalc.*(e1,e2);
- s0:bat[:oid,:@1] := aggr.sum(e0,g,e);
- s1:bat[:oid,:@1] := aggr.sum(e1,g,e);
- s2:bat[:oid,:@1] := aggr.sum(e2,g,e);
- v2:bat[:oid,:@1] := batcalc.*(s1,s2);
+function aggr.covar(e1:bat[:oid,:int], e2:bat[:oid,:int], g:bat[:oid,:oid],
e:bat[:oid,:any_2]):bat[:oid,:int];
+ e0:bat[:oid,:int] := batcalc.*(e1,e2);
+ s0:bat[:oid,:int] := aggr.sum(e0,g,e);
+ s1:bat[:oid,:int] := aggr.sum(e1,g,e);
+ s2:bat[:oid,:int] := aggr.sum(e2,g,e);
+ v2:bat[:oid,:int] := batcalc.*(s1,s2);
c := aggr.count(e1,g,e);
- n:bat[:oid,:@1] := batcalc.@1(c);
- v3:bat[:oid,:@1] := batcalc./(v2,n);
- v1:bat[:oid,:@1] := batcalc.-(s0,v3);
- v:bat[:oid,:@1] := batcalc./(v1,n);
+ n:bat[:oid,:int] := batcalc.int(c);
+ v3:bat[:oid,:int] := batcalc./(v2,n);
+ v1:bat[:oid,:int] := batcalc.-(s0,v3);
+ v:bat[:oid,:int] := batcalc./(v1,n);
return v;
end aggr.covar;
-function aggr.corr(e1:bat[:oid,:@1], e2:bat[:oid,:@1],
g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:@1];
- cv:bat[:oid,:@1] := aggr.covar(e1,e2,g,e);
+function aggr.corr(e1:bat[:oid,:int], e2:bat[:oid,:int],
g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];
+ cv:bat[:oid,:int] := aggr.covar(e1,e2,g,e);
sd1 := aggr.stdevp(e1,g,e);
sd2 := aggr.stdevp(e2,g,e);
sd := batcalc.*(sd1,sd2);
- sdn := batcalc.==(sd,0:@1);
- sds := batcalc.ifthenelse(sdn,1:@1,sd);
+ sdn := batcalc.==(sd,0:int);
+ sds := batcalc.ifthenelse(sdn,1:int,sd);
r := batcalc./(cv,sds);
- res := batcalc.@1(r);
+ res := batcalc.int(r);
return res;
end aggr.corr;
diff --git a/sql/backends/monet5/sql_aggr_lng.mal
b/sql/backends/monet5/sql_aggr_lng.mal
--- a/sql/backends/monet5/sql_aggr_lng.mal
+++ b/sql/backends/monet5/sql_aggr_lng.mal
@@ -1,49 +1,49 @@
-function aggr.covar(e1:bat[:oid,:@1], e2:bat[:oid,:@1]):@1;
- e0:bat[:oid,:@1] := batcalc.*(e1,e2);
- s0:@1 := aggr.sum(e0);
- s1:@1 := aggr.sum(e1);
- s2:@1 := aggr.sum(e2);
- v2:@1 := calc.*(s1,s2);
+function aggr.covar(e1:bat[:oid,:lng], e2:bat[:oid,:lng]):lng;
+ e0:bat[:oid,:lng] := batcalc.*(e1,e2);
+ s0:lng := aggr.sum(e0);
+ s1:lng := aggr.sum(e1);
+ s2:lng := aggr.sum(e2);
+ v2:lng := calc.*(s1,s2);
c := aggr.count(e1);
- n:@1 := calc.@1(c);
- v3:@1 := calc./(v2,n);
- v1:@1 := calc.-(s0,v3);
- v:@1 := calc./(v1,n);
+ n:lng := calc.lng(c);
+ v3:lng := calc./(v2,n);
+ v1:lng := calc.-(s0,v3);
+ v:lng := calc./(v1,n);
return v;
end aggr.covar;
-function aggr.corr(e1:bat[:oid,:@1], e2:bat[:oid,:@1]):@1;
- cv:@1 := aggr.covar(e1,e2);
+function aggr.corr(e1:bat[:oid,:lng], e2:bat[:oid,:lng]):lng;
+ cv:lng := aggr.covar(e1,e2);
sd1 := aggr.stdev(e1);
sd2 := aggr.stdev(e2);
sd := calc.*(sd1,sd2);
r := calc./(cv,sd);
- res := calc.@1(r);
+ res := calc.lng(r);
return res;
end aggr.corr;
-function aggr.covar(e1:bat[:oid,:@1], e2:bat[:oid,:@1], g:bat[:oid,:oid],
e:bat[:oid,:any_2]):bat[:oid,:@1];
- e0:bat[:oid,:@1] := batcalc.*(e1,e2);
- s0:bat[:oid,:@1] := aggr.sum(e0,g,e);
- s1:bat[:oid,:@1] := aggr.sum(e1,g,e);
- s2:bat[:oid,:@1] := aggr.sum(e2,g,e);
- v2:bat[:oid,:@1] := batcalc.*(s1,s2);
+function aggr.covar(e1:bat[:oid,:lng], e2:bat[:oid,:lng], g:bat[:oid,:oid],
e:bat[:oid,:any_2]):bat[:oid,:lng];
+ e0:bat[:oid,:lng] := batcalc.*(e1,e2);
+ s0:bat[:oid,:lng] := aggr.sum(e0,g,e);
+ s1:bat[:oid,:lng] := aggr.sum(e1,g,e);
+ s2:bat[:oid,:lng] := aggr.sum(e2,g,e);
+ v2:bat[:oid,:lng] := batcalc.*(s1,s2);
c := aggr.count(e1,g,e);
- n:bat[:oid,:@1] := batcalc.@1(c);
- v3:bat[:oid,:@1] := batcalc./(v2,n);
- v1:bat[:oid,:@1] := batcalc.-(s0,v3);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
