distance_measures 0.0.5 → 0.0.6

data/README.rdoc

@@ -26,6 +26,8 @@ A bunch of distance measures that extend Array.
   
   a.tanimoto_coefficient(b)
   
+  a.haversine_distance(b)
+  
 This may or may not be the complete list, best thing is to check the source code.
   
 There are also a couple bonus methods:

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/distance_measures.gemspec

@@ -1,60 +1,59 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{distance_measures}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["reddavis"]
-  s.date = %q{2010-09-11}
+  s.date = %q{2010-12-29}
   s.description = %q{A bundle of distance measures with C extensions for the slow bits}
   s.email = %q{reddavis@gmail.com}
   s.extensions = ["ext/core/extconf.rb", "ext/euclidean_distance/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "distance_measures.gemspec",
-     "ext/19_fix/19_fix.c",
-     "ext/core/core.c",
-     "ext/core/extconf.rb",
-     "ext/euclidean_distance/euclidean_distance.c",
-     "ext/euclidean_distance/extconf.rb",
-     "lib/distance_measures.rb",
-     "lib/distance_measures/core.bundle",
-     "lib/distance_measures/cosine_similarity.rb",
-     "lib/distance_measures/euclidean_distance.bundle",
-     "lib/distance_measures/jaccard.rb",
-     "lib/distance_measures/tanimoto_coefficient.rb",
-     "spec/distance_measures_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "distance_measures.gemspec",
+    "ext/19_fix/19_fix.c",
+    "ext/core/core.c",
+    "ext/core/extconf.rb",
+    "ext/euclidean_distance/euclidean_distance.c",
+    "ext/euclidean_distance/extconf.rb",
+    "lib/distance_measures.rb",
+    "lib/distance_measures/core.bundle",
+    "lib/distance_measures/cosine_similarity.rb",
+    "lib/distance_measures/euclidean_distance.bundle",
+    "lib/distance_measures/haversine.rb",
+    "lib/distance_measures/jaccard.rb",
+    "lib/distance_measures/tanimoto_coefficient.rb",
+    "spec/distance_measures_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/reddavis/distance_measure}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A bundle of distance measures with C extensions for the slow bits}
   s.test_files = [
     "spec/distance_measures_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/distance_measures.rb

@@ -5,6 +5,7 @@ require 'distance_measures/euclidean_distance'
 require 'distance_measures/tanimoto_coefficient'
 require 'distance_measures/core'
 require 'distance_measures/jaccard'
+require 'distance_measures/haversine'
 
 class Array
   include DistanceMeasures

data/lib/distance_measures/haversine.rb

@@ -0,0 +1,46 @@
+# 
+# Notes:
+#
+# translated into Ruby based on information contained in:
+#   http://mathforum.org/library/drmath/view/51879.html  Doctors Rick and Peterson - 4/20/99
+#   http://www.movable-type.co.uk/scripts/latlong.html
+#   http://en.wikipedia.org/wiki/Haversine_formula
+#
+# This formula can compute accurate distances between two points given latitude and longitude, even for 
+# short distances.
+
+module DistanceMeasures
+
+  # PI = 3.1415926535
+  RAD_PER_DEG = 0.017453293  #  PI/180
+
+  R_MILES = 3956     # radius of the great circle in miles
+  R_KM = 6371        # radius in kilometers...some algorithms use 6367
+  
+  # the great circle distance d will be in whatever units R is in
+  R = {
+    :miles => R_MILES,
+    :km => R_KM,
+    :feet => R_MILES * 5282,
+    :meters => R_KM * 1000
+  }
+
+  def haversine_distance(other, um = :meters)
+    dlon = other[1] - self[1]
+    dlat = other[0] - self[0]
+
+    dlon_rad = dlon * RAD_PER_DEG 
+    dlat_rad = dlat * RAD_PER_DEG
+
+    lat1_rad = self[0] * RAD_PER_DEG
+    lon1_rad = self[1] * RAD_PER_DEG
+
+    lat2_rad = other[0] * RAD_PER_DEG
+    lon2_rad = other[1] * RAD_PER_DEG
+
+    a = (Math.sin(dlat_rad/2))**2 + Math.cos(lat1_rad) * Math.cos(lat2_rad) * (Math.sin(dlon_rad/2))**2
+    c = 2 * Math.atan2( Math.sqrt(a), Math.sqrt(1-a))
+
+    R[um] * c
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: distance_measures
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - reddavis
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 +01:00
+date: 2010-12-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -43,7 +46,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -58,6 +60,7 @@ files:
 - lib/distance_measures/core.bundle
 - lib/distance_measures/cosine_similarity.rb
 - lib/distance_measures/euclidean_distance.bundle
+- lib/distance_measures/haversine.rb
 - lib/distance_measures/jaccard.rb
 - lib/distance_measures/tanimoto_coefficient.rb
 - spec/distance_measures_spec.rb
@@ -68,28 +71,32 @@ homepage: http://github.com/reddavis/distance_measure
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 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: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A bundle of distance measures with C extensions for the slow bits

data/.gitignore

@@ -1,23 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-tmp/*
-benchmarks/*
-
-## PROJECT::SPECIFIC