josephwilk-rsemantic 0.1.0 → 0.1.1

data/History.txt

@@ -1,4 +1,9 @@
-== 0.0.1 
+== 0.1.1 
 
-* Changed internal representation of vector space. Using columns as documents and rows as terms. This is more consistent which LSA research papers.
-* Wrap DMatrix in VectorSpace::Model, allowing us to store keywords with the matrix and get pretty output
+= Bugs
+* fixed a bug where verbose mode was getting stuck at INFO level and would never change (Joseph Wilk)
+
+== 0.1.0
+
+* Changed internal representation of vector space. Using columns as documents and rows as terms. This is more consistent which LSA research papers. (Joseph Wilk)
+* Wrap DMatrix in VectorSpace::Model, allowing us to store keywords with the matrix and get pretty output (Joseph Wilk)

data/lib/semantic/search.rb

@@ -2,7 +2,7 @@ module Semantic
   class Search
 
     def initialize(documents, options={})
-      Semantic.logger.level = Logger::INFO if options[:verbose]
+      Semantic.logger.level = options[:verbose] ? Logger::INFO : Logger::ERROR 
       
       @builder = VectorSpace::Builder.new(options)
       @matrix_transformer = MatrixTransformer.new(options)

data/lib/semantic/transform/lsa_transform.rb

@@ -4,30 +4,34 @@ module Semantic
 
       class << self
 
-        # Calculate SVD of objects matrix: U . SIGMA . VT = MATRIX
-        # Reduce the dimension of sigma by specified factor producing sigma'.
-        # Then dot product the matrices:  U . SIGMA' . VT = MATRIX'
-        def transform(matrix, dimensions=1)
+        def transform(matrix, number_of_dimensions_to_reduce = 1)
           columns = matrix.num_columns
 
           if dimensions <= columns: #Its a valid reduction
 
             u, sigma, vt = matrix.singular_value_decomposition
 
-            #Dimension reduction, build SIGMA'
-            for index in ((columns-dimensions)...columns)
-              sigma[index,index]=0
-            end
+            sigma_prime = reduce_dimensions(number_of_dimensions_to_reduce, sigma)
 
             #Reconstruct MATRIX' and Save transform
-            matrix = u * sigma * vt
+            matrix_prime = u * sigma_prime * vt
 
           else
             raise Exception, "dimension reduction cannot be greater than %s" % rows
           end
           
+          matrix_prime
+        end
+        
+        private
+        def reduce_dimensions(number_of_dimensions_to_reduce, matrix)
+          columns = matrix.num_columns
+          for index in ((columns-number_of_dimensions_to_reduce)...columns)
+            matrix[index,index] = 0
+          end
           matrix
         end
+        
       end
     end
   end

data/lib/semantic/version.rb

@@ -2,7 +2,7 @@ module Semantic #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/semantic.rb

@@ -18,6 +18,10 @@ require 'logger'
 
 module Semantic
 
+  class << self
+    attr_writer :logger
+  end
+  
   def self.logger
     return @logger if @logger
     @logger = Logger.new(STDOUT)

data/rsemantic.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{rsemantic}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wilk"]
-  s.date = %q{2008-11-13}
+  s.date = %q{2008-11-14}
   s.description = %q{A document vector search with flexible matrix transforms. Currently supports Latent semantic analysis and Term frequency - inverse document frequency}
   s.email = ["josephwilk@joesniff.co.uk"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "TODO.txt"]

data/spec/semantic/search_spec.rb

@@ -18,7 +18,7 @@ module Semantic
     end
 
     def vector_space_model(stubs = {})
-      @vector_space_model ||= VectorSpace::Model.new(Linalg::DMatrix.rows([[0,1],[1,0]]), [])
+      @vector_space_model ||= VectorSpace::Model.new(Linalg::DMatrix.rows([[0,1],[1,0]]), {})
     end
 
     def matrix(array)
@@ -89,5 +89,41 @@ module Semantic
 
     end
 
+    describe "logging" do
+
+      before(:each) do
+        @out = StringIO.new
+        Semantic.logger = Logger.new(@out)
+      end
+
+      it "should set info level if in verbose mode" do
+        VectorSpace::Builder.stub!(:new).and_return(mock_builder)
+        mock_builder.stub!(:build_document_matrix).and_return(vector_space_model)
+
+        Search.new(['test'], :verbose => true)
+        
+        Semantic.logger.level.should == Logger::INFO
+      end
+      
+      it "should set error level if not in verbose mode" do
+        VectorSpace::Builder.stub!(:new).and_return(mock_builder)
+        mock_builder.stub!(:build_document_matrix).and_return(vector_space_model)
+
+        Search.new(['test'], :verbose => false)
+        
+        Semantic.logger.level.should == Logger::ERROR
+      end
+
+      it "should default to error level if verbose is not specified" do
+        VectorSpace::Builder.stub!(:new).and_return(mock_builder)
+        mock_builder.stub!(:build_document_matrix).and_return(vector_space_model)
+
+        Search.new(['test'])
+        
+        Semantic.logger.level.should == Logger::ERROR
+      end
+
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josephwilk-rsemantic
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Joseph Wilk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-13 00:00:00 -08:00
+date: 2008-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency