daru 0.1.2 → 0.1.3

data/lib/daru/date_time/offsets.rb

@@ -1,4 +1,6 @@
 module Daru
+  # rubocop:disable Style/OpMethod
+
   # Generic class for generating date offsets.
   class DateOffset
     # A Daru::DateOffset object is created by a passing certain options
@@ -15,7 +17,7 @@ module Daru
     # * :weeks - Create a weeks offset
     # * :months - Create a months offset
     # * :years - Create a years offset
-    # 
+    #
     # Additionaly, passing the `:n` option will apply the offset that many times.
     #
     # @example Usage of DateOffset
@@ -23,7 +25,7 @@ module Daru
     #   offset = Daru::DateOffset.new(weeks: 3)
     #   offset + DateTime.new(2012,5,3)
     #   #=> #<DateTime: 2012-05-24T00:00:00+00:00 ((2456072j,0s,0n),+0s,2299161j)>
-    #  
+    #
     #   # Create an offset of 5 hours
     #   offset = Daru::DateOffset.new(hours: 5)
     #   offset + DateTime.new(2015,3,3,23,5,1)
@@ -37,22 +39,22 @@ module Daru
       n = opts[:n] || 1
 
       @offset =
-      case 
-      when opts[:secs]
-        Offsets::Second.new(n*opts[:secs])
-      when opts[:mins]
-        Offsets::Minute.new(n*opts[:mins])
-      when opts[:hours]
-        Offsets::Hour.new(n*opts[:hours])
-      when opts[:days]
-        Offsets::Day.new(n*opts[:days])
-      when opts[:weeks]
-        Offsets::Day.new(7*n*opts[:weeks])
-      when opts[:months]
-        Offsets::Month.new(n*opts[:months])
-      when opts[:years]
-        Offsets::Year.new(n*opts[:years])
-      end
+        case
+        when opts[:secs]
+          Offsets::Second.new(n*opts[:secs])
+        when opts[:mins]
+          Offsets::Minute.new(n*opts[:mins])
+        when opts[:hours]
+          Offsets::Hour.new(n*opts[:hours])
+        when opts[:days]
+          Offsets::Day.new(n*opts[:days])
+        when opts[:weeks]
+          Offsets::Day.new(7*n*opts[:weeks])
+        when opts[:months]
+          Offsets::Month.new(n*opts[:months])
+        when opts[:years]
+          Offsets::Year.new(n*opts[:years])
+        end
     end
 
     # Offset a DateTime forward.
@@ -93,7 +95,7 @@ module Daru
     end
 
     # Create a seconds offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a Seconds offset
     #   offset = Daru::Offsets::Second.new(5)
@@ -110,7 +112,7 @@ module Daru
     end
 
     # Create a minutes offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a Minutes offset
     #   offset = Daru::Offsets::Minute.new(8)
@@ -127,7 +129,7 @@ module Daru
     end
 
     # Create an hours offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a Hour offset
     #   offset = Daru::Offsets::Hour.new(8)
@@ -137,14 +139,14 @@ module Daru
       def multiplier
         0.041666666666666664
       end
-      
+
       def freq_string
         (@n == 1 ? '' : @n.to_s) + 'H'
       end
     end
 
     # Create an days offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a Day offset
     #   offset = Daru::Offsets::Day.new(2)
@@ -161,7 +163,7 @@ module Daru
     end
 
     # Create an months offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a Month offset
     #   offset = Daru::Offsets::Month.new(5)
@@ -182,7 +184,7 @@ module Daru
     end
 
     # Create a years offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a Year offset
     #   offset = Daru::Offsets::Year.new(2)
@@ -239,7 +241,7 @@ module Daru
     end
 
     # Create a month begin offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a MonthBegin offset
     #   offset = Daru::Offsets::MonthBegin.new(2)
@@ -251,14 +253,14 @@ module Daru
       end
 
       def freq_string
-        (@n == 1 ? '' : @n.to_s) + "MB"
+        (@n == 1 ? '' : @n.to_s) + 'MB'
       end
 
       def + date_time
         @n.times do
           days_in_month = Daru::MONTH_DAYS[date_time.month]
-          days_in_month += 1 if date_time.leap? and date_time.month == 2
-          date_time = date_time + (days_in_month - date_time.day + 1)
+          days_in_month += 1 if date_time.leap? && date_time.month == 2
+          date_time += (days_in_month - date_time.day + 1)
         end
 
         date_time
@@ -267,7 +269,7 @@ module Daru
       def - date_time
         @n.times do
           date_time = date_time << 1 if on_offset?(date_time)
-          date_time = DateTime.new(date_time.year, date_time.month, 1, 
+          date_time = DateTime.new(date_time.year, date_time.month, 1,
             date_time.hour, date_time.min, date_time.sec)
         end
 
@@ -280,7 +282,7 @@ module Daru
     end
 
     # Create a month end offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a MonthEnd offset
     #   offset = Daru::Offsets::MonthEnd.new
@@ -296,24 +298,24 @@ module Daru
       end
 
       def + date_time
-        @n.times do 
+        @n.times do
           date_time     = date_time >> 1 if on_offset?(date_time)
           days_in_month = Daru::MONTH_DAYS[date_time.month]
-          days_in_month += 1 if date_time.leap? and date_time.month == 2
+          days_in_month += 1 if date_time.leap? && date_time.month == 2
 
-          date_time = date_time + (days_in_month - date_time.day)
+          date_time += (days_in_month - date_time.day)
         end
 
         date_time
       end
 
       def - date_time
-        @n.times do 
+        @n.times do
           date_time = date_time << 1
           days_in_month = Daru::MONTH_DAYS[date_time.month]
-          days_in_month += 1 if date_time.leap? and date_time.month == 2
+          days_in_month += 1 if date_time.leap? && date_time.month == 2
 
-          date_time = date_time + (days_in_month - date_time.day)
+          date_time += (days_in_month - date_time.day)
         end
 
         date_time
@@ -325,7 +327,7 @@ module Daru
     end
 
     # Create a year begin offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a YearBegin offset
     #   offset = Daru::Offsets::YearBegin.new(3)
@@ -347,7 +349,7 @@ module Daru
 
       def - date_time
         if on_offset?(date_time)
-          DateTime.new(date_time.year - @n, 1, 1, 
+          DateTime.new(date_time.year - @n, 1, 1,
             date_time.hour,date_time.min, date_time.sec)
         else
           DateTime.new(date_time.year - (@n-1), 1, 1)
@@ -360,7 +362,7 @@ module Daru
     end
 
     # Create a year end offset
-    # 
+    #
     # @param n [Integer] The number of times an offset should be applied.
     # @example Create a YearEnd offset
     #   offset = Daru::Offsets::YearEnd.new
@@ -394,4 +396,6 @@ module Daru
       end
     end
   end
-end
+
+  # rubocop:enable Style/OpMethod
+end

data/lib/daru/extensions/rserve.rb

@@ -2,7 +2,7 @@
 
 module Daru
   class DataFrame
-    def to_REXP
+    def to_REXP # rubocop:disable Style/MethodName
       names = @vectors.to_a
       data  = names.map do |f|
         Rserve::REXP::Wrapper.wrap(self[f].to_a)
@@ -14,8 +14,8 @@ module Daru
   end
 
   class Vector
-    def to_REXP
-      Rserve::REXP::Wrapper.wrap(self.to_a)
+    def to_REXP # rubocop:disable Style/MethodName
+      Rserve::REXP::Wrapper.wrap(to_a)
     end
   end
-end
+end

data/lib/daru/index.rb

@@ -3,14 +3,14 @@ module Daru
     include Enumerable
     # It so happens that over riding the .new method in a super class also
     # tampers with the default .new method for class that inherit from the
-    # super class (Index in this case). Thus we first alias the original 
-    # new method (from Object) to __new__ when the Index class is evaluated, 
+    # super class (Index in this case). Thus we first alias the original
+    # new method (from Object) to __new__ when the Index class is evaluated,
     # and then we use an inherited hook such that the old new method (from
     # Object) is once again the default .new for the subclass.
     # Refer http://blog.sidu.in/2007/12/rubys-new-as-factory.html
     class << self
       alias :__new__ :new
-      
+
       def inherited subclass
         class << subclass
           alias :new :__new__
@@ -23,19 +23,14 @@ module Daru
     def self.new *args, &block
       source = args[0]
 
-      idx =
-      if source and source[0].is_a?(Array)
+      if source.respond_to?(:first) && source.first.is_a?(Array)
         Daru::MultiIndex.from_tuples source
-      elsif source and source.is_a?(Array) and !source.empty? and 
-        source.all? { |e| e.is_a?(DateTime) }
+      elsif source && source.is_a?(Array) && !source.empty? &&
+            source.all? { |e| e.is_a?(DateTime) }
         Daru::DateTimeIndex.new(source, freq: :infer)
       else
-        i = self.allocate
-        i.send :initialize, *args, &block
-        i
+        allocate.tap { |i| i.send :initialize, *args, &block }
       end
-
-      idx
     end
 
     def each(&block)
@@ -50,41 +45,54 @@ module Daru
     attr_reader :relation_hash, :size
 
     def initialize index
-      index = 0                         if index.nil?
-      index = Array.new(index) { |i| i} if index.is_a? Integer
-      index = index.to_a                if index.is_a? Daru::Index
-
-      @relation_hash = {}
-      index.each_with_index do |n, idx|
-        @relation_hash[n] = idx 
-      end
+      index =
+        case index
+        when nil
+          []
+        when Integer
+          index.times.to_a
+        when Enumerable
+          index.to_a
+        else
+          raise ArgumentError,
+            "Cannot create index from #{index.class} #{index.inspect}"
+        end
 
-      @relation_hash.freeze
+      @relation_hash = index.each_with_index.to_h.freeze
       @keys = @relation_hash.keys
       @size = @relation_hash.size
     end
 
     def ==(other)
-      return false if self.class != other.class or other.size != @size
+      return false if self.class != other.class || other.size != @size
 
-      @relation_hash.keys   == other.to_a and 
-      @relation_hash.values == other.relation_hash.values
+      @relation_hash.keys == other.to_a &&
+        @relation_hash.values == other.relation_hash.values
     end
 
     def [](*key)
       loc = key[0]
 
-      case 
+      case
       when loc.is_a?(Range)
         first = loc.first
         last = loc.last
 
         slice first, last
       when key.size > 1
-        Daru::Index.new key.map { |k| self[k] }
+        if include? key[0]
+          Daru::Index.new key.map { |k| k }
+        else
+          # Assume the user is specifing values for index not keys
+          # Return index object having keys corresponding to values provided
+          Daru::Index.new key.map { |k| key k }
+        end
       else
         v = @relation_hash[loc]
-        return loc if v.nil?
+        unless v
+          return loc if loc.is_a?(Numeric) && loc < size
+          raise IndexError, "Specified index #{loc.inspect} does not exist"
+        end
         v
       end
     end
@@ -92,9 +100,8 @@ module Daru
     def slice *args
       start   = args[0]
       en      = args[1]
-      indexes = []
 
-      if start.is_a?(Integer) and en.is_a?(Integer)
+      if start.is_a?(Integer) && en.is_a?(Integer)
         Index.new @keys[start..en]
       else
         start_idx = @relation_hash[start]
@@ -111,7 +118,6 @@ module Daru
 
     # Produce a new index from the set intersection of two indexes
     def & other
-      
     end
 
     def to_a
@@ -123,7 +129,7 @@ module Daru
     end
 
     def include? index
-      @relation_hash.has_key? index
+      @relation_hash.key? index
     end
 
     def empty?
@@ -134,8 +140,8 @@ module Daru
       Daru::Index.new @relation_hash.keys
     end
 
-    def _dump depth
-      Marshal.dump({relation_hash: @relation_hash})
+    def _dump(*)
+      Marshal.dump(relation_hash: @relation_hash)
     end
 
     def self._load data
@@ -143,13 +149,21 @@ module Daru
 
       Daru::Index.new(h[:relation_hash].keys)
     end
+
+    # Provide an Index for sub vector produced
+    #
+    # @param input_indexes [Array] the input by user to index the vector
+    # @return [Object] the Index object for sub vector produced
+    def conform(*)
+      self
+    end
   end # class Index
 
   class MultiIndex < Index
     include Enumerable
 
     def each(&block)
-      to_a.each(&block)  
+      to_a.each(&block)
     end
 
     def map(&block)
@@ -159,28 +173,27 @@ module Daru
     attr_reader :labels
 
     def levels
-      @levels.map { |e| e.keys }
+      @levels.map(&:keys)
     end
 
     def initialize opts={}
       labels = opts[:labels]
       levels = opts[:levels]
 
-      raise ArgumentError, 
-        "Must specify both labels and levels" unless labels and levels
       raise ArgumentError,
-        "Labels and levels should be same size" if labels.size != levels.size
+        'Must specify both labels and levels' unless labels && levels
+      raise ArgumentError,
+        'Labels and levels should be same size' if labels.size != levels.size
       raise ArgumentError,
-        "Incorrect labels and levels" if incorrect_fields?(labels, levels)
+        'Incorrect labels and levels' if incorrect_fields?(labels, levels)
 
       @labels = labels
-      @levels = levels.map { |e| Hash[e.map.with_index.to_a]}
+      @levels = levels.map { |e| Hash[e.map.with_index.to_a] }
     end
 
-    def incorrect_fields? labels, levels
-      max_level = levels[0].size
+    def incorrect_fields?(_labels, levels)
+      levels[0].size # FIXME: without this call everything fails
 
-      correct = labels.all? { |e| e.size == max_level }
       correct = levels.all? { |e| e.uniq.size == e.size }
 
       !correct
@@ -189,7 +202,7 @@ module Daru
     private :incorrect_fields?
 
     def self.from_arrays arrays
-      levels = arrays.map { |e| e.uniq.sort_by { |a| a.to_s  } }
+      levels = arrays.map { |e| e.uniq.sort_by(&:to_s) }
       labels = []
 
       arrays.each_with_index do |arry, level_index|
@@ -214,12 +227,17 @@ module Daru
       case
       when key[0].is_a?(Range) then retrieve_from_range(key[0])
       when (key[0].is_a?(Integer) and key.size == 1) then try_retrieve_from_integer(key[0])
-      else retrieve_from_tuples(key)
+      else
+        begin
+          retrieve_from_tuples key
+        rescue NoMethodError
+          raise IndexError, "Specified index #{key.inspect} do not exist"
+        end
       end
     end
 
     def try_retrieve_from_integer int
-      return retrieve_from_tuples([int]) if @levels[0].has_key?(int)
+      return retrieve_from_tuples([int]) if @levels[0].key?(int)
       int
     end
 
@@ -232,12 +250,13 @@ module Daru
 
       key.each_with_index do |k, depth|
         level_index = @levels[depth][k]
+        raise IndexError, "Specified index #{key.inspect} do not exist" if level_index.nil?
         label = @labels[depth]
         chosen = find_all_indexes label, level_index, chosen
       end
 
-      return chosen[0] if chosen.size == 1
-      return multi_index_from_multiple_selections(chosen)              
+      return chosen[0] if chosen.size == 1 && key.size == @levels.size
+      multi_index_from_multiple_selections(chosen)
     end
 
     def multi_index_from_multiple_selections chosen
@@ -246,14 +265,11 @@ module Daru
 
     def find_all_indexes label, level_index, chosen
       if chosen.empty?
-        label.each_with_index do |lbl, i|
-          if lbl == level_index then chosen << i end
-        end
+        label.each_with_index
+             .select { |lbl, _| lbl == level_index }.map(&:last)
       else
         chosen.keep_if { |c| label[c] == level_index }
       end
-
-      chosen
     end
 
     private :find_all_indexes, :multi_index_from_multiple_selections,
@@ -263,11 +279,10 @@ module Daru
       raise ArgumentError,
         "Key #{index} is too large" if index >= @labels[0].size
 
-      level_indexes = 
-      @labels.inject([]) do |memo, label|
-        memo << label[index]
-        memo
-      end
+      level_indexes =
+        @labels.each_with_object([]) do |label, memo|
+          memo << label[index]
+        end
 
       tuple = []
       level_indexes.each_with_index do |level_index, i|
@@ -294,7 +309,7 @@ module Daru
     end
 
     def empty?
-      @labels.flatten.empty? and @levels.all? { |l| l.empty? }
+      @labels.flatten.empty? and @levels.all?(&:empty?)
     end
 
     def include? tuple
@@ -314,9 +329,9 @@ module Daru
     end
 
     def == other
-      self.class == other.class  and 
-      labels     == other.labels and 
-      levels     == other.levels 
+      self.class == other.class  &&
+        labels   == other.labels &&
+        levels   == other.levels
     end
 
     def to_a
@@ -328,7 +343,16 @@ module Daru
     end
 
     def inspect
-      "Daru::MultiIndex:#{self.object_id} (levels: #{levels}\nlabels: #{labels})"
+      "Daru::MultiIndex:#{object_id} (levels: #{levels}\nlabels: #{labels})"
+    end
+
+    # Provide a MultiIndex for sub vector produced
+    #
+    # @param input_indexes [Array] the input by user to index the vector
+    # @return [Object] the MultiIndex object for sub vector produced
+    def conform input_indexes
+      return self if input_indexes[0].is_a? Range
+      drop_left_level input_indexes.size
     end
   end
-end
+end