Changeset: 651e7a90827d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=651e7a90827d
Added Files:
monetdb5/extras/rapi/Tests/rapi07.stable.err
monetdb5/extras/rapi/Tests/rapi07.stable.out
Modified Files:
monetdb5/extras/rapi/Tests/rapi03.mal
monetdb5/extras/rapi/Tests/rapi03.stable.out
monetdb5/extras/rapi/Tests/rapi04.mal
monetdb5/extras/rapi/Tests/rapi05.mal
monetdb5/extras/rapi/rapi.c
Branch: RIntegration
Log Message:
One more rapi test passes.
diffs (truncated from 371 to 300 lines):
diff --git a/monetdb5/extras/rapi/Tests/rapi03.mal
b/monetdb5/extras/rapi/Tests/rapi03.mal
--- a/monetdb5/extras/rapi/Tests/rapi03.mal
+++ b/monetdb5/extras/rapi/Tests/rapi03.mal
@@ -13,6 +13,6 @@ bat.append(b,1189641421);
io.print(b);
-(t:bat[:oid,:dbl], s:bat[:oid,:dbl]) := rapi.eval("someval2 <- Re(fft(arg2));
print(someval2); return(data.frame(someval2,someval2));",b);
+(t:bat[:oid,:dbl], s:bat[:oid,:dbl]) := rapi.eval("someval2 <- Re(fft(arg1));
print(someval2); return(data.frame(someval2,someval2));",b);
io.print(t,s);
diff --git a/monetdb5/extras/rapi/Tests/rapi03.stable.out
b/monetdb5/extras/rapi/Tests/rapi03.stable.out
--- a/monetdb5/extras/rapi/Tests/rapi03.stable.out
+++ b/monetdb5/extras/rapi/Tests/rapi03.stable.out
@@ -32,7 +32,7 @@ function user.main():void;
bat.append(b,596516649);
bat.append(b,1189641421);
io.print(b);
- (t:bat[:oid,:dbl] ,s:bat[:oid,:dbl] ) := rapi.eval("someval2 <-
Re(fft(arg2)); print(someval2); return(data.frame(someval2,someval2));",b);
+ (t:bat[:oid,:dbl] ,s:bat[:oid,:dbl] ) := rapi.eval("someval2 <-
Re(fft(arg1)); print(someval2); return(data.frame(someval2,someval2));",b);
io.print(t,s);
end main;
#--------------------------#
diff --git a/monetdb5/extras/rapi/Tests/rapi04.mal
b/monetdb5/extras/rapi/Tests/rapi04.mal
--- a/monetdb5/extras/rapi/Tests/rapi04.mal
+++ b/monetdb5/extras/rapi/Tests/rapi04.mal
@@ -8,7 +8,7 @@ bat.append(b2,1);
bat.append(b2,2);
bat.append(b2,3);
-(r:bat[:oid,:dbl], s:bat[:oid,:dbl]) :=
rapi.eval("data.frame(r=arg1,s=as.numeric((smooth(Re(fft(arg1)),kind=arg4)+arg2)/arg3))[1:2,]",b1,b2,42:int,"3RSR");
+(r:bat[:oid,:dbl], s:bat[:oid,:dbl]) := rapi.eval("print(arg1);print(arg2);
print(arg3);
print(arg4);data.frame(r=arg1,s=as.numeric((smooth(Re(fft(arg1)),kind=arg4)+arg2)/arg3))[1:2,]",b1,b2,42:int,"3RSR");
io.print(r,s);
diff --git a/monetdb5/extras/rapi/Tests/rapi05.mal
b/monetdb5/extras/rapi/Tests/rapi05.mal
--- a/monetdb5/extras/rapi/Tests/rapi05.mal
+++ b/monetdb5/extras/rapi/Tests/rapi05.mal
@@ -22,6 +22,6 @@ bat.append(b,1649760492);
bat.append(b,596516649);
bat.append(b,1189641421);
-(r:bat[:oid,:int], s:bat[:oid,:dbl]) :=
rapi.eval("aggregate(arg1,by=list(arg2),FUN=function(x){sort(x)[max(length(x)-arg3,0)]})",g,b,1);
+(r:bat[:oid,:int], s:bat[:oid,:dbl]) :=
rapi.eval("aggregate(arg1,by=list(arg2),FUN=function(x){sort(x)[max(length(x)-arg3,0)]})",b,g,1);
io.print(r,s);
diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.err
b/monetdb5/extras/rapi/Tests/rapi07.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/rapi/Tests/rapi07.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'rapi07` in directory 'monetdb5/extras/rapi` itself:
+
+
+# 17:54:42 >
+# 17:54:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33353" "--set"
"mapi_usock=/var/tmp/mtest-14415/.s.monetdb.33353" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi"
"rapi07.mal"
+# 17:54:42 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/rapi//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 33353
+# cmdline opt mapi_usock = /var/tmp/mtest-14415/.s.monetdb.33353
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi
+
+# 17:54:42 >
+# 17:54:42 > "Done."
+# 17:54:42 >
+
diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.out
b/monetdb5/extras/rapi/Tests/rapi07.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/rapi/Tests/rapi07.stable.out
@@ -0,0 +1,236 @@
+stdout of test 'rapi07` in directory 'monetdb5/extras/rapi` itself:
+
+
+# 17:54:42 >
+# 17:54:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33353" "--set"
"mapi_usock=/var/tmp/mtest-14415/.s.monetdb.33353" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi"
"rapi07.mal"
+# 17:54:42 >
+
+# MonetDB 5 server v11.17.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_extras_rapi', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:33353/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-14415/.s.monetdb.33353
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+ (x:bat[:oid,:dbl] ,y:bat[:oid,:dbl] ) := rapi.eval("x <-
seq(arg1,arg2,by=arg3);y <-
dnorm(x,mean=arg4,sd=arg5);return(data.frame(x,y))",-10,10,0.100000001,10,3);
+ io.print(x,y);
+end main;
+# User R expression: x <- seq(arg1,arg2,by=arg3);y <-
dnorm(x,mean=arg4,sd=arg5);return(data.frame(x,y))
+# Executed R expression ret <-
as.data.frame((function(arg1,arg2,arg3,arg4,arg5){x <- seq(arg1,arg2,by=arg3);y
<-
dnorm(x,mean=arg4,sd=arg5);return(data.frame(x,y))})(arg1,arg2,arg3,arg4,arg5),nm=NA,stringsAsFactors=F)
+
+#--------------------------#
+# h t t # name
+# void dbl dbl # type
+#--------------------------#
+[ 0@0, -10, 2.9703000624507176e-11 ]
+[ 1@0, -9.8999999985098839, 3.707395649324631e-11 ]
+[ 2@0, -9.7999999970197678, 4.6222666775236698e-11 ]
+[ 3@0, -9.6999999955296516, 5.7565000239451724e-11 ]
+[ 4@0, -9.5999999940395355, 7.1610956414885588e-11 ]
+[ 5@0, -9.4999999925494194, 8.8985221928577002e-11 ]
+[ 6@0, -9.3999999910593033, 1.1045204274446866e-10 ]
+[ 7@0, -9.2999999895691872, 1.3694527966493376e-10 ]
+[ 8@0, -9.199999988079071, 1.6960468036810535e-10 ]
+[ 9@0, -9.0999999865889549, 2.0981959714418624e-10 ]
+[ 10@0, -8.9999999850988388, 2.5928161042547172e-10 ]
+[ 11@0, -8.8999999836087227, 3.2004779002699408e-10 ]
+[ 12@0, -8.7999999821186066, 3.9461664547241843e-10 ]
+[ 13@0, -8.6999999806284904, 4.8601919163573069e-10 ]
+[ 14@0, -8.5999999791383743, 5.9792799510044556e-10 ]
+[ 15@0, -8.4999999776482582, 7.3478758034720252e-10 ]
+[ 16@0, -8.3999999761581421, 9.0197017482364633e-10 ]
+[ 17@0, -8.299999974668026, 1.105961471482011e-09 ]
+[ 18@0, -8.1999999731779099, 1.3545819017071553e-09 ]
+[ 19@0, -8.0999999716877937, 1.6572498580030179e-09 ]
+[ 20@0, -7.9999999701976776, 2.0252944039913784e-09 ]
+[ 21@0, -7.8999999687075615, 2.4723262814302419e-09 ]
+[ 22@0, -7.7999999672174454, 3.014677495189107e-09 ]
+[ 23@0, -7.6999999657273293, 3.6719214557256647e-09 ]
+[ 24@0, -7.5999999642372131, 4.4674876164172392e-09 ]
+[ 25@0, -7.499999962747097, 5.4293867958126325e-09 ]
+[ 26@0, -7.3999999612569809, 6.5910659624399622e-09 ]
+[ 27@0, -7.2999999597668648, 7.9924142268410408e-09 ]
+[ 28@0, -7.1999999582767487, 9.6809451816660743e-09 ]
+[ 29@0, -7.0999999567866325, 1.1713184611117133e-08 ]
+[ 30@0, -6.9999999552965164, 1.4156297016872749e-08 ]
+[ 31@0, -6.8999999538064003, 1.7089989446333886e-08 ]
+[ 32@0, -6.7999999523162842, 2.0608736834928226e-08 ]
+[ 33@0, -6.6999999508261681, 2.4824379568897847e-08 ]
+[ 34@0, -6.5999999493360519, 2.986915132780085e-08 ]
+[ 35@0, -6.4999999478459358, 3.5899203574341309e-08 ]
+[ 36@0, -6.3999999463558197, 4.3098702429094833e-08 ]
+[ 37@0, -6.2999999448657036, 5.1684584214038564e-08 ]
+[ 38@0, -6.1999999433755875, 6.1912067795498295e-08 ]
+[ 39@0, -6.0999999418854713, 7.4081035137486359e-08 ]
+[ 40@0, -5.9999999403953552, 8.8543406333126773e-08 ]
+[ 41@0, -5.8999999389052391, 1.0571165196708841e-07 ]
+[ 42@0, -5.799999937415123, 1.2606860413708581e-07 ]
+[ 43@0, -5.6999999359250069, 1.5017874799785094e-07 ]
+[ 44@0, -5.5999999344348907, 1.7870119846529686e-07 ]
+[ 45@0, -5.4999999329447746, 2.1240459191835881e-07 ]
+[ 46@0, -5.3999999314546585, 2.521841505542425e-07 ]
+[ 47@0, -5.2999999299645424, 2.9908120768813426e-07 ]
+[ 48@0, -5.1999999284744263, 3.543055159431393e-07 ]
+[ 49@0, -5.0999999269843102, 4.1926069715439716e-07 ]
+[ 50@0, -4.999999925494194, 4.9557323311656768e-07 ]
+[ 51@0, -4.8999999240040779, 5.8512544023649835e-07 ]
+[ 52@0, -4.7999999225139618, 6.9009291890619926e-07 ]
+[ 53@0, -4.6999999210238457, 8.1298702016854083e-07 ]
+[ 54@0, -4.5999999195337296, 9.56702928177563e-07 ]
+[ 55@0, -4.4999999180436134, 1.1245740172052963e-06 ]
+[ 56@0, -4.3999999165534973, 1.3204332066408673e-06 ]
+[ 57@0, -4.2999999150633812, 1.5486821066571006e-06 ]
+[ 58@0, -4.1999999135732651, 1.8143688210379674e-06 ]
+[ 59@0, -4.099999912083149, 2.1232753520746503e-06 ]
+[ 60@0, -3.9999999105930328, 2.4820156354025149e-06 ]
+[ 61@0, -3.8999999091029167, 2.8981453200558914e-06 ]
+[ 62@0, -3.7999999076128006, 3.3802845006812467e-06 ]
+[ 63@0, -3.6999999061226845, 3.9382547045081157e-06 ]
+[ 64@0, -3.5999999046325684, 4.583231534974164e-06 ]
+[ 65@0, -3.4999999031424522, 5.3279144763748653e-06 ]
+[ 66@0, -3.3999999016523361, 6.1867154689854951e-06 ]
+[ 67@0, -3.29999990016222, 7.1759679710778054e-06 ]
+[ 68@0, -3.1999998986721039, 8.3141583322868231e-06 ]
+[ 69@0, -3.0999998971819878, 9.622181410882544e-06 ]
+[ 70@0, -2.9999998956918716, 1.1123622474512109e-05 ]
+[ 71@0, -2.8999998942017555, 1.2845067528574905e-05 ]
+[ 72@0, -2.7999998927116394, 1.4816444317068391e-05 ]
+[ 73@0, -2.6999998912215233, 1.7071396335791141e-05 ]
+[ 74@0, -2.5999998897314072, 1.9647692285312457e-05 ]
+[ 75@0, -2.499999888241291, 2.2587673469007296e-05 ]
+[ 76@0, -2.3999998867511749, 2.5938741707388566e-05 ]
+[ 77@0, -2.2999998852610588, 2.9753890391414768e-05 ]
+[ 78@0, -2.1999998837709427, 3.4092281331668544e-05 ]
+[ 79@0, -2.0999998822808266, 3.90198700743283e-05 ]
+[ 80@0, -1.9999998807907104, 4.4610082345542787e-05 ]
+[ 81@0, -1.8999998793005943, 5.0944544249823986e-05 ]
+[ 82@0, -1.7999998778104782, 5.8113868781863532e-05 ]
+[ 83@0, -1.6999998763203621, 6.6218501111100933e-05 ]
+[ 84@0, -1.599999874830246, 7.5369624960601691e-05 ]
+[ 85@0, -1.4999998733401299, 8.5690132222463407e-05 ]
+[ 86@0, -1.3999998718500137, 9.7315657727085536e-05 ]
+[ 87@0, -1.2999998703598976, 0.00011039568080923967 ]
+[ 88@0, -1.1999998688697815, 0.00012509469498602833 ]
+[ 89@0, -1.0999998673796654, 0.00014159344667665852 ]
+[ 90@0, -0.99999986588954926, 0.00016009024344777371 ]
+[ 91@0, -0.89999986439943314, 0.00018080233175741842 ]
+[ 92@0, -0.79999986290931702, 0.00020396734359234785 ]
+[ 93@0, -0.6999998614192009, 0.00022984481074452326 ]
+[ 94@0, -0.59999985992908478, 0.0002587177447509226 ]
+[ 95@0, -0.49999985843896866, 0.00029089427972442541 ]
+[ 96@0, -0.39999985694885254, 0.00032670937443133821 ]
+[ 97@0, -0.29999985545873642, 0.00036652656902274244 ]
+[ 98@0, -0.1999998539686203, 0.00041073979080268481 ]
+[ 99@0, -0.099999852478504181, 0.00045977520231765367 ]
+[ 100@0, 1.4901161193847656e-07, 0.0005140930838812937 ]
+[ 101@0, 0.10000015050172806, 0.00057418974140942107 ]
+[ 102@0, 0.20000015199184418, 0.00064059942913796133 ]
+[ 103@0, 0.3000001534819603, 0.00071389627543657144 ]
+[ 104@0, 0.40000015497207642, 0.00079469619852103697 ]
+[ 105@0, 0.50000015646219254, 0.00088365879741694785 ]
+[ 106@0, 0.60000015795230865, 0.00098148920204641204 ]
+[ 107@0, 0.70000015944242477, 0.0010889398648106091 ]
+[ 108@0, 0.80000016093254089, 0.0012068122745376745 ]
+[ 109@0, 0.90000016242265701, 0.0013359585721730355 ]
+[ 110@0, 1.0000001639127731, 0.0014772830461248741 ]
+[ 111@0, 1.1000001654028893, 0.0016317434837592069 ]
+[ 112@0, 1.2000001668930054, 0.0018003523541872868 ]
+[ 113@0, 1.3000001683831215, 0.0019841777962239042 ]
+[ 114@0, 1.4000001698732376, 0.0021843443842411662 ]
+[ 115@0, 1.5000001713633537, 0.0024020336436224405 ]
+[ 116@0, 1.6000001728534698, 0.0026384842866597016 ]
+[ 117@0, 1.700000174343586, 0.00289499213905998 ]
+[ 118@0, 1.8000001758337021, 0.0031729097267586396 ]
+[ 119@0, 1.9000001773238182, 0.0034736454925048867 ]
+[ 120@0, 2.0000001788139343, 0.003798662611713589 ]
+[ 121@0, 2.1000001803040504, 0.0041494773773928821 ]
+[ 122@0, 2.2000001817941666, 0.0045276571245832387 ]
+[ 123@0, 2.3000001832842827, 0.004934817665703561 ]
+[ 124@0, 2.4000001847743988, 0.0053726202095153962 ]
+[ 125@0, 2.5000001862645149, 0.0058427677381063447 ]
+[ 126@0, 2.600000187754631, 0.0063470008183747935 ]
+[ 127@0, 2.7000001892447472, 0.0068870928269845122 ]
+[ 128@0, 2.8000001907348633, 0.0074648445706590807 ]
+[ 129@0, 2.9000001922249794, 0.0080820782870089092 ]
+[ 130@0, 3.0000001937150955, 0.0087406310148302937 ]
+[ 131@0, 3.1000001952052116, 0.0094423473269834093 ]
+[ 132@0, 3.2000001966953278, 0.010189071423536209 ]
+[ 133@0, 3.3000001981854439, 0.010982638587841728 ]
+[ 134@0, 3.40000019967556, 0.011824866013577269 ]
+[ 135@0, 3.5000002011656761, 0.012717543016490876 ]
+[ 136@0, 3.6000002026557922, 0.01366242065064273 ]
+[ 137@0, 3.7000002041459084, 0.014661200755259111 ]
+[ 138@0, 3.8000002056360245, 0.015715524464890718 ]
+[ 139@0, 3.9000002071261406, 0.016826960222336835 ]
+[ 140@0, 4.0000002086162567, 0.01799699134070578 ]
+[ 141@0, 4.1000002101063728, 0.019227003167968902 ]
+[ 142@0, 4.200000211596489, 0.020518269914364898 ]
+[ 143@0, 4.3000002130866051, 0.021871941209949824 ]
+[ 144@0, 4.4000002145767212, 0.02328902846639222 ]
+[ 145@0, 4.5000002160668373, 0.024770391123700792 ]
+[ 146@0, 4.6000002175569534, 0.026316722868862729 ]
+[ 147@0, 4.7000002190470695, 0.027928537919279184 ]
+[ 148@0, 4.8000002205371857, 0.029606157469324185 ]
+[ 149@0, 4.9000002220273018, 0.0313496964032388 ]
+[ 150@0, 5.0000002235174179, 0.033159050381818829 ]
+[ 151@0, 5.100000225007534, 0.035033883413877448 ]
+[ 152@0, 5.2000002264976501, 0.036973616026184632 ]
+[ 153@0, 5.3000002279877663, 0.038977414147428203 ]
+[ 154@0, 5.4000002294778824, 0.041044178822634315 ]
+[ 155@0, 5.5000002309679985, 0.043172536874367388 ]
+[ 156@0, 5.6000002324581146, 0.045360832625844692 ]
+[ 157@0, 5.7000002339482307, 0.047607120798801583 ]
+[ 158@0, 5.8000002354383469, 0.049909160695495308 ]
+[ 159@0, 5.900000236928463, 0.05226441176961346 ]
+[ 160@0, 6.0000002384185791, 0.054670030685042302 ]
+[ 161@0, 6.1000002399086952, 0.057122869954453682 ]
+[ 162@0, 6.2000002413988113, 0.059619478241498609 ]
+[ 163@0, 6.3000002428889275, 0.062156102401077794 ]
+[ 164@0, 6.4000002443790436, 0.064728691321738072 ]
+[ 165@0, 6.5000002458691597, 0.067332901622773958 ]
+[ 166@0, 6.6000002473592758, 0.06996410524616524 ]
+[ 167@0, 6.7000002488493919, 0.072617398970141342 ]
+[ 168@0, 6.8000002503395081, 0.075287615857028381 ]
+[ 169@0, 6.9000002518296242, 0.077969338633216728 ]
+[ 170@0, 7.0000002533197403, 0.080656914983710123 ]
+[ 171@0, 7.1000002548098564, 0.083344474727916854 ]
+[ 172@0, 7.2000002562999725, 0.086025948827262555 ]
+[ 173@0, 7.3000002577900887, 0.088695090158998902 ]
+[ 174@0, 7.4000002592802048, 0.091345495974409455 ]
+[ 175@0, 7.5000002607703209, 0.093970631943642427 ]
+[ 176@0, 7.600000262260437, 0.096563857673794842 ]
+[ 177@0, 7.7000002637505531, 0.099118453571806694 ]
+[ 178@0, 7.8000002652406693, 0.10162764890936382 ]
+[ 179@0, 7.9000002667307854, 0.10408465093352198 ]
+[ 180@0, 8.0000002682209015, 0.10648267485431213 ]
+[ 181@0, 8.1000002697110176, 0.10881497452932305 ]
+[ 182@0, 8.2000002712011337, 0.11107487365532559 ]
+[ 183@0, 8.3000002726912498, 0.11325579726853767 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
