lsi4r 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c1576781e887d79aacd4b32b66d828974f6876
-  data.tar.gz: 342f4b9ee69aa05c6b0a221ecae5a92100196e48
+  metadata.gz: c34d7f418bac80657aa021566b252720cffa221c
+  data.tar.gz: c4a66f3dda978161ede1c8621973295bcb541de8
 SHA512:
-  metadata.gz: 53a2e8be5fd96724902b4ce027378734f72febd78110b234ed8e6de9ef4dcec8f6ac72740029d1d287db72d98bd055cda74f9362e3b2f1820155497cbf34a0d7
-  data.tar.gz: afb8ba85b4a16849577a944b82ee6e957f2173214dd7f2df664af7b5f4f70318b751b5fe7e55c4e2680e223d0ab107ce69a035c9d1a2ada1639d29505cfc83c0
+  metadata.gz: df1f502ca56b19e70f2dfeaaf099223950dae3d17939f5bb716bec7db2b4fd2d1adfbcc78c74c2042c12dee70e616c4a4ca28d3b529dd32e408905cc0795c92c
+  data.tar.gz: 01998370603677234cc9dbc7ff1f18773a16e8923ec7ebb0517567eb8cd3f5a26699dd97e44bfe82172c2cd245ce8356ed85357b0ce2483a8eeca716157ae29e

data/ChangeLog

@@ -2,6 +2,12 @@
 
 = Revision history for lsi4r
 
+== 0.0.2 [unreleased]
+
+* Fixed Lsi4R::Doc#transform= with regard to non-Symbol/String transforms.
+* Added Lsi4R#each_vector, extracted from Lsi4R#each_term.
+* Refactored Lsi4R#related and Lsi4R#related_score.
+
 == 0.0.1 [2014-04-11]
 
 * First release (extracted from ruby-nuggets).

data/README

@@ -2,20 +2,22 @@
 
 == VERSION
 
-This documentation refers to lsi4r version 0.0.1
+This documentation refers to lsi4r version 0.0.2
 
 
 == DESCRIPTION
 
 LSI[https://en.wikipedia.org/wiki/Latent_semantic_indexing] processing
-for Ruby.
+for Ruby. Requires {GSL bindings}[https://blackwinter.github.com/rb-gsl]
+for the heavy lifting.
 
 
 == LINKS
 
-Documentation:: https://blackwinter.github.io/lsi4r/
+Documentation:: https://blackwinter.github.com/lsi4r
 Source code::   https://github.com/blackwinter/lsi4r
 RubyGem::       https://rubygems.org/gems/lsi4r
+Travis CI::     https://travis-ci.org/blackwinter/lsi4r
 
 
 == AUTHORS

data/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path(%q{../lib/lsi4r/version}, __FILE__)
+require_relative 'lib/lsi4r/version'
 
 begin
   require 'hen'
@@ -13,7 +13,7 @@ begin
       email:        %q{jens.wille@gmail.com},
       license:      %q{AGPL-3.0},
       homepage:     :blackwinter,
-      dependencies: %w[],
+      dependencies: %w[rb-gsl],
 
       required_ruby_version: '>= 1.9.3'
     }

data/lib/lsi4r.rb

@@ -80,6 +80,16 @@ class Lsi4R
     add(value.object_id, value)
   end
 
+  def each_vector(key = nil, norm = true)
+    return enum_for(:each_vector, key, norm) unless block_given?
+
+    (key ? [self[key]] : docs).each { |doc|
+      if doc && vec = norm ? doc.norm : doc.vector
+        yield doc, vec
+      end
+    }
+  end
+
   # min:: minimum value to consider
   # abs:: minimum absolute value to consider
   # nul:: exclude null values (true or Float)
@@ -90,18 +100,16 @@ class Lsi4R
     min, abs, nul, new = options.values_at(:min, :abs, :nul, :new)
     nul = DEFAULT_EPSILON if nul == true
 
-    list, norm = @invlist, options[:norm]
+    list = @invlist
 
-    (key ? [self[key]] : docs).each { |doc|
-      if doc && vec = norm ? doc.norm : doc.vector
-        vec.enum_for(:each).with_index { |v, i|
-          yield doc, list[i], v unless v.nan? ||
-                                       (min && v < min) ||
-                                       (abs && v.abs < abs) ||
-                                       (nul && v.abs < nul) ||
-                                       (new && doc.include?(i))
-        }
-      end
+    each_vector(key, options[:norm]) { |doc, vec|
+      vec.enum_for(:each).with_index { |v, i|
+        yield doc, list[i], v unless v.nan? ||
+                                     (min && v < min) ||
+                                     (abs && v.abs < abs) ||
+                                     (nul && v.abs < nul) ||
+                                     (new && doc.include?(i))
+      }
     }
   end
 
@@ -110,19 +118,25 @@ class Lsi4R
   end
 
   def related(key, num = 5)
-    if doc = self[key] and norm = doc.norm
-      temp = sort_by { |k, v| -norm * v.norm.col }
-      temp.map! { |k,| k }.delete(key)
-      temp[0, num]
-    end
+    each_vector(key) { |_, vec|
+      tmp, del = block_given? ? yield(vec) :
+        [sort_by { |_, v| -vec * v.norm.col }.map! { |k,| k }]
+
+      tmp.delete(del || key)
+
+      return tmp[0, num]
+    }
+
+    nil
   end
 
-  def related_score(key, num = 5)
-    if doc = self[key] and norm = doc.norm
-      temp = map { |k, v| [k, norm * v.norm.col] }.sort_by { |_, i| -i }
-      temp.delete(temp.assoc(key))
-      temp[0, num]
-    end
+  def related_score(key, num = 5, threshold = 0)
+    related(key, num) { |vec|
+      [tmp = map { |k, v|
+        score = vec * v.norm.col
+        [k, score] if score > threshold
+      }.compact.sort_by { |_, i| -i }, tmp.assoc(key)]
+    }
   end
 
   def build(options = {})

data/lib/lsi4r/doc.rb

@@ -43,13 +43,17 @@ class Lsi4R
       def transform=(transform)
         method = :transformed_vector
 
-        case transform
-          when Proc          then define_method(method, &transform)
-          when UnboundMethod then define_method(method, transform)
-          else alias_method(method, "#{transform ||= :raw}_vector")
+        @transform = case transform ||= :raw
+          when Symbol, String
+            alias_method(method, "#{transform}_vector")
+            transform.to_sym
+          when Proc, UnboundMethod
+            define_method(method, transform)
+            transform.to_s
+          else
+            raise TypeError, "wrong argument type #{transform.class} " <<
+                             '(expected Symbol/String or Proc/UnboundMethod)'
         end
-
-        @transform = transform.to_sym
       end
 
     end

data/lib/lsi4r/version.rb

@@ -4,7 +4,7 @@ class Lsi4R
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: lsi4r
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hen
+  name: rb-gsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,13 +80,15 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  lsi4r-0.0.1 [2014-04-11]:
+  lsi4r-0.0.2 [unreleased]:
 
-  * First release (extracted from ruby-nuggets).
+  * Fixed Lsi4R::Doc#transform= with regard to non-Symbol/String transforms.
+  * Added Lsi4R#each_vector, extracted from Lsi4R#each_term.
+  * Refactored Lsi4R#related and Lsi4R#related_score.
 
 rdoc_options:
 - "--title"
-- lsi4r Application documentation (v0.0.1)
+- lsi4r Application documentation (v0.0.2)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -87,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Latent semantic indexing for Ruby.