rserve-client 0.1.7 → 0.1.8

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.1.8 / 2010-06-01
+
+* Bug fix: attributes for generic vectors (data.frames) stored correctly. A Double vector without attribute dim raises an error on #to_ruby
+* Almost complete REXP#to_ruby according to http://wiki.github.com/clbustos/Rserve-Ruby-client/to_ruby-worflow
+* Updated examples
+
+
 === 0.1.7 / 2010-05-28
 
 * Reimplement Rlist as an Array with module WithNames included

data/Manifest.txt

@@ -1,5 +1,3 @@
-.autotest
-.gitignore
 Examples.txt
 History.txt
 Manifest.txt
@@ -39,11 +37,13 @@ lib/rserve/withattributes.rb
 lib/rserve/withnames.rb
 spec/rserve_connection_spec.rb
 spec/rserve_double_spec.rb
+spec/rserve_genericvector_spec.rb
 spec/rserve_integer_spec.rb
 spec/rserve_logical_spec.rb
 spec/rserve_packet_spec.rb
 spec/rserve_protocol_spec.rb
 spec/rserve_rexp_spec.rb
+spec/rserve_rexp_to_ruby_spec.rb
 spec/rserve_rexp_wrapper_spec.rb
 spec/rserve_rexpfactory_spec.rb
 spec/rserve_rfactor_spec.rb

data/README.txt

@@ -86,7 +86,8 @@ Spec
     # The API could manage complex recursive list
     
     x=con.eval('list(l1=list(c(2,3)),l2=c(1,2,3))').to_ruby
-    => {"l1"=>[[(2/1), (3/1)]], "l2"=>[(1/1), (2/1), (3/1)]}
+    => #<Array:19590368 [#<Array:19590116 [[(2/1), (3/1)]] names:nil>, [(1/1), (2/1), (3/1)]] names:["l1", "l2"]>
+
     
     # You could assign a REXP to R variables
 

data/examples/lowless.rb

@@ -6,5 +6,7 @@ c = Rserve::Connection.new();
 c.assign("x", data_x);
 c.assign("y", data_y);
 l = c.eval("lowess(x,y)").as_list
-lx = l.at("x").as_floats
-ly = l.at("y").as_floats
+lx = l["x"].as_floats
+ly = l["y"].as_floats
+puts "lx:#{lx}"
+puts "ly:#{ly}"

data/lib/rserve.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 module Rserve
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end
 
 

data/lib/rserve/protocol/rexpfactory.rb

@@ -74,7 +74,7 @@ module Rserve
         @cont
       end
       def get_attr
-        attr.nil? ? nil : attr.cont
+        @attr.nil? ? nil : @attr.cont
       end
       def sexp_mismatch(type)
         STDERR.puts("Warning: #{type} SEXP size mismatch")
@@ -118,10 +118,12 @@ module Rserve
         end
       end
       def parse_REXP(buf,o)
-        puts "buffer:#{buf.to_s} | o= #{o}" if $DEBUG
 
         xl=get_len(buf,o)
         has_at  = (buf[o]&128)!=0
+        
+        puts "content:#{buf.slice(o,xl+4)} '#{buf.slice(o+4,xl+4).pack("C*")}'" if $DEBUG
+        
         is_long = (buf[o]&64 )!=0
         xt = buf[o]&63
         o+=4 if is_long
@@ -131,9 +133,14 @@ module Rserve
 
         @attr=REXPFactory.new()
         @cont=nil
-        o = attr.parse_REXP(buf,o) if has_at
+        if has_at
+          puts "Processing attribs:" if $DEBUG
+          o = attr.parse_REXP(buf,o)
+          puts "FINAL ATTRIB:" if $DEBUG
+          pp get_attr.as_list if $DEBUG
+        end
+        puts "REXP: #{xt_name(@type)}(#{@type})[#{o},#{xl}], attr?:#{has_at}, attr=[#{get_attr}]" if $DEBUG
 
-        puts "REXP: #{xt_name(@type)}(#{@type})[#{xl}], attr?:#{has_at}, attr=[#{get_attr}]" if $DEBUG
 
 
         if xt==XT_NULL
@@ -233,7 +240,7 @@ module Rserve
             $STDERR.puts "int SEXP size mismatch"
             o=eox
           end
-
+          
           # hack for factors
           if (!get_attr.nil?)
             ca = get_attr().as_list["class"]
@@ -244,10 +251,9 @@ module Rserve
               xt = XT_FACTOR;
             end
           end
-
-
-
+          
           if @cont.nil?
+            
             @cont=REXP::Integer.new(d,get_attr)
           end
           return o
@@ -263,6 +269,7 @@ module Rserve
         end
 
         if xt==XT_LIST_NOTAG or xt==XT_LIST_TAG or xt==XT_LANG_NOTAG or xt==XT_LANG_TAG
+          
           lc=REXPFactory.new
           nf=REXPFactory.new
           l=Rlist.new
@@ -271,19 +278,21 @@ module Rserve
             o=lc.parse_REXP(buf,o)
             if(xt==XT_LIST_TAG or xt==XT_LANG_TAG)
               o=nf.parse_REXP(buf,o)
-
+              
               name=nf.cont.as_string if(nf.cont.symbol? or nf.cont.string?)
             end
+            puts "Agregando '#{name}'='#{lc.cont.inspect}'" if $DEBUG
             if name.nil?
               l.push(lc.cont)
             else
               l.put(name,lc.cont)
             end
           end
+          p l.inspect if $DEBUG
 
           @cont=(xt==XT_LANG_NOTAG or xt==XT_LANG_TAG) ?
-          REXP::Language.new(l,get_attr) : REXP::List.new(l, get_attr)
-
+          REXP::Language.new(l, get_attr) : REXP::List.new(l, get_attr)
+          pp @cont if $DEBUG
           if(o!=eox)
             $STDERR.puts "Mismatch"
             o=eox
@@ -343,14 +352,13 @@ module Rserve
           end
           # fixup for lists since they're stored as attributes of vectors
           if !get_attr.nil? and !get_attr.as_list['names'].nil?
+            puts "PROCESSING NAMES" if $DEBUG
             nam=get_attr.as_list['names']
             names=nil
             if nam.string?
               names=nam.as_strings
             elsif nam.vector?
-              l=nam.to_a
-              names=Array.new(aa.length)
-              aa.length.times {|i| names[i]=aa[i].as_string}
+              names=nam.as_list.map {|v| v.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)

data/lib/rserve/rexp.rb

@@ -11,6 +11,9 @@ module Rserve
     def initialize(attr=nil)
       # Sorry for this, but I think is necessary to maintain sanity of attributes
       raise ArgumentError, "Attribute should be a REXP::List, #{attr.class} provided" unless attr.nil? or attr.is_a? REXP::List
+      
+
+      
       @attr=attr
     end
     # specifies how many items of a vector or list will be displayed in {@link #toDebugString}
@@ -188,20 +191,20 @@ module Rserve
     #
     # @return 2D array of doubles in the form double[rows][cols] or <code>null</code> if the contents is no 2-dimensional matrix of doubles
     def as_double_matrix()
-    ct = as_doubles()
-    dim = get_attribute "dim"
-    raise MismatchException, "matrix (dim attribute missing)" if dim.nil?
-    ds = dim.as_integers
-    raise MismatchException, "matrix (wrong dimensionality)"     if (ds.length!=2)
-    m,n = ds[0], ds[1]
-    # R stores matrices as matrix(c(1,2,3,4),2,2) = col1:(1,2), col2:(3,4)
-    # we need to copy everything, since we create 2d array from 1d array
-    r=m.times.map {|i| n.times.map {|j| ct[j*n+i]}}
+      ct = as_doubles()
+      dim = get_attribute "dim"
+      raise MismatchException, "matrix (dim attribute missing)" if dim.nil?
+      ds = dim.as_integers
+      raise MismatchException, "matrix (wrong dimensionality)"     if (ds.length!=2)
+      m,n = ds[0], ds[1]
+      # R stores matrices as matrix(c(1,2,3,4),2,2) = col1:(1,2), col2:(3,4)
+      # we need to copy everything, since we create 2d array from 1d array
+      r=m.times.map {|i| n.times.map {|j| ct[j*n+i]}}
     end
     # Returns a standard library's matrix
     def as_matrix
-    require 'matrix'
-    Matrix.rows(as_double_matrix)
+      require 'matrix'
+      Matrix.rows(as_double_matrix)
     end
     
     # :section: tools

data/lib/rserve/rexp/double.rb

@@ -49,6 +49,13 @@ module Rserve
       t=super
       t << "{"  << @payload.map(&:to_s).join(",") << "}"
     end
+    def to_ruby
+      if !attr.nil? and !attr.as_list['dim'].nil? and attr.as_list['dim'].to_ruby.size==2
+        as_matrix
+      else
+        super
+      end
+    end
   end
 end
 end

data/lib/rserve/rexp/genericvector.rb

@@ -5,7 +5,7 @@ module Rserve
       def initialize(list, attr=nil)
         super(attr)
         @payload=list.nil? ? Rlist.new() : list
-        if (payload.named?)
+        if (attr.nil? and payload.named? )
           @attr = REXP::List.new(
           Rlist.new([REXP::String.new(payload.keys())],
           ["names"]));

data/lib/rserve/rexp/logical.rb

@@ -59,6 +59,17 @@ module Rserve
       def false?
         @payload.map {|v| v==FALSE}
       end
+      
+      def to_ruby
+        if @payload.nil? or @payload.size==0
+          nil
+        elsif @payload.size==1
+          @payload[0]==1 ? true : false
+        else
+          @payload.map {|v| na?(v) ? nil : (v==1 ? true : false)}
+        end
+      end
+      
     end
   end
 end

data/lib/rserve/rexp/string.rb

@@ -22,8 +22,12 @@ module Rserve
         @payload
       end
       
-      def na?
-        @payload.map {|v| v=='NA'}
+      def na?(value=nil)
+        if value.nil?
+          @payload.map {|v| v==NA}
+        else
+          value==NA
+        end
       end
       def to_debug_string
         t=super

data/lib/rserve/rlist.rb

@@ -37,7 +37,9 @@ module Rserve
     #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

data/spec/rserve_genericvector_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+
+describe Rserve::REXP::GenericVector do
+  describe "initialization" do
+    it "should accept Rlist as payload and create an attrib called 'names'" do
+      payload=Rserve::Rlist.new([1,2,3],%w{a b c})
+      a=Rserve::REXP::GenericVector.new(payload)
+      a.payload.should==payload
+      a.attr.as_list['names'].to_ruby.should==%w{a b c}
+    end
+    it "should accept Rlist and attribs as payload" do
+      payload=Rserve::Rlist.new([1,2,3],%w{a b c})
+      attribs=Rserve::REXP::List.new(Rserve::Rlist.new([Rserve::REXP::String.new(%w{a b c}), Rserve::REXP::String.new('data.frame')],%w{names class}))
+      a=Rserve::REXP::GenericVector.new(payload,attribs)
+      a.payload.should==payload
+      a.attr.should==attribs
+    end
+    
+  end
+end

data/spec/rserve_rexp_to_ruby_spec.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+
+describe "Rserve::REXP#to_ruby" do
+  describe "method to_ruby" do
+    before do
+      @r=Rserve::Connection.new
+    end
+    it "should return a Fixnum with vector with one integer element" do
+      @r.eval("1").to_ruby.should==1
+    end
+    it "should return an array of Fixnum and nils with vector with two or more elements" do
+      @r.eval("c(1,2,3,NA)").to_ruby.should==[1,2,3,nil]
+    end
+    it "should return a rational with vector with one element" do
+      @r.eval("c(0.5)").to_ruby.should==1.quo(2)
+    end
+    it "should return an array of rationals with vector with more than one elements" do
+      @r.eval("c(0.5,0.5,NA)").to_ruby.should==[1.quo(2), 1.quo(2),nil]
+    end
+    it "should return a Ruby Matrix with R matrix" do
+      @r.eval("matrix(c(1,2,3,4),2,2)").to_ruby.should==Matrix[[1,3],[2,4]]
+    end
+    it "should return a nested array of Ruby Matrixes with vector with more than tree dimensions" 
+    it "should return a boolean with a logical with one element" do
+      @r.eval("TRUE").to_ruby.should be_true
+    end
+    
+    it "should return an array of booleans with a logical with two or more elements" do
+      @r.eval("c(TRUE,FALSE,NA)").to_ruby.should==[true,false,nil]
+    end
+    
+    it "should return a string with a vector with one string" do
+      @r.eval("'a'").to_ruby.should=='a'
+    end
+    it "should return an array of strings with a vector with two or more strings" do
+      @r.eval("c('a','b',NA)").to_ruby.should==['a','b',nil]
+    end
+    it "should return an array extended with Rserve::WithNames for a list" do
+      expected=[1,2,3].extend Rserve::WithNames
+      expected.names=%w{a b c}
+      @r.eval('list(a=1,b=2,c=3)').to_ruby.should==expected
+    end
+  end
+end

data/spec/rserve_rexpfactory_spec.rb

@@ -3,9 +3,11 @@
 require File.dirname(__FILE__)+"/spec_helper.rb"
 
 describe Rserve::Protocol::REXPFactory do
+
   before do
     @r=Rserve::Connection.new
   end
+  
   it "should process null" do
     la=@r.eval("NULL")
     la.should be_instance_of(Rserve::REXP::Null)
@@ -103,6 +105,15 @@ describe Rserve::Protocol::REXPFactory do
     la=@r.eval("list(2,NA)")
     la.should be_true
   end
+
+  it "should process data.frame" do
+    la=@r.eval("data.frame(a=1:10,b=1:10)")
+    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==[1,2,3,4,5,6,7,8,9,10]
+  end
+
   it "should retrieve correct lenght for string" do
     Rserve::Protocol::REXPFactory.new(Rserve::REXP::String.new("a")).get_binary_length.should==8
     Rserve::Protocol::REXPFactory.new(Rserve::REXP::String.new(["a","b"])).get_binary_length.should==8
@@ -133,7 +144,6 @@ describe Rserve::Protocol::REXPFactory do
   end
 
   it "should retrieve correct binary representation for List" do
-    
     rexp=Rserve::REXP::List.new(Rserve::Rlist.new([Rserve::REXP::String.new("a")], ["names"]));
     buf=Array.new(Rserve::Protocol::REXPFactory.new(rexp).get_binary_length)
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-05-28 00:00:00 -04:00
+date: 2010-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,8 +82,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
-- .autotest
-- .gitignore
 - Examples.txt
 - History.txt
 - Manifest.txt
@@ -123,11 +121,13 @@ files:
 - lib/rserve/withnames.rb
 - spec/rserve_connection_spec.rb
 - spec/rserve_double_spec.rb
+- spec/rserve_genericvector_spec.rb
 - spec/rserve_integer_spec.rb
 - spec/rserve_logical_spec.rb
 - spec/rserve_packet_spec.rb
 - spec/rserve_protocol_spec.rb
 - spec/rserve_rexp_spec.rb
+- spec/rserve_rexp_to_ruby_spec.rb
 - spec/rserve_rexp_wrapper_spec.rb
 - spec/rserve_rexpfactory_spec.rb
 - spec/rserve_rfactor_spec.rb
@@ -173,6 +173,7 @@ test_files:
 - spec/rserve_rexp_wrapper_spec.rb
 - spec/rserve_rfactor_spec.rb
 - spec/rserve_connection_spec.rb
+- spec/rserve_rexp_to_ruby_spec.rb
 - spec/rserve_double_spec.rb
 - spec/rserve_withnames_spec.rb
 - spec/rserve_packet_spec.rb
@@ -181,5 +182,6 @@ test_files:
 - spec/rserve_integer_spec.rb
 - spec/rserve_spec.rb
 - spec/rserve_protocol_spec.rb
+- spec/rserve_genericvector_spec.rb
 - spec/rserve_logical_spec.rb
 - spec/rserve_talk_spec.rb

metadata.gz.sig

@@ -1 +1,2 @@
-ze�+V��֐�ʸS�p�Dܤ�!vov~��?u�zt���!�_L4P\�-�3�P����*S�x���ή�W���m;��cP��ѺI�>��KG�8a��q��>�M�E�.��[�QiQ�5����	Ve�}>���6�C�p~�Hb-��*�H'�����jJ9\,g��ȒQ��	��S�F��'�����kH�b��u-����&e�
+ySF�QW�?��~�o��{:����S�J>vh�I���>�<ogl5\�����N�"���i�D��6�����0�|e��J�R�_�c��l�Z�皔�n�R�
���z��0>0�??��Q�M��$K��E��۰����ul��*%d��v<՜��4al�
+N`�t��&��

data/.autotest

@@ -1,23 +0,0 @@
-# -*- ruby -*-
-
-require 'autotest/restart'
-
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end

data/.gitignore

@@ -1,5 +0,0 @@
-coverage.info
-*~
-doc
-pkg
-coverage