Changeset 2781

Timestamp:

Feb 6, 2012 9:27:47 AM (12 years ago)

Author:

dkearney

Message:

updating R bindings return values.

Location:

trunk

Files:

• examples/lang/R/functions_examples.R (modified) (1 diff)
• lang/R/Rappture/src/RpLibraryRInterface.cc (modified) (4 diffs)

trunk/examples/lang/R/functions_examples.R

@@ -3 +3 @@
 
 lib = rp_lib("driver.xml")
-lib
+cat("lib = ",lib,"\n")
 
 ee = rp_lib_get_string(lib,"input.string(ee).current")
-is.character(ee)
-ee
+cat("ee = ",ee," is.character = ",is.character(ee),"\n")
 
 dd = rp_lib_get_double(lib,"input.number(temperature).current")
-is.real(dd)
-dd
+cat("dd = ",dd," is.real = ",is.real(dd),"\n")
 
 ii = rp_lib_get_integer(lib,"input.integer(ii).current")
-is.integer(ii)
-ii
+cat("ii = ",ii," is.integer = ",is.integer(ii),"\n")
 
 bb = rp_lib_get_boolean(lib,"input.boolean(bb).current")
-is.logical(bb)
-bb
+cat("bb = ",bb," is.logical = ",is.logical(bb),"\n")
 
-ff = rp_lib_get_file(lib,"input.string(ee).current","myoutfile")
-is.integer(ff)
-ff
+nbytes = rp_lib_get_file(lib,"input.string(ee).current","myoutfile")
+cat("nbytes = ",nbytes," is.integer = ",is.integer(nbytes),"\n")
 
-ps = rp_lib_put_string(lib,"output.string(ps).current","voodoo",TRUE)
-is.integer(ps)
-ps
+err = rp_lib_put_string(lib,"output.string(ps).current","voodoo",TRUE)
+cat("err = ",err," is.integer = ",is.integer(err),"\n")
 
 d = as.real(12.45)
-pd = rp_lib_put_double(lib,"output.number(ps).current",d,TRUE)
-is.integer(pd)
-pd
+err = rp_lib_put_double(lib,"output.number(ps).current",d,TRUE)
+cat("err = ",err," is.integer = ",is.integer(err),"\n")
 
 pf = rp_lib_put_file(lib,"output.string(pf).current","myoutfile",FALSE,FALSE)
-is.integer(pf)
-pf
+cat("err = ",err," is.integer = ",is.integer(err),"\n")
 
 result = rp_lib_result(lib)
-is.integer(result)
-result
+cat("result = ",result," is.integer = ",is.integer(result),"\n")
 
 result = rp_units_convert_double("0C","F")
-is.real(result)
-result
+cat("result = ",result," is.real = ",is.real(result),"\n")
 
 show = TRUE
 result = rp_units_convert_string("100mm","m",show)
-is.character(result)
-result
+cat("result = ",result," is.character = ",is.character(result),"\n")
 
 show = FALSE
 result = rp_units_convert_string("100mm","m",show)
-is.character(result)
-result
+cat("result = ",result," is.character = ",is.character(result),"\n")
 
 percent = as.integer(56)
 result = rp_utils_progress(percent,"almost done...")
-is.integer(result)
-result
+cat("result = ",result," is.integer = ",is.integer(result),"\n")
 
 result = rp_utils_progress(76,"almost done...")
-is.integer(result)
-result
+cat("result = ",result," is.integer = ",is.integer(result),"\n")
 
 result = rp_utils_progress(36.546,"almost done...")
-is.integer(result)
-result
+cat("result = ",result," is.integer = ",is.integer(result),"\n")

trunk/lang/R/Rappture/src/RpLibraryRInterface.cc

@@ -464 +464 @@
 
 
-    INTEGER(ans)[0] = 1;
+    INTEGER(ans)[0] = 0;
 
     UNPROTECT(1);
@@ -554 +554 @@
                  appendVal);
 
-    INTEGER(ans)[0] = 1;
+    INTEGER(ans)[0] = 0;
 
     UNPROTECT(1);
@@ -642 +642 @@
              appendVal);
 
-    INTEGER(ans)[0] = 1;
+    INTEGER(ans)[0] = 0;
 
     UNPROTECT(1);
@@ -739 +739 @@
                  appendVal);
 
-    INTEGER(ans)[0] = 1;
+    INTEGER(ans)[0] = 0;
 
     UNPROTECT(1);