random_forester 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4464cbf26aa7ddb944082197474c6e5fe2c8a122
-  data.tar.gz: 8bc005154166a42ce313fb4657fd9b9acf0e4347
+  metadata.gz: 45b219cba170a847d0cc4db93503a726655ce212
+  data.tar.gz: 63ad36530b2d4dacede594fb5fd3df28a52d4634
 SHA512:
-  metadata.gz: 12093b7119a156e2c49d49639a6cb8b3b77abbd2058419800416781e8c08104f65752a0102ad4575cf477af1750eb1033e906602159298cd6b45b492513beabc
-  data.tar.gz: d6aefbe4e09e000ce3d26847ff13ccdac1d5f15c00dd082103c563546f554172240510a0f30f3ed6ddfb2ef463599991d3918c79efe1a034bca7728f9dff25b7
+  metadata.gz: 279ca796b380047cb0eb0de1d1e741540f410e2e3ca763a1b4f91dbe4e0b2d60f682fa94991dac1355100814a9e6c15edb2718dc62ddb3c94a1e3ca14f5d2f3a
+  data.tar.gz: 01bda06cc65bde79cef7cad504f0818333e74316d3d59aadf939ac7c6d0df520da7e28b8c5b94443724c1ec48eded7c56a2f4d5bc9e951aebdb7877b4b7d27b0

data/README.md

@@ -1,8 +1,12 @@
-# RandomForester
+<a href="https://codeclimate.com/github/asafschers/random_forester"><img src="https://codeclimate.com/github/asafschers/random_forester/badges/gpa.svg" /></a>
+[![Gem Version](https://badge.fury.io/rb/random_forester.svg)](https://badge.fury.io/rb/random_forester)
+[![Dependency Status](https://www.versioneye.com/user/projects/5870c8c42f149b00509e72a3/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/5870c8c42f149b00509e72a3)
+[![Build Status](https://travis-ci.org/asafschers/random_forester.svg?branch=master)](https://travis-ci.org/asafschers/random_forester)
+[![Code Triagers Badge](https://www.codetriage.com/asafschers/random_forester/badges/users.svg)](https://www.codetriage.com/asafschers/random_forester)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/random_forester`. To experiment with that code, run `bin/console` for an interactive prompt.
+# RandomForester
 
-TODO: Delete this and the text above, and describe your gem
+Reads Random Forest PMML files and creates Ruby Random Forest classifier model.
 
 ## Installation
 
@@ -22,7 +26,13 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+random_forest = RandomForester.get_model 'sample.pmml'
+features = {a: 1, b: true, c: "YES"}
+random_forest.predict(features)
+random_forest.decisions_count(features)
+```
+
 
 ## Development
 
@@ -32,7 +42,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/random_forester. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/asafschers/random_forester. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/categorical_predicate.rb

@@ -5,12 +5,19 @@ class CategoricalPredicate
   attr_reader :field
 
   def initialize(pred_xml)
-    @field = pred_xml.xpath('@field').to_s.to_sym
-    @array = pred_xml.xpath('Array/text()').to_s.tr('"', '').split('   ')
-    @operator = pred_xml.xpath('@booleanOperator').to_s
+    attributes = pred_xml.attributes
+    @field = attributes['field'].value.to_sym
+    @array = pred_xml.children[0].content.tr('"', '').split('   ')
+    @operator = attributes['booleanOperator'].value
   end
 
   def true?(features)
+    format_boolean(features)
     @array.include? features[@field] if @operator == IS_IN
   end
+
+  def format_boolean(features)
+    features[@field] = 'f' if features[@field] == false
+    features[@field] = 't' if features[@field] == true
+  end
 end

data/lib/decision_tree.rb

@@ -1,48 +1,36 @@
-require 'predicate'
-require 'rubytree'
+require 'node'
 
 class DecisionTree
-  ROOT = 'root'
-  LEFT = 'left'
-  RIGHT = 'right'
 
   attr_reader :root
 
   def initialize(tree_xml)
-    @id = tree_xml.xpath('@id')
-    @root = Tree::TreeNode.new(ROOT)
-    set_node(tree_xml.xpath('TreeModel/Node'), @root)
-  end
-
-  def set_node(tree_xml, root)
-    root.content = Predicate.new(tree_xml)
-
-    return if tree_xml.xpath('*').count == 1
-
-    root << Tree::TreeNode.new(LEFT)
-    root << Tree::TreeNode.new(RIGHT)
-
-    set_node(tree_xml.xpath('*')[1], root[LEFT]) if tree_xml.xpath('*')[1]
-    set_node(tree_xml.xpath('*')[2], root[RIGHT]) if tree_xml.xpath('*')[2]
+    @id = tree_xml.attribute('id')
+    @root = Node.new(tree_xml.xpath('TreeModel/Node'))
   end
 
   def decide(features)
     curr = @root
-    while curr.content.decision == ''
+    while curr.decision == ''
       prev = curr
-      curr = curr[LEFT] if curr[LEFT] && curr[LEFT].content.true?(features)
-      curr = curr[RIGHT] if curr[RIGHT] && curr[RIGHT].content.true?(features)
-
-      return if no_true_child?(curr, prev)
+      curr = step(curr, features)
+      return if didnt_step?(curr, prev)
     end
 
-    curr.content.decision
+    curr.decision
   end
 
-  def no_true_child?(curr, prev)
-    return false if (prev.content != curr.content)
-    RandomForester.logger.error "Null tree: #{@id}, bad feature: #{curr[LEFT].content.field }"
-    true
+  private
+
+  def step(curr, features)
+    curr = curr.left if curr.left && curr.left.true?(features)
+    curr = curr.right if curr.right && curr.right.true?(features)
+    curr
   end
 
+  def didnt_step?(curr, prev)
+    return false if (prev.pred != curr.pred)
+    RandomForester.logger.error "Null tree: #{@id}, bad feature: #{curr.left.pred.field }"
+    true
+  end
 end

data/lib/node.rb

@@ -0,0 +1,21 @@
+require 'predicate'
+
+class Node
+
+  attr_reader :decision, :left, :right, :pred
+
+  def initialize(xml)
+    children = xml.children
+    @pred = Predicate.new(children[0])
+
+    @decision = xml.attribute('score').to_s
+
+    return if children.count == 1
+    @left = Node.new(children[1]) if children[1]
+    @right = Node.new(children[2]) if children[2]
+  end
+
+  def true?(features)
+    @pred.nil? || @pred.true?(features)
+  end
+end

data/lib/numerical_predicate.rb

@@ -5,10 +5,10 @@ class NumericalPredicate
 
   attr_reader :field
 
-  def initialize(pred_xml)
-    @field = pred_xml.xpath('@field').to_s.to_sym
-    @value = Float(pred_xml.xpath('@value').to_s)
-    @operator = pred_xml.xpath('@operator').to_s
+  def initialize(attributes)
+    @field = attributes['field'].value.to_sym
+    @value = Float(attributes['value'].value)
+    @operator = attributes['operator'].value
   end
 
   def true?(features)

data/lib/predicate.rb

@@ -3,25 +3,10 @@ require 'categorical_predicate'
 
 class Predicate
 
-  attr_reader :decision
-
   def initialize(pred_xml)
-    @pred_xml =  pred_xml.xpath('*')[0]
-
-    @op = @pred_xml.xpath('@operator').to_s
-    @bool_op = @pred_xml.xpath('@booleanOperator').to_s
-
-    if !@op.empty?
-      @pred = NumericalPredicate.new(@pred_xml)
-    elsif !@bool_op.empty?
-      @pred = CategoricalPredicate.new(@pred_xml)
-    end
-
-    @decision = pred_xml.xpath('@score').to_s
-  end
-
-  def to_s
-    @pred_xml.to_s
+    attributes = pred_xml.attributes
+    @pred = NumericalPredicate.new(attributes) if attributes['operator']
+    @pred = CategoricalPredicate.new(pred_xml) if attributes['booleanOperator']
   end
 
   def field
@@ -29,7 +14,6 @@ class Predicate
   end
 
   def true?(features)
-    return true if @pred.nil?
     return if missing_feature?(features)
     return if nil_feature?(features)
     @pred.true?(features)

data/lib/random_forest.rb

@@ -9,9 +9,9 @@ class RandomForest
     }
   end
 
-  def decisions_count(fearures)
+  def decisions_count(features)
     decisions = @decision_trees.collect { |decision_tree|
-      decision_tree.decide(fearures)
+      decision_tree.decide(features)
     }
     decisions.inject(Hash.new(0)) { |h, e| h[e] += 1 ; h }
   end

data/lib/random_forester/version.rb

@@ -1,3 +1,3 @@
 module RandomForester
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/random_forester.rb

@@ -20,7 +20,7 @@ module RandomForester
   end
 
   def self.get_model(pmml_file_name)
-    xml = get_xml(pmml_file_name)
+    xml = xml_from_file_path(pmml_file_name)
     new_model(xml)
   end
 
@@ -30,12 +30,16 @@ module RandomForester
         RandomForest.new(xml)
       else
         raise MODEL_NOT_SUPPORTED_ERROR
-      end
+    end
   end
 
-  def self.get_xml(pmml_file_name)
+  def self.xml_from_file_path(pmml_file_name)
     pmml_string = File.open(pmml_file_name, 'rb').read
-    xml = Nokogiri::XML(pmml_string)
+    xml_from_string(pmml_string)
+  end
+
+  def self.xml_from_string(pmml_string)
+    xml = Nokogiri::XML(pmml_string) { |config| config.noblanks }
     xml.remove_namespaces!
   end
 

data/random_forester.gemspec

@@ -6,7 +6,7 @@ require 'random_forester/version'
 Gem::Specification.new do |spec|
   spec.name          = "random_forester"
   spec.version       = RandomForester::VERSION
-  spec.authors       = ["asaf schers"]
+  spec.authors       = ["Asaf Schers"]
   spec.email         = ["schers@riskified.com"]
 
   spec.summary       = %q{Creates a random forest object from a pmml file.}
@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
-  spec.add_dependency "nokogiri", "~> 1.6"
-  spec.add_dependency "rubytree"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_dependency "nokogiri", "~> 1.7"
+  spec.add_dependency "ruby-prof"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: random_forester
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
-- asaf schers
+- Asaf Schers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,58 +30,58 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rubytree
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,7 +112,7 @@ files:
 - bin/setup
 - lib/categorical_predicate.rb
 - lib/decision_tree.rb
-- lib/missing_categories_script.rb
+- lib/node.rb
 - lib/numerical_predicate.rb
 - lib/predicate.rb
 - lib/random_forest.rb

data/lib/missing_categories_script.rb

@@ -1,33 +0,0 @@
-require 'json'
-
-pmml_file = '' #pmml file name
-json = '' #get features json from oscd
-
-get_missing_categories(json,pmml_file)
-
-def get_category_feature_names(pmml_file)
-  xml = RandomForester.get_xml pmml_file;
-  features = {}
-  xml.xpath("PMML/DataDictionary/*").each { |df| features[df.xpath('@name').to_s] = df.xpath('@dataType').to_s }; nil
-  features.select { |_, v| v == 'string' }.keys
-end
-
-def get_categories(json, pmml_file)
-  curr_features = JSON.parse(json)
-  category_features = get_category_feature_names(pmml_file)
-  curr_features.select { |k, v| category_features.include?(k)}
-end
-
-def get_missing_categories(json, pmml_file)
-  categories = get_categories(json, pmml_file)
-  categories.each { |k, v|
-    next if !!v == v
-    category_on_pmml = File.readlines(pmml_file).any?{ |l| l[v.to_s] }
-    puts "category: #{k}, value: #{v}" unless category_on_pmml
-  }; nil
-end
-
-
-
-
-