rserve-client 0.2.3 → 0.2.4

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.2.4 / 2010-07-06
+* Bug fixes: double vector with NaN crash to_ruby. Data frame with string row_names crash to_rubyC
+
 === 0.2.3 / 2010-07-02
 * Bug fix: assignation of double vector with NA doesn't work right
 

data/lib/rserve.rb

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

data/lib/rserve/rexp.rb

@@ -406,7 +406,7 @@ module Rserve
       end
       
       # Hack: change attribute row.names according to spec 
-      if !attr.nil? and attr.as_list.has_name? 'class' and attr.as_list['class'].as_string=='data.frame' and attr.as_list['row.names'].as_integers[0]==REXP::Integer::NA
+      if !attr.nil? and attr.as_list.has_name? 'class' and attr.as_list['class'].as_string=='data.frame' and (attr.as_list['row.names'].is_a?(REXP::Integer)) and attr.as_list['row.names'].as_integers[0]==REXP::Integer::NA
         v.attributes['row.names']=(1..(-attr.as_list['row.names'].as_integers[1])).to_a
       end
       

data/lib/rserve/rexp/double.rb

@@ -49,8 +49,8 @@ module Rserve
       #else  
       #  value.respond_to? :nan? and value.nan?
       #end
-      return value.to_i == NA unless value.nil?
-      @payload.map {|v| v.to_i==NA}
+      return ((value.is_a? Float and value.nan?) or value.to_i==NA) unless value.nil?
+      @payload.map {|v| ((v.is_a? Float and v.nan?) or v.to_i==NA)}
     end
     def to_debug_string
       t=super

data/spec/rserve_rexpfactory_spec.rb

@@ -55,9 +55,21 @@ 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.0,2.0, NA)")
+    la=@r.eval("c(0.03091136, NA, 0.07456851, 0.90000000)")
     la.should be_instance_of(Rserve::REXP::Double)
-    la.na?.should==[false,false,true]
+    la.na?.should==[false,true, false, false]
+  end
+  it "should process double vector with NaN" do
+    la=@r.eval("c(NaN,1.3)")
+    la.should be_instance_of(Rserve::REXP::Double)
+    la.na?.should==[true,false]
+  end
+  it "should process list with double vectors with NA" do
+    la=@r.eval("list(RMSE=c(0.03091136, NA, 0.07456851, 0.90000000))")
+    vector=la.as_list[0]
+    vector.should be_instance_of(Rserve::REXP::Double)
+    vector.na?.should==[false,true, false, false]
+    
 
   end
   it "should process string vector" do
@@ -121,6 +133,16 @@ describe Rserve::Protocol::REXPFactory do
     la.attr.as_list['class'].to_ruby.should=="data.frame"
     la.attr.as_list['row.names'].to_ruby.should==[nil,-10]
   end
+  it "should process data.frame with string row.names" do
+    @r.void_eval("df<-data.frame(a=1:10,b=1:10);
+      attr(df,'row.names')<-c('a','b','c',4,5,6,7,8,9,10);")
+    la=@r.eval("df")
+    la.should be_true
+    la.attr.as_list['names'].to_ruby.should==%w{a b}
+    la.attr.as_list['class'].to_ruby.should=="data.frame"
+    la.attr.as_list['row.names'].to_ruby.should==%w{a b c 4 5 6 7 8 9 10}
+  end
+  
   it "should process a nested array" do
     @r.void_eval("c=1:8; attr(c,'dim')<-c(2,2,2)")
     la=@r.eval("c")

metadata

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