array_2d_simple 0.2.2 → 0.3.0

data/Guardfile

@@ -3,7 +3,7 @@
 
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/array_2d_simple/(.+)\.rb$})     { 'spec' }
   watch('spec/spec_helper.rb')  { "spec" }
 
   # Rails example

data/lib/array_2d_simple/array_2d.rb

@@ -2,6 +2,7 @@ require "array_2d_simple/version"
 
 module Array2dSimple
   class Array2d
+    include Enumerable
     attr_reader :width, :height
 
     def initialize params
@@ -19,93 +20,95 @@ module Array2dSimple
     end
 
     def get_by_rc r,c
-      raise 'x out of range' if c >= @width
-      raise 'y out of range' if r >= @height
-      @elements[r][c]
+      Printer.log 'Warning: #get_by_rc is depricated. Use get_by_xy. Note: arguments are reversed with get_by_xy'
+      get_by_xy(c,r)
     end
 
     def set_by_rc r,c, value
-      raise 'x out of range' if c >= @width
-      raise 'y out of range' if r >= @height
-      @elements[r][c] = value
+      Printer.log 'Warning: #set_by_rc is depricated. Use set_by_xy. Note: arguments are reversed with set_by_xy'
+      set_by_xy(c,r,value)
     end
 
     def get_by_xy x,y
-      get_by_rc y,x
+      raise 'x out of range' if x >= @width
+      raise 'y out of range' if y >= @height
+      @elements[y][x]
+    end
+
+    def set_by_xy(x,y,value)
+      raise 'x out of range' if x >= @width
+      raise 'y out of range' if y >= @height
+      @elements[y][x] = value
     end
 
     def [] x,y
-      get_by_rc y,x
+      get_by_xy(x,y)
     end
 
     def []= x,y, value
-      @elements[y][x] = value
+      set_by_xy(x,y,value)
     end
 
     def output
       size = format2(max.to_f).size
       output = ''
+      
       (0..@height - 1).each do |r|
         (0..@width - 1).each do |c|
           output += "%#{ size + 4 }s" % format2(get_by_rc(r,c).to_f) if get_by_rc(r,c).respond_to? :to_f
         end
         output += "\n"
       end
+
       output
     end
 
     def max
-      max = -999999
-      (0..@height - 1).each do |r|
-        (0..@width - 1).each do |c|
-          value = get_by_rc(r,c).to_f if get_by_rc(r,c).respond_to?(:to_f)
-          max = [max, value].max if value and ! value.to_f.nan?
-        end
-      end
-      max
+      @elements.dup.flatten.max
     end
 
     def min
-      min = 999999
-      (0..@height - 1).each do |r|
-        (0..@width - 1).each do |c|
-          value = get_by_rc(r,c).to_f if value.respond_to?(:to_f)
-          min = [min, value].min if value and ! value.to_f.nan?
-        end
-      end
-      min
+      @elements.dup.flatten.min
     end
 
     def project &proc
       new_array = self.class.new( width: @width, height: @height )
-      (0..@height - 1).each do |r|
-        (0..@width - 1).each do |c|
-          new_array.set_by_rc(r,c, proc.call(get_by_rc(r,c)))
-        end
-      end
+      
+      new_array.set_each{ |x, y| proc.call( get_by_xy( y,x ))}
+
       new_array
     end
 
     def set_each &proc
-      (0..@height - 1).each do |r|
-        (0..@width - 1).each do |c|
-          @elements[r][c] = proc.call(r,c)
-        end
+      each_with_index do |v,i| 
+        x = i[0]
+        y = i[1]
+        @elements[x][y] = proc.call(x,y)
       end
     end
 
-    def each &proc
-      (0..@height - 1).each do |r|
-        (0..@width - 1).each do |c|
-          @elements[r][c] = proc.call(@elements[r][c]) if @elements[r][c].class == Float
+    def each_with_index
+      (0..@width - 1).each do |y|
+        (0..@height - 1).each do |x|
+          yield(@elements[x][y],[x,y])
         end
       end
     end
 
+    def each &block
+      each_with_index &block
+    end
+
     # Helper methods
     def format2 value
       "%0.2f" % value.round(2).to_s if value.finite?
     end
+  end
+end
+
 
+class Printer
+  def self.log(message)
+    puts message
   end
 end

data/lib/array_2d_simple/version.rb

@@ -1,3 +1,3 @@
 module Array2dSimple
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/array_2d_simple_spec.rb

@@ -4,6 +4,10 @@ module Array2dSimple
   describe Array2d do
     let(:array_2d) { Array2d.new(width:8, height: 2) }
 
+    before do
+      Printer.stub( :log )
+    end
+
     it 'creates' do
       array_2d.class.should eq Array2d
     end
@@ -13,26 +17,45 @@ module Array2dSimple
       big_array.to_s.should include '30x100'
     end
 
+    describe 'enumerable' do
+      it 'each calls the block with the current value' do
+        a2x2 = Array2d.new(width: 2, height: 2)
+        a2x2.set_by_xy(0,0,1)
+        a2x2.set_by_xy(0,1,2)
+        a2x2.set_by_xy(1,0,3)
+        a2x2.set_by_xy(1,1,4)
+
+        foo = []
+        a2x2.each { |element| foo << element }
+        foo.should == [1,2,3,4]
+      end
+    end
+
     context 'shared' do
+      let( :getter_warning ){ 'Warning: #get_by_rc is depricated. Use get_by_xy. Note: arguments are reversed with get_by_xy'}
+      let( :setter_warning ){ 'Warning: #set_by_rc is depricated. Use set_by_xy. Note: arguments are reversed with set_by_xy'}
+
       before do
-        proc = Proc.new { |r, c| r * 8 + c + 1}
+        proc = Proc.new { |x, y| x * 8 + y + 1}
         array_2d.set_each &proc
       end
 
       it 'fills Array2d' do
-        array_2d.get_by_rc(0,0).should eq 1
-        array_2d.get_by_rc(0,7).should eq 8
-        array_2d.get_by_rc(1,1).should eq 10
-        array_2d.get_by_rc(1,3).should eq 12
-        array_2d.get_by_rc(1,7).should eq 16
+        array_2d.get_by_xy(0,0).should eq 1
+        array_2d.get_by_xy(7,0).should eq 8
+        array_2d.get_by_xy(1,1).should eq 10
+        array_2d.get_by_xy(3,1).should eq 12
+        array_2d.get_by_xy(7,1).should eq 16
       end
 
-      it 'gets by rc' do
+      it 'gets by rc is deprecated' do
+        Printer.should_receive( :log ).with getter_warning
         array_2d.get_by_rc(1,4).should eq 13
       end
 
-      it 'gets_by_r_c' do
-        array_2d.get_by_rc(1,5).should eq 14
+      it 'sets by rc is deprecated' do
+        Printer.should_receive( :log ).with setter_warning
+        array_2d.set_by_rc(1,4, 13).should eq 13
       end
 
       it 'gets_by_x_y' do

data/spec/normalized_array_2d_spec.rb

@@ -4,8 +4,12 @@ module Array2dSimple
   describe NormalizedArray2d do
     let(:array_2d) { Array2d.new(width:8, height:2) }
 
+    before do
+      Printer.stub( :log )
+    end
+
     it 'gets normalized value' do
-      array_2d.set_each { |r, c| r * 8 + c + 1}
+      array_2d.set_each { |x, y| x * 8 + y + 1}
       normalized_array = NormalizedArray2d.new(array_2d)
       normalized_array[0,0].should eq 0.0
       normalized_array[3,0].should eq 0.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: array_2d_simple
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec