Changeset: ebc84282aade for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebc84282aade Added Files: monetdb5/extras/rapi/Tests/rapi01.stable.err monetdb5/extras/rapi/Tests/rapi01.stable.out Modified Files: monetdb5/extras/rapi/rapi.c Branch: RIntegration Log Message:
R API: Minor cleanup rapi.c and test case approval diffs (130 lines): diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.err b/monetdb5/extras/rapi/Tests/rapi01.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/extras/rapi/Tests/rapi01.stable.err @@ -0,0 +1,29 @@ +stderr of test 'rapi01` in directory 'monetdb5/extras/rapi` itself: + + +# 15:45:24 > +# 15:45:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32234" "--set" "mapi_usock=/var/tmp/mtest-13776/.s.monetdb.32234" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi" "rapi01.mal" +# 15:45:24 > + +# builtin opt gdk_dbpath = /export/scratch2/hannes/monetdb-rint-install/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 = 32234 +# cmdline opt mapi_usock = /var/tmp/mtest-13776/.s.monetdb.32234 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch2/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi + +# 15:45:24 > +# 15:45:24 > "Done." +# 15:45:24 > + diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.out b/monetdb5/extras/rapi/Tests/rapi01.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/extras/rapi/Tests/rapi01.stable.out @@ -0,0 +1,68 @@ +stdout of test 'rapi01` in directory 'monetdb5/extras/rapi` itself: + + +# 15:45:24 > +# 15:45:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32234" "--set" "mapi_usock=/var/tmp/mtest-13776/.s.monetdb.32234" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi" "rapi01.mal" +# 15:45:24 > + +# MonetDB 5 server v11.16.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.592 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://bristol.ins.cwi.nl:32234/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13776/.s.monetdb.32234 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded +function user.main():void; +# Error handling tests + b := bat.new(:oid,:int); + bat.append(b,1804289383); + bat.append(b,846930886); + bat.append(b,1681692777); + bat.append(b,1714636915); + bat.append(b,1957747793); + bat.append(b,424238335); + bat.append(b,719885386); + bat.append(b,1649760492); + bat.append(b,596516649); + bat.append(b,1189641421); + io.print(b); +# illegal variables being used + r:bat[:oid,:dbl] := rapi.eval("someresult <- Re(fft(somevalue));",b); + r:bat[:oid,:dbl] := rapi.eval("someresult <- Re(fft(arg2));",b); + r:bat[:oid,:dbl] := rapi.eval("ret0 <- Re(fft(somevalue));",b); + r:bat[:oid,:dbl] := rapi.eval("ret1 <- Re(fft(arg2));",b); + r:bat[:oid,:dbl] := rapi.eval("ret0 <- Re(fft(arg5));",b); +# illegal R expressions + r:bat[:oid,:dbl] := rapi.eval("ret0 <- Re(fft(arg2) ) );",b); + io.print(r); +end main; +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 1804289383 ] +[ 1@0, 846930886 ] +[ 2@0, 1681692777 ] +[ 3@0, 1714636915 ] +[ 4@0, 1957747793 ] +[ 5@0, 424238335 ] +[ 6@0, 719885386 ] +[ 7@0, 1649760492 ] +[ 8@0, 596516649 ] +[ 9@0, 1189641421 ] +#Running R expression someresult <- Re(fft(somevalue)); +#Error in fft(somevalue) : object 'somevalue' not found + +#Error in fft(somevalue) : object 'somevalue' not found +!MALException:rapi.eval:someresult <- Re(fft(somevalue)); + +# 15:45:24 > +# 15:45:24 > "Done." +# 15:45:24 > + diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c --- a/monetdb5/extras/rapi/rapi.c +++ b/monetdb5/extras/rapi/rapi.c @@ -114,11 +114,6 @@ void writeConsoleEx(const char * buf, in THRprintf(GDKout, "%s", buf); } -char * R_HomeDir(void) { - return "/usr/lib64/R/lib"; -//return "/export/scratch1/hannes/fakefs/lib64/R"; -} - static void RAPIinitialize(void) { char *rargv[] = { "whatever", "--quiet", "--no-save", "--vanilla" }; char* rhome = "/usr/lib64/R"; // TODO: get this from ./configure or a call to system() @@ -257,7 +252,6 @@ str RAPIeval(Client cntxt, MalBlkPtr mb, strcat(argnames,","); } } - // TODO: What do we do about factor values? sprintf(rcall, "ret <- as.data.frame((function(%s){%s})(%s),nm=NA,stringsAsFactors=F)\n", argnames, exprStr, argnames); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
