ruby-nuggets 0.9.6.pre2 → 0.9.6.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204c7a58b06959ce60a857c5e70c60ca6e278e09
-  data.tar.gz: ecbcbaaa1a3ed0df93694678a4f42811dd406385
+  metadata.gz: e661023674b7ff0f06dd711df4d2c67aa7026230
+  data.tar.gz: 727d8002a0c68c8dadf8237b240448fe882efa90
 SHA512:
-  metadata.gz: 070ece04d3311e4eb79cf033e89f404ce79ed19027fadd1d6fd97ae9eeb9b6df1d6aea7dbf545ddd592d5a4950fdde74763a4111bc0bae7496bcc63638f330de
-  data.tar.gz: 18bda153c1274c40e83fb65149fc2306ea9581239ee4d3b7b3ea80d972e8da4cdb5a251471eb2ea76d1bc065a1cb80637fc40787664b4f04defddd42e430fe4b
+  metadata.gz: 59fd315cfa38d34aed7113e06281b2a956251cb6cf49b8ce07a36af341d48bac0d4d94a3e2a5bc0e0fa538397f18e3660b94c982c14a228075872600657f69b7
+  data.tar.gz: e213af8417fae28b29f2f76a7b2a6d31cc47ecba82475436f0e75984174e8e2a0108e16b1325f28a43fc018d901997da259d69c179554df874a802b6f48ad2c8

data/lib/nuggets/lsi.rb

@@ -89,21 +89,19 @@ module Nuggets
     # abs:: minimum absolute value to consider
     # nul:: exclude null values (true or Float)
     # new:: exclude original terms / only yield new ones
-    def each_norm(key = nil, options = {})
-      return enum_for(:each_norm, key, options) unless block_given?
+    def each_term(key = nil, options = {})
+      return enum_for(:each_term, key, options) unless block_given?
 
       min, abs, nul, new = options.values_at(:min, :abs, :nul, :new)
       nul = DEFAULT_EPSILON if nul == true
 
-      list = @invlist
+      list, norm = @invlist, options[:norm]
 
       (key ? [self[key]] : docs).each { |doc|
-        if doc && norm = doc.norm
-          i = -1
-
-          norm.each { |v|
-            i += 1
-            yield doc, list[i], v unless (min && v < min) ||
+        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))
@@ -112,6 +110,10 @@ module Nuggets
       }
     end
 
+    def each_norm(key = nil, options = {}, &block)
+      each_term(key, options.merge(:norm => true), &block)
+    end
+
     def related(key, num = 5)
       if doc = self[key] and norm = doc.norm
         temp = sort_by { |k, v| -norm * v.norm.col }
@@ -158,8 +160,8 @@ module Nuggets
       # MxN matrix, M<N, is not implemented (file svd.c, line 61)
       u, v, s = matrix(docs, list.size, size = docs.size).SV_decomp
 
-      r, i = reduce(s, options.fetch(:cutoff, DEFAULT_CUTOFF)), -1
-      (u * r * v.trans).each_col { |c| docs[i += 1].vector = c.row }
+      (u * reduce(s, options.fetch(:cutoff, DEFAULT_CUTOFF)) * v.trans).
+        enum_for(:each_col).with_index { |c, i| docs[i].vector = c.row }
 
       size
     end
@@ -175,12 +177,7 @@ module Nuggets
     # k < 1::    keep (at most) this proportion
     def reduce(s, k, m = s.size)
       if k && k < m
-        if k > 0
-          k = (m * k).floor if k < 1
-          s[k, m - k] = 0
-        else
-          s.set_zero
-        end
+        k > 0 ? s[k = (k < 1 ? m * k : k).floor, m - k] = 0 : s.set_zero
       end
 
       s.to_m_diagonal
@@ -207,7 +204,7 @@ module Nuggets
             else alias_method(method, "#{transform ||= :raw}_vector")
           end
 
-          @transform = transform
+          @transform = transform.to_sym
         end
 
       end
@@ -245,9 +242,11 @@ module Nuggets
       end
 
       def tfidf_vector(*args)
-        vec, f, i = raw_vector(*args), @freq, -1
+        vec, f = raw_vector(*args), @freq
         s, d = vec.sum, @total = args.fetch(1, @total).to_f
-        vec.map { |v| i += 1; v > 0 ? ::Math.log(d / f[i]) * v / s : v }
+
+        vec.enum_for(:map).with_index { |v, i|
+          v > 0 ? ::Math.log(d / f[i]) * v / s : v }
       end
 
       self.transform = DEFAULT_TRANSFORM

data/lib/nuggets/version.rb

@@ -10,12 +10,12 @@ module Nuggets
 
       # Returns array representation.
       def to_a
-        [MAJOR, MINOR, TINY]
+        [MAJOR, MINOR, TINY] << 'pre3'
       end
 
       # Short-cut for version string.
       def to_s
-        to_a.join('.') + '.pre2'
+        to_a.join('.')
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-nuggets
 version: !ruby/object:Gem::Version
-  version: 0.9.6.pre2
+  version: 0.9.6.pre3
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies: []
 description: Some extensions to the Ruby programming language.
 email: jens.wille@gmail.com
@@ -233,7 +233,7 @@ rdoc_options:
 - "--line-numbers"
 - "--all"
 - "--title"
-- ruby-nuggets Application documentation (v0.9.6.pre2)
+- ruby-nuggets Application documentation (v0.9.6.pre3)
 - "--main"
 - README
 require_paths: