idhja22 1.1.1 → 1.2.0

data/lib/idhja22/tree/node.rb

@@ -52,13 +52,13 @@ module Idhja22
   end
 
   class DecisionNode < Node
-    attr_reader :branches, :decision_attribute
+    attr_accessor :branches, :decision_attribute, :default_probability
 
     class << self
       def build(dataset, attributes_available, depth, parent_probability=nil)
         data_split, best_attribute = best_attribute(dataset, attributes_available)
 
-        output_node = new(best_attribute)
+        output_node = new(best_attribute, parent_probability)
 
         data_split.each do |value, dataset|
           node = Node.build_node(dataset, attributes_available-[best_attribute], depth+1, dataset.m_estimate(parent_probability))
@@ -72,9 +72,10 @@ module Idhja22
       end
     end
 
-    def initialize(decision_attribute)
+    def initialize(decision_attribute, default_probability = nil)
       @decision_attribute = decision_attribute
       @branches = {}
+      @default_probability = (default_probability || Idhja22.config.default_probability)
     end
 
     def add_branch(attr_value, node)
@@ -108,7 +109,7 @@ module Idhja22
     def evaluate(query)
       queried_value = query[self.decision_attribute]
       branch = self.branches[queried_value]
-      raise Idhja22::Dataset::Datum::UnknownAttributeValue, "when looking at attribute labelled #{self.decision_attribute} could not find branch for value #{queried_value}" if branch.nil?
+      return default_probability if branch.nil?
       branch.evaluate(query)
     end
 

data/lib/idhja22/version.rb

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

data/spec/node/decision_node_spec.rb

@@ -94,9 +94,9 @@ describe Idhja22::DecisionNode do
     end
 
     context 'unknown attribute value' do
-      it 'should raise an error' do
+      it 'should return default probability value' do
         query = Idhja22::Dataset::Datum.new(['c', 'a'], ['3', '4'], 'C')
-        expect {@simple_decision_node.evaluate(query)}.to raise_error(Idhja22::Dataset::Datum::UnknownAttributeValue)
+        @simple_decision_node.evaluate(query).should == 0.5
       end
     end
   end
@@ -202,4 +202,20 @@ describe Idhja22::DecisionNode do
       end
     end
   end
+
+  describe '.new' do
+    it 'should set instance variables' do
+      dn = Idhja22::DecisionNode.new('attr_label', 0.7)
+      dn.decision_attribute.should == 'attr_label'
+      dn.default_probability.should == 0.7
+      dn.branches.should == {}
+    end
+
+    context 'without provided default probability' do
+      it 'should set default to config default' do
+        dn = Idhja22::DecisionNode.new('attr_label')
+        dn.default_probability.should == 0.5
+      end
+    end
+  end
 end

data/spec/tree_spec.rb

@@ -70,7 +70,7 @@ describe Idhja22::Tree do
       end
 
       it 'should treat a validation example as one it will never get right' do
-        @tree.validate(@vps).should == 0.0
+        @tree.validate(@vps).should == 0.55
       end
     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.1'
+      Idhja22::VERSION.should == '1.2.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idhja22
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1322747474535878301
+      hash: 144077394884408186
 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: -1322747474535878301
+      hash: 144077394884408186
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24