idhja22 1.1.0 → 1.1.1

data/lib/idhja22/config/default.rb

@@ -1,6 +1,7 @@
 Configuration.for('default') {
   default_probability 0.5
   termination_probability 0.95
-  min_dataset_size 20
+  min_dataset_size 10
   probability_delta 0.01
+  equivalent_sample_size 10
 }

data/lib/idhja22/dataset.rb

@@ -55,6 +55,11 @@ module Idhja22
       category_counts['Y'].to_f/size.to_f
     end
 
+    def m_estimate(prior)
+      prior ||= Idhja22.config.default_probability
+      (category_counts['Y'] + (prior*Idhja22.config.equivalent_sample_size)).to_f/(size+Idhja22.config.equivalent_sample_size).to_f
+    end
+
     def split(training_proportion)
       shuffled_data = data.shuffle
       cutoff_point = (training_proportion.to_f*size).to_i

data/lib/idhja22/tree/node.rb

@@ -3,24 +3,24 @@ module Idhja22
     class << self
       def build_node(dataset, attributes_available, depth, parent_probability = nil)
         if(dataset.size < Idhja22.config.min_dataset_size)
-          return Idhja22::LeafNode.new(probability_guess(parent_probability, depth), dataset.category_label)
+          return Idhja22::LeafNode.new(dataset.m_estimate(parent_probability), dataset.category_label)
         end
 
         #if successful termination - create and return a leaf node
         if(dataset.terminating? && depth > 0) # don't terminate without splitting the data at least once
-          return Idhja22::LeafNode.new(dataset.probability, dataset.category_label)
+          return Idhja22::LeafNode.new(dataset.m_estimate(parent_probability), dataset.category_label)
         end
 
         if(depth >= 3) # don't let trees get too long
-          return Idhja22::LeafNode.new(dataset.probability, dataset.category_label)
+          return Idhja22::LeafNode.new(dataset.m_estimate(parent_probability), dataset.category_label)
         end
 
         #if we have no more attributes left to split the dataset on, then return a leafnode
         if(attributes_available.empty?)
-          return Idhja22::LeafNode.new(dataset.probability, dataset.category_label)
+          return Idhja22::LeafNode.new(dataset.m_estimate(parent_probability), dataset.category_label)
         end
 
-        node = DecisionNode.build(dataset, attributes_available, depth)
+        node = DecisionNode.build(dataset, attributes_available, depth, dataset.m_estimate(parent_probability))
 
         return node
       end
@@ -44,10 +44,6 @@ module Idhja22
         end
         return data_split, best_attribute
       end
-
-      def probability_guess(parent_probability, depth)
-        return (parent_probability + (Idhja22.config.default_probability-parent_probability)/2**depth)
-      end
     end
 
     def ==(other)
@@ -59,13 +55,13 @@ module Idhja22
     attr_reader :branches, :decision_attribute
 
     class << self
-      def build(dataset, attributes_available, depth)
+      def build(dataset, attributes_available, depth, parent_probability=nil)
         data_split, best_attribute = best_attribute(dataset, attributes_available)
 
         output_node = new(best_attribute)
 
         data_split.each do |value, dataset|
-          node = Node.build_node(dataset, attributes_available-[best_attribute], depth+1, dataset.probability)
+          node = Node.build_node(dataset, attributes_available-[best_attribute], depth+1, dataset.m_estimate(parent_probability))
           
           output_node.add_branch(value, node) if node && !(node.is_a?(DecisionNode) && node.branches.empty?)
         end

data/lib/idhja22/version.rb

@@ -1,3 +1,3 @@
 module Idhja22
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/dataset_spec.rb

@@ -114,6 +114,18 @@ describe Idhja22::Dataset do
         end
       end
 
+      describe '#m_estimate' do
+        it 'should return an estimate for the probability of category being Y' do
+          @ds.m_estimate(0.5).should be_within(0.0001).of(0.55)
+        end
+
+        context 'nil prior' do
+          it 'should use the default prior' do
+            @ds.m_estimate(nil).should be_within(0.0001).of(0.55)
+          end
+        end
+      end
+
       describe '#split' do
         it 'should split into a training and validation set according to the given proportion' do
           ts, vs = @ds.split(0.5)

data/spec/tree_spec.rb

@@ -21,7 +21,7 @@ describe Idhja22::Tree do
 
   describe('#get_rules') do
     it 'should list the rules of the tree' do
-      Idhja22::Tree.train(@ds).get_rules.should == "if 2 == a and 4 == a and then chance of C = 1.0\nelsif 2 == a and 4 == b and then chance of C = 0.0\nelsif 2 == b and then chance of C = 0.0"
+      Idhja22::Tree.train(@ds).get_rules.should == "if 2 == a and 4 == a and then chance of C = 0.88\nelsif 2 == a and 4 == b and then chance of C = 0.48\nelsif 2 == b and then chance of C = 0.38"
     end
   end
 
@@ -48,7 +48,7 @@ describe Idhja22::Tree do
     it 'should return the probabilty at the leaf of the tree' do
       tree = Idhja22::Tree.train(@ds)
       query = Idhja22::Dataset::Datum.new(['z','z','a','z','a'],['0', '1','2','3','4'],'C')
-      tree.evaluate(query).should == 1.0
+      tree.evaluate(query).should be_within(0.001).of(0.878)
     end
   end
 

data/spec/version_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Idhja22 do
   describe 'VERSION' do
     it 'should be current version' do
-      Idhja22::VERSION.should == '1.1.0'
+      Idhja22::VERSION.should == '1.1.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idhja22
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3479458333568153307
+      hash: -1322747474535878301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3479458333568153307
+      hash: -1322747474535878301
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24