lsh 0.0.2 → 0.0.3

data/lib/lsh/index.rb

@@ -21,7 +21,6 @@ module LSH
     attr_reader :projections, :buckets
 
     def initialize(dim, k, w = Float::INFINITY, l = 150)
-      @math = MathUtil.new
       @window = w
       @dim = dim
       @number_of_random_vectors = k
@@ -88,7 +87,7 @@ module LSH
             hash << 0
           end
         else
-          b = bias ? @math.random_uniform : 0.0
+          b = bias ? MathUtil.random_uniform : 0.0
           hash << (b + dot_product / @window).floor
         end
       end
@@ -126,15 +125,15 @@ module LSH
 
     def random_vector_unit(dim)
       r = random_vector(dim)
-      r /= @math.norm(r)
+      r /= MathUtil.norm(r)
     end
 
     def random_vector(dim)
-      @math.random_gaussian_vector(dim)
+      MathUtil.random_gaussian_vector(dim)
     end
 
     def similarity(v1, v2)
-      @math.dot(v1, v2)
+      MathUtil.dot(v1, v2)
     end
 
   end

data/lib/lsh/math_util_gsl.rb

@@ -20,24 +20,25 @@ module LSH
 
   class MathUtil
 
-    def initialize
-      @gsl_random = GSL::Rng.alloc
-      @gsl_random.set(rand(1000)) # Overriding seed
+    @@gsl_random = GSL::Rng.alloc
+
+    def self.random_uniform
+      @@gsl_random.uniform
     end
 
-    def random_uniform
-      @gsl_random.uniform
+    def self.random_gaussian_vector(dim)
+      @@gsl_random.gaussian(1, dim)
     end
 
-    def random_gaussian_vector(dim)
-      @gsl_random.gaussian(1, dim)
+    def self.random_gaussian_matrix(k, l)
+      GSL::Matrix.randn(k, l)
     end
 
-    def dot(v1, v2)
+    def self.dot(v1, v2)
       v1 * v2.col
     end
 
-    def norm(v)
+    def self.norm(v)
       v.norm
     end
 

data/lib/lsh/math_util_jblas.rb

@@ -20,19 +20,23 @@ module LSH
 
   class MathUtil
 
-    def random_uniform
+    def self.random_uniform
       JBLAS.rand[0,0]
     end
 
-    def random_gaussian_vector(dim)
-      JBLAS.randn(dim, 1)
+    def self.random_gaussian_vector(dim)
+      JBLAS.randn(1, dim)
     end
 
-    def dot(v1, v2)
-      (v1.t * v2)[0,0]
+    def self.random_gaussian_matrix(k, l)
+      JBLAS.randn(k, l)
     end
 
-    def norm(v)
+    def self.dot(v1, v2)
+      (v1 * v2.t)[0,0]
+    end
+
+    def self.norm(v)
       v.norm2
     end
 

metadata

@@ -1,34 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: lsh
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Yves Raimond
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jblas-ruby
-  version_requirements: !ruby/object:Gem::Requirement
+  name: gsl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 description: An implementation of LSH in Ruby, using JBLAS for JRuby and GSL for MRI
 email: yves.raimond@bbc.co.uk
 executables: []
@@ -39,30 +37,28 @@ files:
 - lib/lsh/index.rb
 - lib/lsh/math_util_gsl.rb
 - lib/lsh/math_util_jblas.rb
-homepage:
+homepage: 
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
 specification_version: 3
 summary: Locality Sensitive Hashing gem
 test_files: []