Changeset: c0cec0974d09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0cec0974d09
Modified Files:
monetdb5/extras/rapi/Tests/All
monetdb5/extras/rapi/Tests/rapi01.stable.err
monetdb5/extras/rapi/Tests/rapi02.malC
monetdb5/extras/rapi/Tests/rapi02.stable.out
Branch: default
Log Message:
R Integration: hgeint test case fix
diffs (118 lines):
diff --git a/monetdb5/extras/rapi/Tests/All b/monetdb5/extras/rapi/Tests/All
--- a/monetdb5/extras/rapi/Tests/All
+++ b/monetdb5/extras/rapi/Tests/All
@@ -1,7 +1,6 @@
HAVE_LIBR?rapi00
HAVE_LIBR?rapi01
HAVE_LIBR?rapi02
-HAVE_LIBR&HAVE_HGE?rapi02_hge
HAVE_LIBR?rapi03
HAVE_LIBR?rapi04
HAVE_LIBR?rapi05
diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.err
b/monetdb5/extras/rapi/Tests/rapi01.stable.err
--- a/monetdb5/extras/rapi/Tests/rapi01.stable.err
+++ b/monetdb5/extras/rapi/Tests/rapi01.stable.err
@@ -30,27 +30,27 @@ stderr of test 'rapi01` in directory 'mo
# 16:45:15 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-95437" "--port=33997"
# 16:45:15 >
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <-
Re(fft(somevalue));",b);
ERROR = !MALException:rapi.eval:Error running R expression. Error message:
Error in fft(somevalue) : object 'somevalue' not found
!Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <-
Re(fft(arg2));",b);
ERROR = !MALException:rapi.eval:Error running R expression. Error message:
Error in fft(arg2) : object 'arg2' not found
!Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b);
ERROR = !MALException:rapi.eval:Error running R expression. Error message:
Error in fft(somevalue) : object 'somevalue' not found
!Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b);
ERROR = !MALException:rapi.eval:Error running R expression. Error message:
Error in fft(arg2) : object 'arg2' not found
!Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b);
ERROR = !MALException:rapi.eval:Error running R expression. Error message:
Error in fft(arg5) : object 'arg5' not found
!Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2) ) );",b);
ERROR = !MALException:rapi.eval:Error parsing R expression 'ret0 <-
Re(fft(arg2) ) );'.
diff --git a/monetdb5/extras/rapi/Tests/rapi02.malC
b/monetdb5/extras/rapi/Tests/rapi02.malC
--- a/monetdb5/extras/rapi/Tests/rapi02.malC
+++ b/monetdb5/extras/rapi/Tests/rapi02.malC
@@ -54,6 +54,14 @@ bat.append(blng,1714636915L);
rlng:bat[:oid,:dbl] := rapi.eval(nil:ptr,"Re(fft(na.omit(arg1)))",blng);
io.print(rlng);
+bhge:= bat.new(:oid,:hge);
+bat.append(bhge,1804289383:hge);
+bat.append(bhge,846930886:hge);
+bat.append(bhge,1681692777:hge);
+bat.append(bhge,1714636915:hge);
+rhge:bat[:oid,:dbl] := rapi.eval(nil:ptr,"Re(fft(na.omit(arg1)))",bhge);
+io.print(rhge);
+
# floating point
@@ -104,6 +112,9 @@ io.print(rintbi2);
rintbl:bat[:oid,:lng] := rapi.eval(nil:ptr,"as.integer(arg1)",binto);
io.print(rintbl);
+rintbh:bat[:oid,:hge] := rapi.eval(nil:ptr,"as.integer(arg1)",binto);
+io.print(rintbh);
+
rintbd:bat[:oid,:dbl] := rapi.eval(nil:ptr,"as.numeric(arg1)",binto);
io.print(rintbd);
@@ -113,3 +124,5 @@ io.print(rintbs);
# factors should be strings
rintbf:bat[:oid,:str] := rapi.eval(nil:ptr,"as.factor(arg1)",binto);
io.print(rintbf);
+
+
diff --git a/monetdb5/extras/rapi/Tests/rapi02.stable.out
b/monetdb5/extras/rapi/Tests/rapi02.stable.out
--- a/monetdb5/extras/rapi/Tests/rapi02.stable.out
+++ b/monetdb5/extras/rapi/Tests/rapi02.stable.out
@@ -77,6 +77,15 @@ Ready.
[ 1@0, 122596606 ]
[ 2@0, 924414359 ]
[ 3@0, 122596606 ]
+#io.print(rhge);
+#--------------------------#
+# h t # name
+# void dbl # type
+#--------------------------#
+[ 0@0, 6047549961 ]
+[ 1@0, 122596606 ]
+[ 2@0, 924414359 ]
+[ 3@0, 122596606 ]
#io.print(rflt);
#--------------------------#
# h t # name
@@ -134,6 +143,16 @@ Ready.
[ 2@0, 1681692777 ]
[ 3@0, 1714636915 ]
[ 4@0, nil ]
+#io.print(rintbh);
+#--------------------------#
+# h t # name
+# void hge # type
+#--------------------------#
+[ 0@0, 1804289383 ]
+[ 1@0, 846930886 ]
+[ 2@0, 1681692777 ]
+[ 3@0, 1714636915 ]
+[ 4@0, nil ]
#io.print(rintbd);
#--------------------------#
# h t # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
