scoruby 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59d91f99c8a04a124993b71950d425f6b1b89353
-  data.tar.gz: ee709d362a7699749561a7d1cb60f7b7aa40c902
+  metadata.gz: 5ab6779638032408bc0a38812ded29891831aebd
+  data.tar.gz: d26d4338fdbb2f00a7d6fed974a6e2d577c1d847
 SHA512:
-  metadata.gz: 4d433e761e5fc203d298ecec3fb5019e024ae6cd753296f08b304fc0dd790017f5ff0e8621a34995811d6db21c475f3e91a41d079722c5c1ec888d151740c9c6
-  data.tar.gz: c347e88a7cf8e5345be89160f6f6f6f07ff2bb7dfed93401f02700e898886b3205e0ced850ba1fad247779f4b0f16c712b751aca46be15ac0d75b6fe3f1cc9d1
+  metadata.gz: 080081fe11bdba935bdd99b178ce74a04d1d05dadc080283f9e474a4d84e8415d2a39cf6a9916c4ee46c78fb46965aa934a0850491de04f6fd1d5806aaa32463
+  data.tar.gz: 38a7ac8547797f2367fcd66036ea87971c531106c0dd0b4c56abf684f48a72db14a9139fa5ff29b0e809aadb5ffb0908a265a603aa6d3ddf5725dc4858cdab0a

data/.gitignore

@@ -1,10 +1,14 @@
 .idea
-*.log
-
-test_gbm.rb
+coverage
 
-test_gbm.pmml
+*.log
 
 *.gem
 
+spec/fixtures/decision_tree_v2.pmml
+
 sample.pmml
+
+test_gbm.pmml
+
+test_gbm.rb

data/Gemfile.lock

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

data/lib/scoruby/models/decision_tree.rb

@@ -1,4 +1,4 @@
-require 'node'
+require 'scoruby/node'
 
 module Scoruby
   module Models
@@ -25,15 +25,9 @@ module Scoruby
       private
 
       def step(curr, features)
-        curr = step_on_true(curr, features, 0)
-        curr = step_on_true(curr, features, 1)
-        curr = step_on_true(curr, features, 2)
-        curr
-      end
-
-      def step_on_true(curr, features, num)
-        return curr.children[num] if curr.children && curr.children[num] && curr.children[num].true?(features)
-        curr
+        return curr unless curr.children
+        next_step = curr.children.find { |c| c && c.true?(features) }
+        next_step || curr
       end
 
       def didnt_step?(curr, prev)

data/lib/scoruby/models/gbm.rb

@@ -1,5 +1,5 @@
-require 'models/decision_tree'
-require 'features'
+require 'scoruby/models/decision_tree'
+require 'scoruby/features'
 
 module Scoruby
   module Models

data/lib/scoruby/models_factory.rb

@@ -1,6 +1,6 @@
-require 'models/decision_tree'
-require 'models/gbm'
-require 'models/random_forest'
+require 'scoruby/models/decision_tree'
+require 'scoruby/models/gbm'
+require 'scoruby/models/random_forest'
 
 module Scoruby
   class ModelsFactory

data/lib/scoruby/node.rb

@@ -1,5 +1,5 @@
-require 'predicate_factory'
-require 'decision'
+require 'scoruby/predicate_factory'
+require 'scoruby/decision'
 
 module Scoruby
   class Node
@@ -13,16 +13,9 @@ module Scoruby
         children.select {|c| c.name == 'ScoreDistribution'})
 
       children = remove_nodes(children)
-
-      pred_xml  = children[0]
-      @pred     = PredicateFactory.for(pred_xml)
-      @children = []
-
-      return if children.count == 1
-
-      @children << Node.new(children[1]) if children[1]
-      @children << Node.new(children[2]) if children[2]
-      @children << Node.new(children[3]) if children[3]
+      
+      @pred     = PredicateFactory.for(children[0])
+      @children = children_nodes(children)
     end
 
     def true?(features)
@@ -31,6 +24,11 @@ module Scoruby
 
     private
 
+    def children_nodes(children)
+      children.select { |c| c.name == 'Node' }
+        .map { |child| Node.new(child) }
+    end
+
     def remove_nodes(children)
       children.reject {|c| %w(Extension ScoreDistribution).include? c.name}
     end

data/lib/scoruby/predicate_factory.rb

@@ -1,8 +1,8 @@
-require 'predicates/compound_predicate'
-require 'predicates/simple_predicate'
-require 'predicates/simple_set_predicate'
-require 'predicates/true_predicate'
-require 'predicates/false_predicate'
+require 'scoruby/predicates/compound_predicate'
+require 'scoruby/predicates/simple_predicate'
+require 'scoruby/predicates/simple_set_predicate'
+require 'scoruby/predicates/true_predicate'
+require 'scoruby/predicates/false_predicate'
 
 module Scoruby
   class PredicateFactory

data/lib/scoruby/version.rb

@@ -1,3 +1,3 @@
 module Scoruby
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Asaf Schers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler