fisher_classifier 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGYyYTEwNDI3NjdhNjYwNmYxMTllYzhlZWJiNDE1ODhjNGQ5OGE0Yw==
+    ZmMyNjg5M2FhZmM5YjBhNTRhNzQ1Y2U0ZGNlZTY1MjgyZTRlMjc0YQ==
   data.tar.gz: !binary |-
-    NjAzYTczODQzZWIwZjhjNTRjM2I1OTFiMTk2MDk1ZjMxNWI4ODEyMg==
+    MTQ4M2E0YjgwMzUwZGU2NGIwNjAwZGQwNzZhODdlNWYwYjUyZWFkMQ==
 SHA512:
   metadata.gz: !binary |-
-    NWQ3NjQyN2U1MzI4MjExMzIyNjAwNDFiYzQxMmMyMTdjMTNjNTE0N2FmMDU3
-    OWQ2NDc5OGIxMzVlOGZjNDUwMzY2MTliNjg5YjU2ZTkxZWYwYTUwM2QxZTgy
-    M2FhOWVhYWYwZjgzZTI5ZTM4YWYzMThmMDZlYzE0YjEwMGM2N2Q=
+    M2M0NGI4Njg1MjdkZDRiZWJiYmJiYTJlNTE3YmY5YTM3MWEyNTQwMGVkOTlm
+    OGRiNDgzNTIyNjZiMWFkZGFkM2Q2ZDJkOTgyNDdlMjc5OGNkOTMxNWEyMTM4
+    YjNhMWIzYWIxMmM0NWEyZjFmNzVkNjczODcxMjQ0YTlkN2ZhNDE=
   data.tar.gz: !binary |-
-    NGMwNjFlZDEwZjlhZDZkNjY0M2E4MTJlY2Q3YTdhNzVhOGUzNmYwMWQ5MzA5
-    OTIzOGRiMjZlNjZmMjE4YTIxYjg0ZjhkMTQwMjA3MjUxNTNhNTdkMGRkYzkw
-    MTgwOWZmNTZkYWE3ZTg4Y2RjMDYxYWY1Y2ZiNGFlZDZmZWFkNmQ=
+    YTNlM2M5MzZlOWQyY2FmN2NjOTA0NzUzNTlhMTBhMDNhYWMwYjQwZGUyMjVl
+    OGZlM2Y1MWYyMzg5NTUyYjM2YWFhZTk4Zjg0MjViYWM5NGNhNGE1YWIyYjBk
+    OWE5MjFlZGY4YTY4YmExYzU5ZTIwNmYzMzQ5M2RkMmQzMTA3NTE=

data/lib/fisher_classifier/classifier.rb

@@ -17,7 +17,7 @@ module FisherClassifier
     def classify(text)
       features = get_features(text)
       best = default_category
-      max = 0.0
+      max = fisher_threshold
 
       categories.each do |category|
         prob = fisher_prob(category, features)
@@ -41,16 +41,16 @@ module FisherClassifier
       )
     end
 
+    def fisher_factor(probs_multiply)
+      -2 * Math.log(probs_multiply)
+    end
+
     def probs_multiply(features, category)
       fprobs = features.map { |f| weighted_prob(f, category) }
       probs_multiply = fprobs.inject(:*)
       probs_multiply ||= 0
     end
 
-    def fisher_factor(probs_multiply)
-      -2 * Math.log(probs_multiply)
-    end
-
     def feature_prob(feature, category)
       cc = category_count(category)
       return cc if cc.zero?
@@ -59,10 +59,10 @@ module FisherClassifier
     end
 
     def weighted_prob(feature, category)
-      current_prob = category_prob(feature, category)
+      current_prob = category_prob(category, feature)
       totals = feature_in_all_categories(feature)
 
-      (weight * ap + totals * current_prob) / ( weight + totals).to_f
+      (weight * assumed_prob + totals * current_prob) / ( weight + totals).to_f
     end
 
     def feature_in_all_categories(feature)
@@ -70,7 +70,7 @@ module FisherClassifier
       counts.inject(:+)
     end
 
-    def category_prob(feature, category)
+    def category_prob(category, feature)
       fp = feature_prob(feature, category)
       return fp if fp.zero?
 
@@ -94,44 +94,13 @@ module FisherClassifier
       [sum, 1.0].min
     end
 
-    def default_category
-      @config.call(:default_category)
-    end
-
-    def category_threshold(category)
-      @config.call(:category_threshold, category)
-    end
-
-    def weight
-      @config.get(:weight)
-    end
-
-    def ap
-      @config.get(:ap)
-    end
-
-    def get_features(text)
-      @config.call(:get_features, text)
-    end
-
-    def categories
-      @config.call(:categories)
-    end
-
-    def category_count(category)
-      @config.call(:category_count, category)
-    end
-
-    def features_count(feature, category)
-      @config.call(:features_count, feature, category)
-    end
-
-    def inc_feature(feature, category)
-      @config.call :inc_feature, feature, category
+    def method_missing(key, *values, &block)
+      if @config.respond_to?(key, values)
+        @config.call key, *values
+      else
+        @config.get(key)
+      end
     end
 
-    def inc_category(category)
-      @config.call :inc_category, category
-    end
   end
 end

data/lib/fisher_classifier/config.rb

@@ -3,8 +3,9 @@ module FisherClassifier
 
     def initialize(block)
       @config = {
+        fisher_threshold: 0,
         weight: 1.0,
-        ap: 0.5
+        assumed_prob: 0.5
       }
       @methods = {}
       instance_eval &block
@@ -30,5 +31,9 @@ module FisherClassifier
       end
     end
 
+    def respond_to_missing?(method_name, include_private = false)
+      @methods.has_key? method_name
+    end
+
   end
 end

data/lib/fisher_classifier/meta.rb

@@ -40,7 +40,7 @@ module FisherClassifier
       categories.map do |category|
         {
           name: category,
-          category_prob: category_prob(feature, category),
+          category_prob: category_prob(category, feature),
           feature_prob: feature_prob(feature, category),
           weighted_prob: weighted_prob(feature, category),
           freqsum: feature_freqsum(feature, category)

data/lib/fisher_classifier/version.rb

@@ -1,3 +1,3 @@
 module FisherClassifier
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fisher_classifier
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew8xx8