rserve-client 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.2.5 / 2010-07-06
+* Fixed warning: NA values on Double and shadowed variables on blocks
+
 === 0.2.4 / 2010-07-06
 * Bug fixes: double vector with NaN crash to_ruby. Data frame with string row_names crash to_rubyC
 

data/lib/rserve.rb

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

data/lib/rserve/protocol.rb

@@ -14,7 +14,7 @@ module Rserve
         LONG_NA=9221120237041092514 # :nodoc:
       else
         LONG_NA=9218868437227407266 # :nodoc:
-      end
+    end
     # Defines from Rsrv.h
     CMD_RESP=0x010000 # all responses have this flag set
     RESP_OK=(CMD_RESP|0x0001) # command succeeded; returned parameters depend on the command issued

data/lib/rserve/protocol/rexpfactory.rb

@@ -136,7 +136,7 @@ module Rserve
         @cont=nil
         if has_at
           puts "Processing attribs:" if $DEBUG
-          o = attr.parse_REXP(buf,o)
+          o = attr.parse_REXP(buf, o)
           puts "FINAL ATTRIB:" if $DEBUG
           pp get_attr.as_list if $DEBUG
         end
@@ -190,7 +190,7 @@ module Rserve
           as=(eox-o)
           i=0
           d=Array.new(as)
-          (eox-i).times {|i| d[i]=buf[o+i]}
+          (eox-i).times {|ii| d[ii]=buf[o+ii]}
           o=eox
 
           d.length.each {|j|
@@ -205,7 +205,7 @@ module Rserve
           as=get_int(buf, o)
           o+=4
           d=Array.new(as)
-          as.times {|i| d[i]=buf[o+i]}
+          as.times {|ai| d[ai]=buf[o+ai]}
           d.collect! {|v|
             if v!=0 and v!=1
               REXP::Logical::NA
@@ -359,7 +359,7 @@ module Rserve
             if nam.string?
               names=nam.as_strings
             elsif nam.vector?
-              names=nam.as_list.map {|v| v.as_string}
+              names=nam.as_list.map {|vv| vv.as_string}
             end
             l=Rlist.new(v,names)
             @cont=(xt==XT_VECTOR_EXP) ? REXP::ExpressionVector.new(l,get_attr) : REXP::GenericVector.new(l,get_attr)
@@ -535,6 +535,9 @@ module Rserve
         l+=4 if (l>0xfffff0)
         l+4
       end
+      
+      
+      
       def get_binary_representation(buf,off)
         myl=get_binary_length;
         is_large=(myl>0xfffff0);
@@ -593,7 +596,8 @@ module Rserve
             # 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
+            if cont.na? v
+            #if v==REXP::Double::NA
               buf[io,8]=REXP::Double::NA_ARRAY
             else
               set_long(doubleToRawLongBits(v), buf, io)
@@ -611,7 +615,7 @@ module Rserve
           sa.each do |v|
             if !v.nil?
               b=v.unpack("C*")
-              b.each_with_index{|v,index| buf[io+index]=v}
+              b.each_with_index{|vv,index| buf[io+index]=vv}
               io+=b.length
             end
             buf[io]=0
@@ -630,8 +634,8 @@ module Rserve
           lst=cont.as_list
           #p lst
           if !lst.nil?
-            lst.size.times do |i|
-              x=lst.at(i)
+            lst.size.times do |ii|
+              x=lst.at(ii)
               #puts "#{x}"
               x==REXP::Null if x.nil?
               #p buf
@@ -640,7 +644,7 @@ module Rserve
               #p io
               if(rxt==XT_LIST_TAG or rxt==XT_LANG_TAG)
                 
-                io=REXPFactory.new(REXP::Symbol.new(lst.key_at(i))).get_binary_representation(buf, io)
+                io=REXPFactory.new(REXP::Symbol.new(lst.key_at(ii))).get_binary_representation(buf, io)
 
               end
             end #times

data/lib/rserve/rexp/double.rb

@@ -15,58 +15,60 @@ module Rserve
       
       def initialize(data, attrs=nil)
         @payload=case data
-      when Numeric
-        [data.to_f]
-      when Array
-        data
-      else
-        raise ArgumentError, "Should be Numeric or Array"
+          when Numeric
+            [data.to_f]
+          when Array
+            data
+          else
+            raise ArgumentError, "Should be Numeric or Array"
+        end
+        super(attrs)
+      end
+      def length
+        payload.length
+      end
+      def integer?
+        true
+      end
+      def numeric?
+        true
+      end
+      def as_integers
+        @payload.map(&:to_i)
+      end
+      def as_doubles
+        @payload.map do |v|
+          na?(v) ? NA : v.to_f
+        end
+      end
+      def as_strings
+        @payload.map {|v| v.to_f.to_s}
       end
-      super(attrs)
-    end
-    def length
-      payload.length
-    end
-    def integer?
-      true
-    end
-    def numeric?
-      true
-    end
-    def as_integers
-      @payload.map(&:to_i)
-    end
-    def as_doubles
-      @payload.map(&:to_f)
-    end
-    def as_strings
-      @payload.map {|v| v.to_f.to_s}
-    end
 
-    def na?(value=nil)
-      #if value.nil?
-      #  @payload.map {|v| v.respond_to? :nan and v.nan?}
-      #else  
-      #  value.respond_to? :nan? and value.nan?
-      #end
-      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
-      t << "{"  << @payload.map(&:to_s).join(",") << "}"
-    end
-    def to_ruby_internal
-      if dim 
-        if dim.size==2
-          as_matrix
+      def na?(value=nil)
+        #if value.nil?
+        #  @payload.map {|v| v.respond_to? :nan and v.nan?}
+        #else  
+        #  value.respond_to? :nan? and value.nan?
+        #end
+        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
+        t << "{"  << @payload.map(&:to_s).join(",") << "}"
+      end
+      def to_ruby_internal
+        if dim 
+          if dim.size==2
+            as_matrix
+          else
+            as_nested_array
+          end
         else
-          as_nested_array
+          super
         end
-      else
-        super
       end
     end
   end
 end
-end

data/lib/rserve/rexp/factor.rb

@@ -1,6 +1,7 @@
 module Rserve
   class REXP
     class Factor < REXP::Integer
+      attr_reader :levels
       def initialize(ids,levels,attr=nil)
         super(ids,attr)
         @levels = (levels.nil?)? Array.new : levels;

data/lib/rserve/rexp/integer.rb

@@ -6,56 +6,55 @@ module Rserve
       NA = -2147483648;
       def initialize(data, attrs=nil)
         @payload=case data
-      when Integer
-        [data]
-      when Numeric
-        [data.to_i]
-      when Array
-        data
-      else
-        raise ArgumentError, "Should be Numeric or Array"
-      end
-      super(attrs)
-    end
-    def length
-      payload.length
-    end
-    def integer?
-      true
-    end
-    def numeric?
-      true
-    end
-    def as_integers
-      @payload
-    end
-    def as_doubles
-      @payload.map(&:to_f)
-    end
-    def as_strings
-      @payload.map(&:to_s)
-    end
+        when Integer
+          [data]
+        when Numeric
+          [data.to_i]
+        when Array
+          data
+        else
+          raise ArgumentError, "Should be Numeric or Array"
+        end
+        super(attrs)
+      end
+      def length
+        payload.length
+      end
+      def integer?
+        true
+      end
+      def numeric?
+        true
+      end
+      def as_integers
+        @payload
+      end
+      def as_doubles
+        @payload.map(&:to_f)
+      end
+      def as_strings
+        @payload.map(&:to_s)
+      end
 
-    def na?(value=nil)
-      return value == NA unless value.nil?
-      @payload.map {|v| v==NA}
-    end
-    def to_debug_string
-      t=super
-      t << "{"  << @payload.map(&:to_s).join(",") << "}"
-    end
-    def to_ruby_internal
-      if dim
-        if dim.size==2
-          as_matrix
+      def na?(value=nil)
+        return value == NA unless value.nil?
+        @payload.map {|v| v==NA}
+      end
+      def to_debug_string
+        t=super
+        t << "{"  << @payload.map(&:to_s).join(",") << "}"
+      end
+      def to_ruby_internal
+        if dim
+          if dim.size==2
+            as_matrix
+          else
+            as_nested_array
+          end
         else
-          as_nested_array
+          super
         end
-      else
-        super
       end
     end
-    
   end
 end
-end

data/lib/rserve/rlist.rb

@@ -1,7 +1,6 @@
 module Rserve
   class Rlist < Array
     include WithNames
-    attr_reader :data
     def initialize(data=nil, n=nil)
       @names=nil
       if data.nil?
@@ -17,41 +16,41 @@ module Rserve
         end
       end
       
-    if n
-      @names=Array.new(size)
-      n.each_index {|i| @names[i]=n[i]} if n.respond_to? :each_index
+      if n
+        @names=Array.new(size)
+        n.each_index {|i| @names[i]=n[i]} if n.respond_to? :each_index
+      end
     end
-  end
-  def keys
-    @names
-  end
-  # Returns the data without names, as Ruby objects
-  def to_a
-    self.map {|d| d.to_ruby} 
-  end
-  # Returns the data, as REXP
-  def data
-    self.map {|d| d}
-  end
-  def ==(o)
-    #p "Comparing #{self.inspect} with #{o.inspect} gives #{o.is_a? Rlist and self.data==o.data and self.names==o.names}"
-    o.is_a? Rlist and self.data==o.data and self.names==o.names
-  end
-  def to_s
-    super+"[#{size}]"
-  end
-  
-  # Returns an Array with module WithNames included
-  # * Unnamed list: returns an Array
-  # * Named List: returns a Hash. Every element without explicit name receive
-  #   as key the number of element, 1-based
-  #
+    def keys
+      @names
+    end
+    # Returns the data without names, as Ruby objects
+    def to_a
+      self.map {|d| d.to_ruby} 
+    end
+    # Returns the data, as REXP
+    def data
+      self.map {|d| d}
+    end
+    def ==(o)
+      #p "Comparing #{self.inspect} with #{o.inspect} gives #{o.is_a? Rlist and self.data==o.data and self.names==o.names}"
+      o.is_a? Rlist and self.data==o.data and self.names==o.names
+    end
+    def to_s
+      super+"[#{size}]"
+    end
+    
+    # Returns an Array with module WithNames included
+    # * Unnamed list: returns an Array
+    # * Named List: returns a Hash. Every element without explicit name receive
+    #   as key the number of element, 1-based
+    #
 
-  def to_ruby
-    data=to_a
-    data.extend WithNames
-    data.names=@names
-    data
+    def to_ruby
+      data=to_a
+      data.extend WithNames
+      data.names=@names
+      data
+    end
   end
 end
-end

data/lib/rserve/withnames.rb

@@ -16,7 +16,7 @@ module Rserve
     def pretty_print(q)
       q.group(1,'[|WN|',']') {
         q.seplist(self,nil,:each_with_index) {|v,i|
-         if (@names.nil? or @names[i].nil?) 
+          if (@names.nil? or @names[i].nil?) 
            q.pp v
           else
             q.group {
@@ -31,11 +31,11 @@ module Rserve
     def to_s
       out=[]
       self.each_with_index { |v,i| 
-      if !@names.nil? and !@names[i].nil?
-        out.push("#{@names[i]}=#{v}")
-      else
-        out.push("#{v}")
-      end
+        if !@names.nil? and !@names[i].nil?
+          out.push("#{@names[i]}=#{v}")
+        else
+          out.push("#{v}")
+        end
       }
       "[#{out.join(", ")}]"
     end
@@ -141,7 +141,7 @@ module Rserve
             i.nil? ? nil : at(i)
           else
             nil
-         end
+          end
       end
     end
   end

metadata

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