NaiveText 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c7ed0d2ea0ab00ce13e284e537474e1bd48b5a
-  data.tar.gz: 1feb4b6118ccfde5c54daca91c1386fbdcfe8e1b
+  metadata.gz: 6bffe658cb690c71d28fd693588064745e9640c8
+  data.tar.gz: 61ab533db552448d60e2db369b30894d80ea4db1
 SHA512:
-  metadata.gz: 810c0f40cdd3852010a8bdbc831c6b8591ea47ddb0ea7154e64899c682cbbf875a7b17b4d0676a809a080f14f9d69810cbe4798c2540b57c2ae0851224458365
-  data.tar.gz: a28bd4c31239537888d85cca8020ceca2506886a0e4d6bf6f57e78ed383e89bf5adebfebf56bdeda39649c4b5dfd01e8f43d6833101659c6cbc06921a0cd6480
+  metadata.gz: 93e4e8662da0b13d0f6eb1b92c3138d46d460b3011fc1fbf051680a8e49affe4560aef19b89ffca8ad37d2b24be505e31819763b24912d479b8aa430b82af965
+  data.tar.gz: 61aa7b9f67a81165e4a1910e4b212c00e2fe1bb1c27c7f86d2673500c73793d42f4f06d4ca28946b770417d81c2bb9265ef327de5549c98af7e6625939847f76

data/CHANGELOG.md

@@ -2,8 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
--Fixed a typo in the interface of TextClassifier propabilities --> probabilities. Deprecated the old version. 
+## [0.5.0] - 2015-11-06
+### Added
+- Added optional weighting to categories
+
+##[0.4.2] - 2015-11-02
+### Changed
+-Fixed a typo in the interface of TextClassifier propabilities --> probabilities. Deprecated the old version.
 
 ## [0.4.1] - 2015-10-29
 ### Added

data/lib/NaiveText/CategoriesFactory.rb

@@ -7,18 +7,20 @@ class CategoriesFactory
         begin
           examples = ExamplesFactory.from_files(category_config[:path])
           group = ExamplesGroup.new(examples: examples)
-          categories << Category.new(name: category_config[:name], examples: group)
+          categories << Category.new(name: category_config[:name], examples: group )
         rescue
           puts "You haven't provided trainingsdata for the category" + category_config[:name]
           puts "This category was not created."
         end
       end
       Categories.new(categories: categories)
+
+
     else
       config[:categories].each do |category_config|
         begin
           group = ExamplesGroup.new(examples: category_config[:examples])
-          categories << Category.new(name: category_config[:name], examples: group)
+          categories << Category.new(name: category_config[:name], examples: group, weight: category_config[:weight])
         rescue
           puts "You haven't provided trainingsdata for the category" + category_config[:name]
           puts "This category was not created."

data/lib/NaiveText/Category.rb

@@ -1,13 +1,15 @@
 class Category
   @@id_counter = 1
 
-  attr_reader :name
-  attr_reader :id
+  attr_reader :name, :id, :weight
+
 
   def initialize(args)
-    @name = args[:name]
+    @name     = args[:name]
     @examples = args[:examples]
-    @id = @@id_counter
+    @weight   = args[:weight] || 1
+    @id       = @@id_counter
+    
     @@id_counter += 1
   end
 

data/lib/NaiveText/ProbabilityCalculator.rb

@@ -6,8 +6,7 @@ class ProbabilityCalculator
 
   def get_probabilities_for(text)
     calculateProbabilities(text)
-    normalize unless @probabilities.sum <= 0
-    @probabilities
+    @probabilities.normalize
   end
 
 
@@ -33,7 +32,7 @@ class ProbabilityCalculator
 
     def set_apriori_probabilities
       @categories.each do |category|
-        @probabilities.set(category: category, value: p_apriori(category))
+        @probabilities.set(category: category, value: @categories.p_apriori(category))
       end
     end
 
@@ -41,13 +40,4 @@ class ProbabilityCalculator
       times = text.split(/\W+/).length
       @probabilities.greater_then(minimum**times)
     end
-
-    def normalize
-      normalization_factor = 1.to_f / @probabilities.sum
-      @probabilities.multiply(factor: normalization_factor)
-    end
-
-    def p_apriori(category)
-      @categories.p_apriori(category)
-    end
 end

data/lib/NaiveText/ProbabilityCollection.rb

@@ -14,7 +14,7 @@ class ProbabilityCollection
   def set(args)
     category  = args[:category]
     value = args[:value]
-   @probabilities[category.id] = value
+    @probabilities[category.id] = value
   end
 
   def multiply(args)
@@ -27,6 +27,14 @@ class ProbabilityCollection
     end
   end
 
+  def normalize
+    if self.sum > 0
+      normalization_factor = 1.to_f / self.sum
+      self.multiply(factor: normalization_factor)
+    end
+    self
+  end
+
   def category_with_max
     if @probabilities.max > 0
       id = @probabilities.find_index(@probabilities.max)

data/lib/NaiveText/TextClassifier.rb

@@ -21,6 +21,9 @@ class TextClassifier
 private
   def get_category_for(text)
     probabilities = @calculator.get_probabilities_for(text)
+    @categories.each do |category|
+      probabilities.multiply(category: category, factor: category.weight)
+    end
     probabilities.category_with_max
   end
 end

data/lib/NaiveText/version.rb

@@ -1,3 +1,3 @@
 module NaiveText
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: NaiveText
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - RicciFlowing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler