agwx_grids 0.0.3 → 0.0.4

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new do |t|
 end
 
 desc "Run tests"
-task default: :test
+task :default => :test

data/lib/agwx_grids/grid.rb

@@ -65,7 +65,7 @@ module AgwxGrids
 
     def calcYIncr
       if @yStart != nil && @yEnd != nil && @yDim != nil then
-        @yIncr = (@yEnd - @yStart) / @yDim
+        @yIncr = (@yEnd - @yStart) / (@yDim - 1)
       end
     end
 
@@ -159,25 +159,34 @@ module AgwxGrids
       end
     end
   
+    # Find the nearest index to the given coord (params in real space, return is a zero-based index)
+    def nearest(coord,start,incr)
+      # convert coord to a lower-bound index (i.e. truncating integer conversion)
+      trunc = ((coord - start)/incr).to_i
+      # Does "trunc" the index of the closest real-space coord, or the next one up?
+      coord - (start + incr*trunc) > incr / 2.0 ? trunc + 1 : trunc
+    end
+    
+    # Convert coordinates in real XY space to indices. Note that Z is sort-of a real-space coord, but
+    # represents a quantized there-or-not value like a DOY, not a scalar.
     def realToIndex(x,y,z) 
-      @myX = ((x-@mD.xStart)/@mD.xIncr).to_i
-      @myY = ((y-@mD.yStart)/@mD.yIncr).to_i
-      @myZ = z # ((z-@mD.zStart)/@mD.zIncr).to_i
-      # puts "realToIndex: x #{x}, xStart #{@mD.xStart}, xIncr #{@mD.xIncr} myX #{@myX}; y #{y}, myY #{@myY} z #{z}, myZ #{@myZ}"
-      [@myX,@myY,@myZ]
+      @my_ii = nearest(x,@mD.xStart,@mD.xIncr)
+      @my_jj = nearest(y,@mD.yStart,@mD.yIncr)
+      @my_doy = z
+      # puts "realToIndex: x #{x}, xStart #{@mD.xStart}, xIncr #{@mD.xIncr} myX #{@my_ii}; y #{y}, myY #{@my_jj} z #{z}, myZ #{@my_doy}"
+      [@my_ii,@my_jj,@my_doy]
     end
   
     def get(x,y,z)
       # puts "get #{x},#{y},#{z}"
       # puts "xStart=#{@mD.xStart}, yStart=#{@mD.yStart}, zStart=#{@mD.zStart}"
-      # note that this just truncates; it should round to center of cell!
       realToIndex(x,y,z)
-      # puts "@myX=#{@myX}, @myY=#{@myY}, @myZ=#{@myZ}"
-      # puts "#{@layers[@myZ]}"
-      if @layers[@myZ] == nil
+      # puts "@my_ii=#{@my_ii}, @my_jj=#{@my_jj}, @my_doy=#{@my_doy}"
+      # puts "#{@layers[@my_doy]}"
+      if @layers[@my_doy] == nil
           nil
       else
-          val = @layers[@myZ].get(@myX,@myY)
+          val = @layers[@my_doy].get(@my_ii,@my_jj)
           val == mD.badVal ? nil : val
       end
     end
@@ -201,7 +210,7 @@ module AgwxGrids
         if layer == nil
             yield nil
         else
-          val = layer.get(@myX,@myY)
+          val = layer.get(@my_ii,@my_jj)
           val = nil if val == mD.badVal
           yield val
         end

data/lib/agwx_grids/version.rb

@@ -1,3 +1,3 @@
 module AgwxGrids
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/grid_test.rb

@@ -49,6 +49,13 @@ class TestAgwxGrid  < Test::Unit::TestCase
     assert_in_delta(long_start + 3 * long_incr, @grid.longitude_for(3), 2 ** -20)
   end
   
+  def test_by_long_lat
+    assert_equal(-17.03, @grid.get(-96.86,42.0,1))
+    assert_equal(-17.01, @grid.get(-96.45,42.0,1))
+    assert_equal(-16.85, @grid.get(-96.86,42.4,1))
+    assert_equal(-16.82, @grid.get(-96.45,42.4,1))
+    
+  end
   def test_each_with_doy
     layers = []
     doys = []
@@ -68,12 +75,20 @@ class TestAgwxGrid  < Test::Unit::TestCase
   end
   
   def test_at_by_long_lat
+    assert_equal(0.4, @grid.mD.yIncr)
     latitude = @grid.latitude_for(5)
+    assert_equal(44.0, latitude)
     longitude = @grid.longitude_for(6)
+    assert_equal(-95.6, longitude)
     vals = @grid.at_by_long_lat(longitude,latitude)
     assert_equal(364, vals.keys.size)
     assert_equal(-17.42, vals[1])    
   end
+  
+  def test_nearest
+    assert_equal(0, @grid.nearest(-97.81,-98.0,0.4))
+    assert_equal(1, @grid.nearest(-97.79,-98.0,0.4))
+  end
 end
 # begin # test the Grid class
 #    puts "====== initializing a grid =========="

metadata

@@ -1,50 +1,61 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: agwx_grids
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - RickWayne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-12-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 'UW Soils Ag Weather grid data format (X by Y by DOY) '
-email:
+  type: :development
+  requirement: *id002
+description: "UW Soils Ag Weather grid data format (X by Y by DOY) "
+email: 
 - fewayne@wisc.edu
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -56,30 +67,39 @@ files:
 - lib/agwx_grids/version.rb
 - test/grid_test.rb
 - test/grids/WIMNTMin2002
-homepage: ''
-licenses:
+homepage: ""
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: UW Soils Ag Weather grid data format (X by Y by DOY)
-test_files:
+test_files: 
 - test/grid_test.rb
 - test/grids/WIMNTMin2002

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 453daf831e0ba373d2a523988e4f27b064c33a53
-  data.tar.gz: 4b30eb84658a562f9a6667255fccb5dc60d3d73d
-SHA512:
-  metadata.gz: a5677ebe08bb872308098ae970b87efd4aa6c05c1a0bd9285dd9985d8d41db613cdb355264c70252b9492cd82d15c057c8b905cd84f8da925b475ab1d523ed75
-  data.tar.gz: 2e79c14ab75a481483fbad839778fe810ca48bbd1b9ec3f2abc41eadebb6468bafcc48a0b6f5a8fd7a2ad789189deb8fb7df1d508f55cc8a61ef00ebf4827b38