scoruby 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1c339dc5c029d90d8e3a495af90499368bc92d
-  data.tar.gz: 5ff3c0147290c83d76261b9a6907e35ca493b678
+  metadata.gz: aba708affa4e656a44a43d1f24b71b696760b7bd
+  data.tar.gz: d52253a2d308e3d7f7749f379feae9757e866887
 SHA512:
-  metadata.gz: 8843f6c37d4b4d4e30f018348b5ec113e66558b2c78c945f4755ea01554b609af3dbb4a50334143ffa8f4bab205303b833831273a97bd18a2ecc9fa4e214f401
-  data.tar.gz: 94078bb11bd0cf3490c93c90e822fed248d4721e24a2623004d2cd3af8805407d6a69599ba2d753bd024caefb0d7e08eb8ddebefef1f37b3dbfe2dcdf49a3bad
+  metadata.gz: 7f1dcf1c79cea6278c5a584c7390acaf275104fde029e83514d3cbf39859c840944d3893076c658c6eca9506add2c192525f5fbf6f6c65e1e8871ff5ddd6429f
+  data.tar.gz: e9d4f29650d95e74ae6e45c5fd5a4ef8435d552b792f558c9e15c07ce6d4d02f2bbe64ae34d07cfcbc55a4afe0f554df2adb79b25d0a1dfc69d611cc3b660a8a

data/.gitignore

@@ -12,3 +12,5 @@ spec/fixtures/decision_tree_v2.pmml
 test_gbm.pmml
 
 test_gbm.rb
+
+titanic_rf.pmml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scoruby (0.2.5)
+    scoruby (0.2.6)
       nokogiri (~> 1.7)
 
 GEM

data/README.md

@@ -7,7 +7,7 @@
 
 Ruby scoring API for Predictive Model Markup Language (PMML).
 
-Currently supports Decision Tree, Random Forest and Gradient Boosted Models.
+Currently supports Decision Tree, Random Forest Naive Bayes and Gradient Boosted Models.
 
 Will be happy to implement new models by demand, or assist with any other issue.
 
@@ -50,7 +50,7 @@ features =  {
 
 random_forest.predict(features)
 
-=> "0"
+=> {:label=>"0", :score=>0.882}
 
 random_forest.decisions_count(features)
 
@@ -88,22 +88,21 @@ gbm.score(features)
 
 ```ruby
 decision_tree = Scoruby.get_model 'decision_tree.pmml'
-
-features =  {
-        Sex: 'male',
-        Parch: 0,
-        Age: 30,
-        Fare: 9.6875,
-        Pclass: 2,
-        SibSp: 0,
-        Embarked: 'Q'       
-    }
-
+features = { f1 : v1, ... } 
 decision_tree.decide(features)
 
 => #<Decision:0x007fc232384180 @score="0", @score_distribution={"0"=>"0.999615579933873", "1"=>"0.000384420066126561"}>
 ```
 
+### Naibve Bayes
+
+```ruby
+naive_bayes = Scoruby.get_model 'naive_bayes.pmml'
+features = { f1: v1 , ... } 
+naive_bayes.lvalues(features)
+naive_bayes.score(features, 'l1')
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/scoruby/models/naive_bayes/model_data.rb

@@ -30,7 +30,7 @@ module Scoruby
           @labels = {}
           @xml.xpath('//BayesOutput//TargetValueCount').each do |l|
             l.attr('value')
-            @labels[l.attr('value')] = {'count': l.attr('count').to_f}
+            @labels[l.attr('value')] = { 'count': l.attr('count').to_f }
           end
         end
         

data/lib/scoruby/models/random_forest.rb

@@ -19,7 +19,11 @@ module Scoruby
       end
 
       def predict(features)
-        decisions_count(features).max_by {|_, v| v}[0]
+        decisions_count = decisions_count(features)
+        {
+            label: decisions_count.max_by {|_, v| v}[0],
+            score: decisions_count.max_by {|_, v| v}[1] / decisions_count.values.reduce(0, :+).to_f
+        }
       end
     end
   end

data/lib/scoruby/version.rb

@@ -1,3 +1,3 @@
 module Scoruby
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoruby
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Asaf Schers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby Scoring API for PMML.