decisiontree 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc0e08692fc5531e6d19f5b974777cd48170b454
+  data.tar.gz: 127248c9a9ecc65a689d1fc617db6d1aab7fdec4
+SHA512:
+  metadata.gz: 0b245fb099112983f9d88ddfe8256a36b2b247a3ea66a2f150fcbdf68ac306b09c808a54d1dea67be19904b302cd455454080fd1ae453633aff131779e04ccdd
+  data.tar.gz: 0a389c5fdf6a9b2ef16e3727a9fe2bd10161142baf3ee46d0aba49be132233b7479c7856d8a8b09ebd5391421001f79dde2dc63172666cf7bcd00d069b7a3518

data/README.md

@@ -41,6 +41,25 @@ decision = dec_tree.predict([37, 'sick'])
 puts "Predicted: #{decision} ... True decision: #{test.last}";
 
 # => Predicted: sick ... True decision: sick
+
+# Specify type ("discrete" or "continuous") in the training data
+labels = ["hunger", "color"]
+training = [
+        [8, "red", "angry"],
+        [6, "red", "angry"],
+        [7, "red", "angry"],
+        [7, "blue", "not angry"],
+        [2, "red", "not angry"],
+        [3, "blue", "not angry"],
+        [2, "blue", "not angry"],
+        [1, "red", "not angry"]
+]
+
+dec_tree = DecisionTree::ID3Tree.new(labels, data, "not angry", color: :discrete, hunger: :continuous)
+dec_tree.train
+
+decision = dec_tree.predict([7, "red"])
+puts "Predicted: #{decision} ... True decision: #{test.last}";
 ```
 
 ## License

data/decisiontree.gemspec

@@ -3,13 +3,14 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "decisiontree"
-  s.version     = "0.4.0"
+  s.version     = "0.5.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]
   s.homepage    = "https://github.com/igrigorik/decisiontree"
   s.summary     = %q{ID3-based implementation of the M.L. Decision Tree algorithm}
   s.description = s.summary
+  s.license     = "MIT"
 
   s.rubyforge_project = "decisiontree"
 

data/lib/decisiontree.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/decisiontree/id3_tree.rb'
+require File.dirname(__FILE__) + '/decisiontree/id3_tree.rb'

data/lib/decisiontree/id3_tree.rb

@@ -3,8 +3,6 @@
 ### Copyright (c) 2007 Ilya Grigorik <ilya AT igvita DOT com>
 ### Modifed at 2007 by José Ignacio Fernández <joseignacio.fernandez AT gmail DOT com>
 
-require 'graphr'
-
 class Object
   def save_to_file(filename)
     File.open(filename, 'w+' ) { |f| f << Marshal.dump(self) }
@@ -44,6 +42,7 @@ module DecisionTree
     end
 
     def train(data=@data, attributes=@attributes, default=@default)
+      attributes = attributes.map {|e| e.to_s}
       initialize(attributes, data, default, @type)
 
       # Remove samples with same attributes leaving most common classification
@@ -69,9 +68,14 @@ module DecisionTree
       # return classification if all examples have the same classification
       return data.first.last if data.classification.uniq.size == 1
 
-      # Choose best attribute (1. enumerate all attributes / 2. Pick best attribute)
+      # Choose best attribute:
+      # 1. enumerate all attributes
+      # 2. Pick best attribute
+      # 3. If attributes all score the same, then pick a random one to avoid infinite recursion.
       performance = attributes.collect { |attribute| fitness_for(attribute).call(data, attributes, attribute) }
       max = performance.max { |a,b| a[0] <=> b[0] }
+      min = performance.min { |a,b| a[0] <=> b[0] }
+      max = performance.shuffle.first if max[0] == min[0]
       best = Node.new(attributes[performance.index(max)], max[1], max[0])
       best.threshold = nil if @type == :discrete
       @used.has_key?(best.attribute) ? @used[best.attribute] += [best.threshold] : @used[best.attribute] = [best.threshold]
@@ -127,9 +131,10 @@ module DecisionTree
       descend(@tree, test)
     end
 
-    def graph(filename)
+    def graph(filename, file_type = "png")
+      require 'graphr'
       dgp = DotGraphPrinter.new(build_tree)
-      dgp.write_to_file("#{filename}.png", "png")
+      dgp.write_to_file("#{filename}.#{file_type}", file_type)
     end
 
     def ruleset

data/spec/id3_spec.rb

@@ -48,7 +48,6 @@ describe describe DecisionTree::ID3Tree do
     end
     Given(:tree) { DecisionTree::ID3Tree.new(labels, data, "not angry", :continuous) }
     When { tree.train }
-    Then { tree.graph("continuous") }
     Then { tree.predict([7, 7]).should == "angry" }
     Then { tree.predict([2, 3]).should == "not angry" }
   end
@@ -69,9 +68,58 @@ describe describe DecisionTree::ID3Tree do
     end
     Given(:tree) { DecisionTree::ID3Tree.new(labels, data, "not angry", color: :discrete, hunger: :continuous) }
     When { tree.train }
-    Then { tree.graph("continuous") }
     Then { tree.predict([7, "red"]).should == "angry" }
     Then { tree.predict([2, "blue"]).should == "not angry" }
   end
 
+  describe "infinite recursion case" do
+    Given(:labels) { [:a, :b, :c] }
+    Given(:data) do
+      [
+        ["a1", "b0", "c0", "RED"],
+        ["a1", "b1", "c1", "RED"],
+        ["a1", "b1", "c0", "BLUE"],
+        ["a1", "b0", "c1", "BLUE"]
+      ]
+    end
+    Given(:tree) { DecisionTree::ID3Tree.new(labels, data, "RED", :discrete) }
+    When { tree.train }
+    Then { tree.predict(["a1","b0","c0"]).should == "RED" }
+  end
+
+  describe "numerical labels case" do
+    Given(:labels) { [1, 2] }
+    Given(:data) do
+      [
+        [1, 1, true],
+        [1, 2, false],
+        [2, 1, false],
+        [2, 2, true]
+      ]
+    end
+    Given(:tree) { DecisionTree::ID3Tree.new labels, data, nil, :discrete }
+    When { tree.train }
+    Then {
+      lambda { tree.predict([1, 1]) }.should_not raise_error
+    }
+  end
+
+  describe "create a figure" do
+    after(:all) do
+      File.delete("#{FIGURE_FILENAME}.png") if File.file?("#{FIGURE_FILENAME}.png")
+    end
+
+    Given(:labels) { ["sun", "rain"]}
+    Given(:data) do
+      [
+        [1,0,1],
+        [0,1,0]
+      ]
+    end
+    Given(:tree) { DecisionTree::ID3Tree.new(labels, data, 1, :discrete) }
+    When { tree.train }
+    When(:result) { tree.graph(FIGURE_FILENAME) }
+    Then { expect(result).to_not have_failed }
+    And { File.file?("#{FIGURE_FILENAME}.png") }
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
 require 'rspec/given'
 require 'decisiontree'
 require 'pry'
+
+FIGURE_FILENAME = "just_a_spec"

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: decisiontree
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ID3-based implementation of the M.L. Decision Tree algorithm
@@ -99,30 +90,29 @@ files:
 - spec/id3_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/igrigorik/decisiontree
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: decisiontree
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ID3-based implementation of the M.L. Decision Tree algorithm
 test_files:
 - spec/id3_spec.rb
 - spec/spec_helper.rb
-has_rdoc: