artemo 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e5d7350349eadce2c67667225cc6f4e63665c31
-  data.tar.gz: 5b149744bea4ba98acf4ec63a960140e40075f5c
+  metadata.gz: 23724fad07817c5010b8bbcceebeaf53821c9576
+  data.tar.gz: 86b1473a7688193b0702dbc85cc80e026bd9a904
 SHA512:
-  metadata.gz: 75d6302af2ddd330c94474d0c60e42829a84c0fde081f2d54a3a58cd78d5934a83a9ddc5775b9c6e2e1b20e827047a1116d50b2b7af4f071a020444503e9534e
-  data.tar.gz: 68f9f9a043db2e5a84c9054ad8536598daa71cab829fd1123ac1a60d6e23882d8436b4c99cc7dc8c52d5ee3bd3b16704d12bec0569468a9a73b29ac59562d6d2
+  metadata.gz: c4ccff9b0ef6501516c7e38815b075a6c2e61efe513bc3af1baf283076fb38039da8a133635b1061a61da141749b7a5d0e0afde34a88c97671efb80095b509c1
+  data.tar.gz: 2a2a13cbd11a294f6901d659ca2c1966fbc1b84d3ca66bafa6ce4422db779685ecfd706f524ea89226d126170ddd32c6b731515315ae7d605483d2a13517c8ce

data/CHANGELOG

@@ -48,3 +48,6 @@ Full documentation is added. Faster comparing word with keyword.
 
 Version 3.1.4
 Add plotting library. 
+
+Version 3.1.5
+Better scaling mathod. 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    artemo (3.1.4)
+    artemo (3.1.5)
       squid (~> 1.3)
 
 GEM

data/README.md

@@ -72,6 +72,10 @@ Version 3.1.4
 
 * Add plotting library. 
 
+Version 3.1.5
+
+* Better scaling mathod. 
+
 ## Examples:
 
 ### Adam Mickiewicz - Świtezianka

data/lib/artemo/basic_emotions.rb

@@ -18,6 +18,7 @@ class BasicEmotions < Common
 
   # @note This method compare two words, if word is in array text then add one.
 
+  private
   def self.compare
     sum_array = Array.new(8).fill(0)
     @keywords.each.with_index do |line, index|
@@ -31,6 +32,7 @@ class BasicEmotions < Common
   # @note This method is after inherited method comparing values in gradient,
   #   and it's checking which value is greater, if it's greater then it is true.
 
+  private
   def self.check(array_one)
     values_array = Array.new(8).fill(0)
     array_one.each_index do |index|
@@ -50,6 +52,7 @@ class BasicEmotions < Common
   # @note This method check which value is true and if it's true add two,
   #   else add one.
 
+  private
   def self.weigh(array_one, array_two)
     weighed_array = Array.new(8).fill(0)
     array_one.each.with_index do |item, index|
@@ -66,6 +69,7 @@ class BasicEmotions < Common
 
   # @note This method is expanding 8 element array to 24 element array in ranges.
 
+  private
   def self.expand(array_one)
     expanded_array = Array.new(24).fill(0)
     array_one.each.with_index do |item, index|

data/lib/artemo/common.rb

@@ -7,7 +7,7 @@ class Common
   def self.scale(array_one)
     min, max = array_one.minmax
     array_one.each.with_index do |item, index|
-      array_one[index] = (((100.0 - 0.0) / (max - min)) * (item - max) + 100.0).floor
+      array_one[index] = (((100.0 - 1.0) / (max - min)) * (item - max) + 100.0).floor
     end
     array_one
   end

data/lib/artemo/complex_emotions.rb

@@ -12,6 +12,7 @@ class ComplexEmotions < Common
 
   # @note This method is sorting values by pattern x+0, x+8, x+16 then (x*3), (x*3)+1, (x*3)+2.
 
+  private
   def self.sort(array_one)
     sorted_array = Array.new(24)
     tmp_array = Array.new(3)
@@ -29,6 +30,7 @@ class ComplexEmotions < Common
 
   # @note This method is summing values if they are greater than 25.
 
+  private
   def self.sum(array_one)
     sum_array = Array.new(24).fill(0)
     index = 0

data/lib/artemo/plot.rb

@@ -5,7 +5,6 @@ class Plot
   # @note This method is plotting data to pdf. 
 
   def self.call(hash)
-    hash.delete_if{|_,v| v == 0}
     Prawn::Document.generate 'emotions.pdf' do
       data = {views: hash}
       chart data, legend: false, label: true, format: :percentage 

data/lib/artemo/result.rb

@@ -1,26 +1,29 @@
 # @note This class show results
 # @return [Hash] of sorted complex emotions
-class Result
+class Result < Common
 
   # @note This method initializes all class
 
   def self.call(array_one)
-    show(array_one)
+    scaled = scale(array_one)
+    finish(scaled)
   end
 
   # @note This method is showing results.
-
-  def self.show(array_one)
+  
+  private
+  def self.finish(array_one)
     results = {}
-    _min, max = array_one.minmax
     array_one.each_index do |index|
-      results[titles[index]] = ((array_one[index].to_f / max.to_f) * 100.0).round(2)
+      results[titles[index]] = array_one[index]
     end
+    results.delete_if{|_k, v| v == 1 || v == 2}
     results.sort_by { |_k, v| v }.to_h
   end
 
   # @note This method is storing titles of emotions in Array.
 
+  private
   def self.titles
     ['love', 'guilt', 'delight', 'submission', 'curiosity', 'sentimentality', 'awe', 'despair', 'shame', 'disappointment', 'revulsion', 'outrage', 'remorse', 'envy', 'pessimism', 'contempt', 'cynicism', 'morbidness', 'aggressiveness', 'pride', 'dominance', 'optimism', 'fatalism', 'anxiety']
   end

data/lib/artemo/version.rb

@@ -1,4 +1,4 @@
 # @note This module returns version
 module ArtEmo
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

data/spec/test_artemo_basic_emotions_spec.rb

@@ -4,32 +4,7 @@ describe BasicEmotions do
   context 'Basic emotions: ' do
     it 'call to first method' do
       be = BasicEmotions.call [['test'], ['test'], ['test'], ['test'], ['test'], ['test'], ['test'], ['test']], ['test']
-      expect(be).to eq [33, 0, 33, 0, 33, 0, 33, 0, 34, 0, 34, 0, 34, 0, 34, 0, 33, 0, 33, 0, 33, 0, 33, 0]
-    end
-
-    it 'check method' do
-      be = BasicEmotions.check([50, 0, 25, 0, 0, 50, 0, 75])
-      expect(be).to eq [true, false, true, false, false, true, false, true]
-    end
-
-    it 'weigh method' do
-      be = BasicEmotions.weigh([50, 25, 25, 12, 25, 50, 35, 75], [true, false, true, false, false, true, false, true])
-      expect(be).to eq [100, 25, 50, 12, 25, 100, 35, 150]
-    end
-
-    it 'scale method' do
-      be = BasicEmotions.scale([100, 25, 50, 12, 25, 100, 35, 150])
-      expect(be).to eq [63, 9, 27, 0, 9, 63, 16, 100]
-    end
-
-    it 'expand method #1' do
-      be = BasicEmotions.expand([63, 9, 27, 0, 9, 63, 16, 100])
-      expect(be).to eq [0, 0, 0, 0, 0, 0, 0, 33, 30, 0, 0, 0, 0, 30, 0, 34, 33, 9, 27, 0, 9, 33, 16, 33]
-    end
-
-    it 'expand method #2' do
-      be = BasicEmotions.expand([100, 100, 0, 0, 0, 0, 0, 0])
-      expect(be).to eq [33, 33, 0, 0, 0, 0, 0, 0, 34, 34, 0, 0, 0, 0, 0, 0, 33, 33, 0, 0, 0, 0, 0, 0]
+      expect(be).to eq [33, 0, 33, 0, 33, 0, 33, 0, 34, 0, 34, 0, 34, 0, 34, 0, 33, 1, 33, 1, 33, 1, 33, 1]
     end
   end
 end

data/spec/test_artemo_common_spec.rb

@@ -4,7 +4,7 @@ describe Common do
   context 'Common method ' do
     it 'scale' do
       s = Common.scale([500, 250, 100, 50, 25, 0, -75])
-      expect(s).to eq [100, 56, 30, 21, 17, 13, 0]
+      expect(s).to eq [100, 56, 31, 22, 18, 13, 1]
     end
   end
 end

data/spec/test_artemo_complex_emotions_spec.rb

@@ -6,20 +6,5 @@ describe ComplexEmotions do
       ce = ComplexEmotions.call [33, 33, 0, 0, 0, 0, 0, 0, 34, 34, 0, 0, 0, 0, 0, 0, 33, 33, 0, 0, 0, 0, 0, 0]
       expect(ce).to eq [97, 97, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
     end
-
-    it 'sort method' do
-      ce = ComplexEmotions.sort [97, 97, 0, 0, 0, 0, 0, 0, 100, 100, 0, 0, 0, 0, 0, 0, 97, 97, 0, 0, 0, 0, 0, 0]
-      expect(ce).to eq [97, 100, 97, 97, 100, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-    end
-
-    it 'sum method #1' do
-      ce = ComplexEmotions.sum [97, 97, 0, 0, 0, 0, 0, 0, 100, 100, 0, 0, 0, 0, 0, 0, 97, 97, 0, 0, 0, 0, 0, 0]
-      expect(ce).to eq [97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-    end
-
-    it 'sum method #2' do
-      ce = ComplexEmotions.sum [100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 0, 0]
-      expect(ce).to eq [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0]
-    end
   end
 end

data/spec/test_artemo_result_spec.rb

@@ -3,21 +3,21 @@ require 'artemo'
 describe Result do
   context 'Results ' do
     it 'show love' do
-      s = Result.show([100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+      s = Result.call([100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
       sh = s.keys.last
       expect(sh).to eq "love"
     end
     
     it 'show despair' do
-      s = Result.show([0, 0, 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+      s = Result.call([0, 0, 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
       sh = s.keys.last
       expect(sh).to eq "despair"
     end
     
     it 'min, max' do
-      s = Result.show([100, 30, 30, 30, 30, 30, 30, 5, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 700, 30])
+      s = Result.call([100, 30, 30, 30, 30, 30, 30, 5, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 700, 30])
       min, max = s.values.minmax
-      expect(min).to eq 0.71
+      expect(min).to eq 4.0
       expect(max).to eq 100.0
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artemo
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Łukasz Fuszara