rserve-client 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.2.3 / 2010-07-02
+* Bug fix: assignation of double vector with NA doesn't work right
+
 === 0.2.2 / 2010-06-24
 * ¿Bug? fix: a R matrix with a 0 dims raise an error [clbustos]
 * Bug fix on rexpfactory: typo on creation of S4

data/lib/rserve.rb

@@ -1,7 +1,7 @@
 require 'socket'
 require 'rbconfig'
 module Rserve
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
   ON_WINDOWS=RbConfig::CONFIG['arch']=~/mswin|mingw/
 end
 

data/lib/rserve/packet.rb

@@ -5,6 +5,7 @@ module Rserve
 
     ERROR_DESCRIPTIONS={
       2=>'Invalid expression',
+      3=>'Parse error',
     127=>'Unknown variable/method'}
 
     def initialize(cmd, cont)

data/lib/rserve/protocol.rb

@@ -209,6 +209,7 @@ module Rserve
     def longBitsToDouble(bits)
       (bits==LONG_NA) ? Rserve::REXP::Double::NA : [bits].pack("Q").unpack("d")[0]
     end
+    
     # Complete version of longBitsToDouble, as Java documentation established 
     def longBitsToDouble_old(bits) # :nodoc:
       s = ((bits >> 63) == 0) ? 1 : -1;

data/lib/rserve/protocol/rexpfactory.rb

@@ -80,6 +80,7 @@ module Rserve
         STDERR.puts("Warning: #{type} SEXP size mismatch")
       end
       def initialize(*args)
+        @attr=nil
         if args.size==0
 
         elsif
@@ -563,6 +564,7 @@ module Rserve
         elsif(rxt==XT_INT)
           set_int(cont.as_integer, buf, off)
         elsif(rxt==XT_DOUBLE)
+
           set_long(doubleToRawLongBits(cont.as_double), buf, off)
         elsif(rxt==XT_ARRAY_INT)
           ia=cont.as_integers
@@ -585,10 +587,17 @@ module Rserve
           end
 
         elsif(rxt==XT_ARRAY_DOUBLE)
-          da=cont.as_doubles
+          da=cont.payload
           io=off
           da.each do |v|
-            set_long(doubleToRawLongBits(v),buf,io)
+            # HACK
+            # On i686, NA returns [162, 7, 0, 0, 0, 0, 240, 127]
+            # So if we got a Double::NA, we should set mannualy this array
+            if v==REXP::Double::NA
+              buf[io,8]=REXP::Double::NA_ARRAY
+            else
+              set_long(doubleToRawLongBits(v), buf, io)
+            end
             io+=8
           end
         elsif(rxt==XT_RAW)

data/lib/rserve/rexp/double.rb

@@ -10,7 +10,9 @@ module Rserve
         else
           NA = 0x100000000007a2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
       end
-
+      
+      NA_ARRAY=[162, 7, 0, 0, 0, 0, 240, 127]
+      
       def initialize(data, attrs=nil)
         @payload=case data
       when Numeric

data/spec/rserve_connection_spec.rb

@@ -50,6 +50,11 @@ describe Rserve::Connection do
       @r.assign("x","a string")
       @r.eval("x").to_ruby.should=="a string"
     end
+    it "should assign an array with nils values" do
+      
+      @r.assign('x',[1.0,2.5,nil])
+      @r.eval('x').to_ruby.should==[1.0,2.5,nil]
+    end
 
   end
   describe "assign using REXPs" do
@@ -64,7 +69,30 @@ describe Rserve::Connection do
       @r.assign("x", rexp)
       @r.eval("x").should==rexp
     end
+    it "should assign a double with nils and set correctly the nils" do
+      rexp=Rserve::REXP::Double.new([1.5, Rserve::REXP::Double::NA, -1.5])
+      @r.assign("x", rexp)
+      @r.eval('is.na(x)').to_ruby.should==[false,true,false]
+    end
+    it "should assign a integer with nils and set correctly the nils" do
+      rexp=Rserve::REXP::Integer.new([1, Rserve::REXP::Integer::NA, 2])
+      @r.assign("x", rexp)
+      @r.eval('is.na(x)').to_ruby.should==[false,true,false]
+    end
     
+    
+    it "should assign a double with nils and return correct values" do
+      rexp=Rserve::REXP::Double.new([1.5,Rserve::REXP::Double::NA, -1.5])
+      @r.assign("x", rexp)
+      rexp_out=@r.eval("x")
+      rexp_out.payload.should==rexp.payload
+    end
+    it "should assign a integer with nils and return correct values" do
+      rexp=Rserve::REXP::Integer.new([1,Rserve::REXP::Integer::NA, 2])
+      @r.assign("x", rexp)
+      rexp_out=@r.eval("x")
+      rexp_out.payload.should==rexp.payload
+    end
     it "should assign a null" do
       rexp=Rserve::REXP::Null.new
       @r.assign("x", rexp)

data/spec/rserve_double_spec.rb

@@ -12,9 +12,6 @@ describe Rserve::REXP::Double do
       a=Rserve::REXP::Double.new(payload)
       a.payload.should==[1.1]
     end
-
-
-
   end
   describe "NA management" do
     before do

data/spec/rserve_rexp_wrapper_spec.rb

@@ -46,5 +46,4 @@ describe Rserve::REXP::Wrapper do
     Rserve::REXP::Wrapper.wrap([true,nil]).should==Rserve::REXP::Logical.new([1,Rserve::REXP::Logical::NA])
     Rserve::REXP::Wrapper.wrap(["a",nil]).should==Rserve::REXP::String.new(["a", Rserve::REXP::String::NA])
   end
-
 end

data/spec/rserve_rexpfactory_spec.rb

@@ -55,9 +55,9 @@ describe Rserve::Protocol::REXPFactory do
     la.as_integers.should==(-10..10).to_a
   end
   it "should process double vector with NA" do
-    la=@r.eval("c(1,NA)")
+    la=@r.eval("c(1.0,2.0, NA)")
     la.should be_instance_of(Rserve::REXP::Double)
-    la.na?.should==[false,true]
+    la.na?.should==[false,false,true]
 
   end
   it "should process string vector" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-06-24 00:00:00 -04:00
+date: 2010-07-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency