Changeset: 5423c2f393b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5423c2f393b7
Modified Files:
monetdb5/extras/rapi/Tests/rapi07.malC
monetdb5/extras/rapi/Tests/rapi07.stable.out
monetdb5/extras/rapi/Tests/rapi08.malC
monetdb5/extras/rapi/Tests/rapi08.stable.out
monetdb5/extras/rapi/rapi.mal
testing/README
Branch: Oct2014
Log Message:
Fixed two RAPI MAL test cases
Unterschiede (gekürzt von 317 auf 300 Zeilen):
diff --git a/monetdb5/extras/rapi/Tests/rapi07.malC
b/monetdb5/extras/rapi/Tests/rapi07.malC
--- a/monetdb5/extras/rapi/Tests/rapi07.malC
+++ b/monetdb5/extras/rapi/Tests/rapi07.malC
@@ -1,2 +1,4 @@
(x:bat[:oid,:dbl], y:bat[:oid,:dbl]) := rapi.eval(nil:ptr,"x <-
seq(arg1,arg2,by=arg3);y <-
dnorm(x,mean=arg4,sd=arg5);return(data.frame(x,y))",-10,10,0.1,10,3);
+io.printf("#~BeginVariableOutput~#\n");
io.print(x,y);
+io.printf("#~EndVariableOutput~#\n");
diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.out
b/monetdb5/extras/rapi/Tests/rapi07.stable.out
--- a/monetdb5/extras/rapi/Tests/rapi07.stable.out
+++ b/monetdb5/extras/rapi/Tests/rapi07.stable.out
@@ -21,13 +21,221 @@ stdout of test 'rapi07` in directory 'mo
Ready.
-# 20:20:45 >
-# 20:20:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2827" "--port=38117"
-# 20:20:45 >
+# 12:48:51 >
+# 12:48:51 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8117" "--port=30681"
+# 12:48:51 >
-= ! correct/expected output needs to be verifed & approved ! =
+#io.printf("#~BeginVariableOutput~#\n");
+#~BeginVariableOutput~#
+#io.print(x,y);
+#--------------------------#
+# h t t # name
+# void dbl dbl # type
+#--------------------------#
+[ 0@0, -10, 2 ]
+[ 1@0, -9, 3 ]
+[ 2@0, -9, 4 ]
+[ 3@0, -9, 5 ]
+[ 4@0, -9, 7 ]
+[ 5@0, -9, 8 ]
+[ 6@0, -9, 1 ]
+[ 7@0, -9, 1 ]
+[ 8@0, -9, 1 ]
+[ 9@0, -9, 2 ]
+[ 10@0, -8, 2 ]
+[ 11@0, -8, 3 ]
+[ 12@0, -8, 3 ]
+[ 13@0, -8, 4 ]
+[ 14@0, -8, 5 ]
+[ 15@0, -8, 7 ]
+[ 16@0, -8, 9 ]
+[ 17@0, -8, 1 ]
+[ 18@0, -8, 1 ]
+[ 19@0, -8, 1 ]
+[ 20@0, -7, 2 ]
+[ 21@0, -7, 2 ]
+[ 22@0, -7, 3 ]
+[ 23@0, -7, 3 ]
+[ 24@0, -7, 4 ]
+[ 25@0, -7, 5 ]
+[ 26@0, -7, 6 ]
+[ 27@0, -7, 7 ]
+[ 28@0, -7, 9 ]
+[ 29@0, -7, 1 ]
+[ 30@0, -6, 1 ]
+[ 31@0, -6, 1 ]
+[ 32@0, -6, 2 ]
+[ 33@0, -6, 2 ]
+[ 34@0, -6, 2 ]
+[ 35@0, -6, 3 ]
+[ 36@0, -6, 4 ]
+[ 37@0, -6, 5 ]
+[ 38@0, -6, 6 ]
+[ 39@0, -6, 7 ]
+[ 40@0, -5, 8 ]
+[ 41@0, -5, 1 ]
+[ 42@0, -5, 1 ]
+[ 43@0, -5, 1 ]
+[ 44@0, -5, 1 ]
+[ 45@0, -5, 2 ]
+[ 46@0, -5, 2 ]
+[ 47@0, -5, 2 ]
+[ 48@0, -5, 3 ]
+[ 49@0, -5, 4 ]
+[ 50@0, -4, 4 ]
+[ 51@0, -4, 5 ]
+[ 52@0, -4, 6 ]
+[ 53@0, -4, 8 ]
+[ 54@0, -4, 9 ]
+[ 55@0, -4, 1 ]
+[ 56@0, -4, 1 ]
+[ 57@0, -4, 1 ]
+[ 58@0, -4, 1 ]
+[ 59@0, -4, 2 ]
+[ 60@0, -3, 2 ]
+[ 61@0, -3, 2 ]
+[ 62@0, -3, 3 ]
+[ 63@0, -3, 3 ]
+[ 64@0, -3, 4 ]
+[ 65@0, -3, 5 ]
+[ 66@0, -3, 6 ]
+[ 67@0, -3, 7 ]
+[ 68@0, -3, 8 ]
+[ 69@0, -3, 9 ]
+[ 70@0, -2, 1 ]
+[ 71@0, -2, 1 ]
+[ 72@0, -2, 1 ]
+[ 73@0, -2, 1 ]
+[ 74@0, -2, 1 ]
+[ 75@0, -2, 2 ]
+[ 76@0, -2, 2 ]
+[ 77@0, -2, 2 ]
+[ 78@0, -2, 3 ]
+[ 79@0, -2, 3 ]
+[ 80@0, -1, 4 ]
+[ 81@0, -1, 5 ]
+[ 82@0, -1, 5 ]
+[ 83@0, -1, 6 ]
+[ 84@0, -1, 7 ]
+[ 85@0, -1, 8 ]
+[ 86@0, -1, 9 ]
+[ 87@0, -1, 0 ]
+[ 88@0, -1, 0 ]
+[ 89@0, -1, 0 ]
+[ 90@0, -0, 0 ]
+[ 91@0, -0, 0 ]
+[ 92@0, -0, 0 ]
+[ 93@0, -0, 0 ]
+[ 94@0, -0, 0 ]
+[ 95@0, -0, 0 ]
+[ 96@0, -0, 0 ]
+[ 97@0, -0, 0 ]
+[ 98@0, -0, 0 ]
+[ 99@0, -0, 0 ]
+[ 100@0, 1, 0 ]
+[ 101@0, 0, 0 ]
+[ 102@0, 0, 0 ]
+[ 103@0, 0, 0 ]
+[ 104@0, 0, 0 ]
+[ 105@0, 0, 0 ]
+[ 106@0, 0, 0 ]
+[ 107@0, 0, 0 ]
+[ 108@0, 0, 0 ]
+[ 109@0, 0, 0 ]
+[ 110@0, 1, 0 ]
+[ 111@0, 1, 0 ]
+[ 112@0, 1, 0 ]
+[ 113@0, 1, 0 ]
+[ 114@0, 1, 0 ]
+[ 115@0, 1, 0 ]
+[ 116@0, 1, 0 ]
+[ 117@0, 1, 0 ]
+[ 118@0, 1, 0 ]
+[ 119@0, 1, 0 ]
+[ 120@0, 2, 0 ]
+[ 121@0, 2, 0 ]
+[ 122@0, 2, 0 ]
+[ 123@0, 2, 0 ]
+[ 124@0, 2, 0 ]
+[ 125@0, 2, 0 ]
+[ 126@0, 2, 0 ]
+[ 127@0, 2, 0 ]
+[ 128@0, 2, 0 ]
+[ 129@0, 2, 0 ]
+[ 130@0, 3, 0 ]
+[ 131@0, 3, 0 ]
+[ 132@0, 3, 0 ]
+[ 133@0, 3, 0 ]
+[ 134@0, 3, 0 ]
+[ 135@0, 3, 0 ]
+[ 136@0, 3, 0 ]
+[ 137@0, 3, 0 ]
+[ 138@0, 3, 0 ]
+[ 139@0, 3, 0 ]
+[ 140@0, 4, 0 ]
+[ 141@0, 4, 0 ]
+[ 142@0, 4, 0 ]
+[ 143@0, 4, 0 ]
+[ 144@0, 4, 0 ]
+[ 145@0, 4, 0 ]
+[ 146@0, 4, 0 ]
+[ 147@0, 4, 0 ]
+[ 148@0, 4, 0 ]
+[ 149@0, 4, 0 ]
+[ 150@0, 5, 0 ]
+[ 151@0, 5, 0 ]
+[ 152@0, 5, 0 ]
+[ 153@0, 5, 0 ]
+[ 154@0, 5, 0 ]
+[ 155@0, 5, 0 ]
+[ 156@0, 5, 0 ]
+[ 157@0, 5, 0 ]
+[ 158@0, 5, 0 ]
+[ 159@0, 5, 0 ]
+[ 160@0, 6, 0 ]
+[ 161@0, 6, 0 ]
+[ 162@0, 6, 0 ]
+[ 163@0, 6, 0 ]
+[ 164@0, 6, 0 ]
+[ 165@0, 6, 0 ]
+[ 166@0, 6, 0 ]
+[ 167@0, 6, 0 ]
+[ 168@0, 6, 0 ]
+[ 169@0, 6, 0 ]
+[ 170@0, 7, 0 ]
+[ 171@0, 7, 0 ]
+[ 172@0, 7, 0 ]
+[ 173@0, 7, 0 ]
+[ 174@0, 7, 0 ]
+[ 175@0, 7, 0 ]
+[ 176@0, 7, 0 ]
+[ 177@0, 7, 0 ]
+[ 178@0, 7, 0 ]
+[ 179@0, 7, 0 ]
+[ 180@0, 8, 0 ]
+[ 181@0, 8, 0 ]
+[ 182@0, 8, 0 ]
+[ 183@0, 8, 0 ]
+[ 184@0, 8, 0 ]
+[ 185@0, 8, 0 ]
+[ 186@0, 8, 0 ]
+[ 187@0, 8, 0 ]
+[ 188@0, 8, 0 ]
+[ 189@0, 8, 0 ]
+[ 190@0, 9, 0 ]
+[ 191@0, 9, 0 ]
+[ 192@0, 9, 0 ]
+[ 193@0, 9, 0 ]
+[ 194@0, 9, 0 ]
+[ 195@0, 9, 0 ]
+[ 196@0, 9, 0 ]
+[ 197@0, 9, 0 ]
+[ 198@0, 9, 0 ]
+[ 199@0, 9, 0 ]
+#io.printf("#~EndVariableOutput~#\n");
+#~EndVariableOutput~#
-# 20:20:45 >
-# 20:20:45 > "Done."
-# 20:20:45 >
+# 12:48:51 >
+# 12:48:51 > "Done."
+# 12:48:51 >
diff --git a/monetdb5/extras/rapi/Tests/rapi08.malC
b/monetdb5/extras/rapi/Tests/rapi08.malC
--- a/monetdb5/extras/rapi/Tests/rapi08.malC
+++ b/monetdb5/extras/rapi/Tests/rapi08.malC
@@ -22,8 +22,7 @@ X_8 := algebra.leftfetchjoin(ti,gv);
X_12 := algebra.leftfetchjoin(r1_9,X_8);
X_15 := algebra.leftfetchjoin(ti,dv);
-io.print(X_15);
-X_16:bat[:any,:dbl] := rapi.subeval(nil:ptr,"res <- aggregate(arg1,
by=list(arg2), FUN=median); return(res$x)",X_15,X_9,r1_9,true);
-
+io.print(X_9);
+X_16:bat[:any,:dbl] := rapi.subeval_aggr(nil:ptr,"res <- aggregate(arg2,
by=list(aggr_group), FUN=median); return(res$x)",X_8,X_15);
io.print(X_16);
diff --git a/monetdb5/extras/rapi/Tests/rapi08.stable.out
b/monetdb5/extras/rapi/Tests/rapi08.stable.out
--- a/monetdb5/extras/rapi/Tests/rapi08.stable.out
+++ b/monetdb5/extras/rapi/Tests/rapi08.stable.out
@@ -21,13 +21,28 @@ stdout of test 'rapi08` in directory 'mo
Ready.
-# 20:20:46 >
-# 20:20:46 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2827" "--port=38117"
-# 20:20:46 >
+# 13:27:36 >
+# 13:27:36 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9249" "--port=37225"
+# 13:27:36 >
-= ! correct/expected output needs to be verifed & approved ! =
+#io.print(X_9);
+#--------------------------#
+# h t # name
+# void oid # type
+#--------------------------#
+[ 0@0, 0@0 ]
+[ 1@0, 0@0 ]
+[ 2@0, 1@0 ]
+[ 3@0, 1@0 ]
+#io.print(X_16);
+#--------------------------#
+# h t # name
+# void dbl # type
+#--------------------------#
+[ 0@0, 63 ]
+[ 1@0, 31 ]
-# 20:20:46 >
-# 20:20:46 > "Done."
-# 20:20:46 >
+# 13:27:36 >
+# 13:27:36 > "Done."
+# 13:27:36 >
diff --git a/monetdb5/extras/rapi/rapi.mal b/monetdb5/extras/rapi/rapi.mal
--- a/monetdb5/extras/rapi/rapi.mal
+++ b/monetdb5/extras/rapi/rapi.mal
@@ -49,7 +49,7 @@ comment "Execute a simple R script value
pattern subeval_aggr(fptr:ptr,expr:str,arg:any...):any...
address RAPIevalAggr
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
