scoruby 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79744e1d26538f6439febfcec9d204f1b32230ca
-  data.tar.gz: aff86cee1ebd5e380b9d58fc5e2763474b6a2a87
+  metadata.gz: 18cd7707e6697afbec6c3f379673284e314a852e
+  data.tar.gz: ad6be58c00b30f7763e8605a8997037d034538d4
 SHA512:
-  metadata.gz: 090dc196102cb081225cc0a308bb5f54745e57900d8a0f33b9cafbae8f0d91d2fcfca3190c8ad1dc0b2ad48363d3925759d3e54ddde0519a570fdf382cd1a2ae
-  data.tar.gz: 3f0fcd6f3a85d55dcbfa450548856e2a49f5d17c4b71438c51da543fa1ee87c68fd65013ac1b7ccf19f8cfd296788f2b000fd6d3559006df0156291980c1bd96
+  metadata.gz: 2f2a3a2bddcb481c1252d0715a2b7b20b56739797c38360d2f62911a9ca932fae6339748ea45255d4dd8b9e4a46d025580cfa9814a5c7167dd281a2fa628069c
+  data.tar.gz: e0fdc1cba17e1a026d6949395f6ba46040736dbccbcf31a05a558d483c377f7dc3b5d0d3dd1fabaf4c09053c997b803b3d5b9d273024ccd74e32997231ff5889

data/Gemfile.lock

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

data/lib/scoruby.rb

@@ -21,6 +21,11 @@ module Scoruby
     ModelFactory.factory_for(xml)
   end
 
+  def self.load_model_from_string(pmml_string)
+    xml = xml_from_string(pmml_string)
+    ModelFactory.factory_for(xml)
+  end
+
   def self.xml_from_file_path(pmml_file_name)
     pmml_string = File.open(pmml_file_name, 'rb').read
     xml_from_string(pmml_string)

data/lib/scoruby/decision.rb

@@ -21,7 +21,11 @@ module Scoruby
     def probability(score_distribution, xml)
       probability = score_distribution.attributes['probability'].to_s
       return probability.to_f if probability != ''
-      score_distribution.attributes['recordCount'].to_s.to_f / xml.attributes['recordCount'].to_s.to_f
+      record_count(score_distribution) / record_count(xml)
+    end
+
+    def record_count(xml)
+      xml.attributes['recordCount'].to_s.to_f
     end
   end
 end

data/lib/scoruby/model_factory.rb

@@ -31,7 +31,7 @@ module Scoruby
 
     def self.random_forest?(xml)
       xml.xpath('PMML/MiningModel/@modelName').to_s == RANDOM_FOREST_MODEL ||
-        xml.xpath('//Extension').to_s.include?('RandomForestClassifier')
+        xml.at('//Segmentation[@multipleModelMethod="average"]')
     end
 
     def self.gbm?(xml)

data/lib/scoruby/models/decision_tree.rb

@@ -9,7 +9,7 @@ module Scoruby
 
       def initialize(tree_xml)
         @id   = tree_xml.attribute('id')
-        @root = Node.new(tree_xml.xpath('TreeModel/Node'))
+        @root = Node.new(tree_xml.at_xpath('TreeModel/Node'))
       end
 
       def decide(features)

data/lib/scoruby/models/gradient_boosted_model/data.rb

@@ -39,15 +39,18 @@ module Scoruby
         end
 
         def fetch_categorical_features
-          @xml.xpath('//DataField')
-              .select { |xml| xml.attr('optype') == 'categorical' }
-              .reject { |xml| xml.attr('name') == target }
-              .each_with_object(Hash.new([])) do |xml, res|
+          categorical_features_xml.each_with_object(Hash.new([])) do |xml, res|
             res[xml.attr('name').to_sym] = xml.xpath('Value')
                                               .map { |xml| xml.attr('value') }
           end
         end
 
+        def categorical_features_xml
+          @xml.xpath('//DataField')
+              .select { |xml| xml.attr('optype') == 'categorical' }
+              .reject { |xml| xml.attr('name') == target }
+        end
+
         def target
           @target ||= @xml.xpath('//MiningField')
                           .find { |xml| xml.attr('usageType') == 'target' }
@@ -55,8 +58,15 @@ module Scoruby
         end
 
         def const_by_version
-          return Float(@xml.xpath(CONST_XPATH).to_s) if ModelFactory.gbm_4_3?(@xml)
-          Float(@xml.xpath(CONST_XPATH_4_2).first.content)
+          ModelFactory.gbm_4_3?(@xml) ? const_pmml_4_3 : const_pmml_4_2
+        end
+
+        def const_pmml_4_2
+          @xml.xpath(CONST_XPATH_4_2).first.content.to_f
+        end
+
+        def const_pmml_4_3
+          @xml.xpath(CONST_XPATH).to_s.to_f
         end
       end
     end

data/lib/scoruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoruby
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Asaf Schers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler