tonality_analyser 0.0.2 → 0.0.3

data/Rakefile

@@ -4,5 +4,6 @@ require 'rspec/core/rake_task'
 
 task :default => :spec
 desc 'Run tests with RSpec'
-RSpec::Core::RakeTask.new(:spec)
-
+RSpec::Core::RakeTask.new(:spec) do |s|
+  s.rspec_opts = '--color'
+end

data/lib/tonality_analyser/engine.rb

@@ -1,42 +1,29 @@
 module TonalityAnalyser
 
-  # Refactor: work to Redis !
-  #   Redis ! Redis ! Redis ! Redis ! Redis ! :)
   class Engine
     TONALITIES = [:pos, :neg]
     attr_reader :counted_words, :probabilites
     def initialize
-      @total_words = {}
-      @total_words[:all] = 0
-      @total_words[:pos] = 0
-      @total_words[:neg] = 0
       @counted_words = {}
       @counted_words[:pos] = {}
       @counted_words[:neg] = {}
       @probabilites = {}
       @probabilites[:pos] = {}
       @probabilites[:neg] = {}
-      @spec_probabilites = {}
-      @spec_probabilites[:pos] = {}
-      @spec_probabilites[:neg] = {}
     end
     def train(words, tonality)
       raise "Invalid tonality '#{tonality}'" unless TONALITIES.include?(tonality)
       words.split.each do |w|
         word = Helpers::Text.normalize(w)
-        @total_words[:all] += 1
         @counted_words[tonality][word] = @counted_words[tonality].include?(word) ? @counted_words[tonality][word]+1 : 1
       end
     end
     def compute_probabilities!
-      # TODO: Refactor this :)
-      @counted_words[:pos].each do |word, count|
-        @probabilites[:pos][word] = @counted_words[:pos][word].to_f / (@counted_words[:pos][word].to_f + @counted_words[:neg][word].to_f)
-        @spec_probabilites[:pos][word] = @probabilites[:pos][word]
-      end
-      @counted_words[:neg].each do |word, count|
-        @probabilites[:neg][word] = @counted_words[:neg][word].to_f / (@counted_words[:pos][word].to_f + @counted_words[:neg][word].to_f)
-        @spec_probabilites[:neg][word] = @probabilites[:neg][word]
+      TONALITIES.each {|t| compute_probabilities_for(t) }
+    end
+    def compute_probabilities_for(tonality)
+      @counted_words[tonality].each do |word, count|
+        @probabilites[tonality][word] = @counted_words[tonality][word].to_f / TONALITIES.each.inject(0) { |sum, t| sum += @counted_words[t][word].to_f }
       end
     end
     def analysis(text, tonality)
@@ -44,18 +31,12 @@ module TonalityAnalyser
 
       words = Helpers::Text.clean_words_from(text)
       words.each do |word|
-        @spec_probabilites[tonality][word] ||= 0.01
-        num *= @spec_probabilites[tonality][word]
-      end
-      num *= 0.5
-      words.each do |word|
-        @probabilites[tonality][word] ||= 0.01
-        den1 *= @probabilites[tonality][word]
-      end
-      words.each do |word|
-        den2 *= (1 - @probabilites[tonality][word])
+        p = @probabilites[tonality][word] || 0.01
+        num *= p
+        den1 *= p
+        den2 *= (1 - p)
       end
-      proba_pol = num / (den1 + den2)
+      proba_pol = num*0.5 / (den1 + den2)
       proba_pol = 0.0 if proba_pol.nan?
       proba_pol
     end

data/lib/tonality_analyser/version.rb

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

data/spec/tonality_analyser_spec.rb

@@ -12,4 +12,16 @@ describe TonalityAnalyser::Engine do
     e.tonality('want') == :pos
     e.tonality('Thanks') == :pos
   end
+
+  it 'propose tonality' do
+    e = TonalityAnalyser::Engine.new
+    e.train "c'est super !", :pos
+    e.train "encore un beau ", :pos
+    e.train "nul nul nul", :neg
+    e.train "pas tres beau projet", :neg
+    e.compute_probabilities!
+    e.tonality('super beau projet').should == :pos
+    e.tonality('c\'est nul').should == :neg
+  end
+
 end

metadata

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