scoruby 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00aa54edc46f55d9595e7f972b2983be9389c269
-  data.tar.gz: 3a191d0e24aa19310106d6eb99b67541e7edd4ed
+  metadata.gz: 93c138affde68fe560e717bfae175c9d09482a60
+  data.tar.gz: bc5bc484924d557dd0eda09b85100203c2fb3ffd
 SHA512:
-  metadata.gz: 192cb38df033c13c9dbda5871dd9e88222638912fd1a86cdb1ad530174a1da2c92d94217cab2063579836acdbfb3c0fdd5e28768580484fe0b3d247a1063c11e
-  data.tar.gz: 1f7560f9d42563feea72eaa11e380a30df1e6d02443eda182e2fb4853650da879605ccbb8726936bb00919581244b7ce129c50a354f8098e4b8cc9bb5385eb57
+  metadata.gz: 0cebad971eb0b272d45d8ca789e3cf93319066d7f0510ab6bc4798e09ee3d045513e1c2121106204adce8d7060e2d268f60cff748f88a3d248634a1577753089
+  data.tar.gz: 74a38b0428e889e3896a5c0942f11e20415861590354fede7cd0ffc2b76245af2627babfdfeea406bb5c2f8f92edc2e9c708607b88f9d4184059ad73e1152959

data/Gemfile.lock

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

data/lib/scoruby/{models_factory.rb → model_factory.rb}

@@ -6,9 +6,10 @@ require 'scoruby/models/random_forest/model'
 require 'scoruby/models/naive_bayes/model'
 
 module Scoruby
-  class ModelsFactory
+  class ModelFactory
     RANDOM_FOREST_MODEL       = 'randomForest_Model'
-    GBM_INDICATION            = '//OutputField[@name="scaledGbmValue"]'
+    GBM_INDICATION_4_2        = '//OutputField[@name="scaledGbmValue"]'
+    GBM_INDICATION_4_3        = '//OutputField[@name="gbmValue"]'
     MODEL_NOT_SUPPORTED_ERROR = 'model not supported'
 
     def self.factory_for(xml)
@@ -33,7 +34,15 @@ module Scoruby
     end
 
     def self.gbm?(xml)
-      !xml.xpath(GBM_INDICATION).empty?
+      gbm_4_2?(xml) || gbm_4_3?(xml)
+    end
+
+    def self.gbm_4_2?(xml)
+      !xml.xpath(GBM_INDICATION_4_2).empty?
+    end
+
+    def self.gbm_4_3?(xml)
+      !xml.xpath(GBM_INDICATION_4_3).empty?
     end
   end
 end

data/lib/scoruby/models/gbm.rb

@@ -8,12 +8,13 @@ module Scoruby
     class Gbm
       GBM_FOREST_XPATH = '//Segmentation[@multipleModelMethod="sum"]/Segment'
       CONST_XPATH      = '//Target/@rescaleConstant'
+      CONST_XPATH_4_2  = '//Constant'
 
       def initialize(xml)
         @decision_trees = xml.xpath(GBM_FOREST_XPATH).map do |xml_tree|
           DecisionTree.new(xml_tree)
         end
-        @const = Float(xml.xpath(CONST_XPATH).to_s)
+        @const = const(xml)
       end
 
       def tree_count
@@ -28,6 +29,13 @@ module Scoruby
         sum = scores.reduce(:+) + @const
         Math.exp(sum) / (1 + Math.exp(sum))
       end
+
+      private
+
+      def const(xml)
+        return Float(xml.xpath(CONST_XPATH).to_s) if ModelFactory.gbm_4_3?(xml)
+        Float(xml.xpath(CONST_XPATH_4_2).first.content)
+      end
     end
   end
 end

data/lib/scoruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Scoruby
-  VERSION = '0.2.11'
+  VERSION = '0.2.12'
 end

data/lib/scoruby.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'scoruby/version'
-require 'scoruby/models_factory'
+require 'scoruby/model_factory'
 require 'nokogiri'
 require 'logger'
 
@@ -18,7 +18,7 @@ module Scoruby
 
   def self.load_model(pmml_file_name)
     xml = xml_from_file_path(pmml_file_name)
-    ModelsFactory.factory_for(xml)
+    ModelFactory.factory_for(xml)
   end
 
   def self.xml_from_file_path(pmml_file_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoruby
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Asaf Schers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,13 +130,13 @@ files:
 - lib/scoruby.rb
 - lib/scoruby/decision.rb
 - lib/scoruby/features.rb
+- lib/scoruby/model_factory.rb
 - lib/scoruby/models/decision_tree.rb
 - lib/scoruby/models/gbm.rb
 - lib/scoruby/models/naive_bayes/model.rb
 - lib/scoruby/models/naive_bayes/model_data.rb
 - lib/scoruby/models/random_forest/data.rb
 - lib/scoruby/models/random_forest/model.rb
-- lib/scoruby/models_factory.rb
 - lib/scoruby/node.rb
 - lib/scoruby/predicate_factory.rb
 - lib/scoruby/predicates/compound_predicate.rb
@@ -169,9 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby Scoring API for PMML.
 test_files: []
-has_rdoc: