rserve-client 0.1.4 → 0.1.5

data/History.txt

@@ -1,4 +1,4 @@
-=== 0.1.4 / 2010-05-24
+=== 0.1.5 / 2010-05-24
 * Bug fix: Incorrect NA for Logical, String and Double Vector
 * Factors implemented
 

data/Manifest.txt

@@ -12,6 +12,7 @@ lib/rserve/protocol.rb
 lib/rserve/protocol/rexpfactory.rb
 lib/rserve/rexp.rb
 lib/rserve/rexp/double.rb
+lib/rserve/rexp/factor.rb
 lib/rserve/rexp/genericvector.rb
 lib/rserve/rexp/integer.rb
 lib/rserve/rexp/language.rb
@@ -22,15 +23,18 @@ lib/rserve/rexp/string.rb
 lib/rserve/rexp/symbol.rb
 lib/rserve/rexp/unknown.rb
 lib/rserve/rexp/vector.rb
+lib/rserve/rfactor.rb
 lib/rserve/rlist.rb
 lib/rserve/talk.rb
 spec/rserve_connection_spec.rb
 spec/rserve_double_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_rexpfactory_spec.rb
+spec/rserve_rfactor_spec.rb
 spec/rserve_spec.rb
 spec/rserve_talk_spec.rb
 spec/spec.opts

data/README.txt

@@ -43,7 +43,7 @@ Cons:
     * Seamless integration with ruby. Every method and object is treated like a Ruby one
   * Cons:
     * Transformation between R and Ruby types aren't trivial
-    * Dependent of operating system, Ruby implementation and R version
+    * Dependent on operating system, Ruby implementation and R version
     * Not available for alternative implementations of Ruby (JRuby, IronRuby and Rubinius)
     
     
@@ -54,7 +54,6 @@ Implements
 * REXPs
   * Enviroment
   * ExpressionVector
-  * Factor
   * Raw
   * Reference
   * S4

data/lib/rserve.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 module Rserve
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end
 
 

data/lib/rserve/rexp/factor.rb

@@ -0,0 +1,23 @@
+module Rserve
+  class REXP
+    class Factor < REXP::Integer
+      def initialize(ids,levels,attr=nil)
+        super(ids,attr)
+        @levels = (levels.nil?)? Array.new : levels;
+        @factor = RFactor.new(@payload, @levels, false, 1)
+      end
+      def factor?
+        true
+      end
+      def as_factor
+        @factor
+      end
+      def as_strings
+        @factor.as_strings
+      end
+      def to_s
+        super+"[#{levels.length}]"
+      end
+    end
+  end
+end

data/lib/rserve/rfactor.rb

@@ -0,0 +1,62 @@
+module Rserve
+  class RFactor
+    attr_reader :ids
+    attr_reader :levels
+    attr_reader :index_base
+    def initialize(i,v,copy,index_base)
+      i=[] if i.nil?
+      v=[] if v.nil?
+      if (copy)
+        @ids=i.dup
+        @levels=v.dup
+      else
+        @ids=i
+        @levels=v
+      end
+      @index_base=index_base
+    end
+    # returns the level of a given case
+		# * @param i case number
+		# * @return name. may throw exception if out of range 
+    def [](i)
+      li = @ids[i]-index_base
+      return (li<0 or li>levels.length) ? nil : levels[li]
+    end
+    def contains?(li)
+      li=level_index(li) if li.is_a? String
+      @ids.any? {|v| v==li}
+    end
+    
+   # return the index of a given level name or -1 if it doesn't exist
+    def level_index(name)
+        return nil if name.nil?
+        levels.length.times {|i|
+          return i+index_base if !levels[i].nil? and levels[i]==name
+        }
+        return nil
+    end
+    def count(li) 
+      li=level_index(li) if li.is_a? String
+      @ids.inject(0) {|ac,v| ac+ ((v==li) ? 1 : 0 ) }
+    end
+    # return a hash with levels as keys and  counts as values
+    def counts_hash
+      h=@levels.inject({}) {|ac,v| ac[v]=0;ac}
+      @ids.each {|v| h[@levels[v-index_base]]+=1}
+      h
+    end
+    def as_integers
+      @ids
+    end
+    def as_strings
+      @ids.map {|v| @levels[v-index_base]}
+    end
+    def index_at(i)
+      @ids[i]
+    end
+    def size
+      @ids.length
+    end
+    alias  :at :[]
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -95,6 +95,7 @@ files:
 - lib/rserve/protocol/rexpfactory.rb
 - lib/rserve/rexp.rb
 - lib/rserve/rexp/double.rb
+- lib/rserve/rexp/factor.rb
 - lib/rserve/rexp/genericvector.rb
 - lib/rserve/rexp/integer.rb
 - lib/rserve/rexp/language.rb
@@ -105,15 +106,18 @@ files:
 - lib/rserve/rexp/symbol.rb
 - lib/rserve/rexp/unknown.rb
 - lib/rserve/rexp/vector.rb
+- lib/rserve/rfactor.rb
 - lib/rserve/rlist.rb
 - lib/rserve/talk.rb
 - spec/rserve_connection_spec.rb
 - spec/rserve_double_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_rexpfactory_spec.rb
+- spec/rserve_rfactor_spec.rb
 - spec/rserve_spec.rb
 - spec/rserve_talk_spec.rb
 - spec/spec.opts