idhja22 0.14.3 → 0.14.4

data/idhja22.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'redcarpet'
+
+  gem.add_dependency 'configuration'
 end

data/lib/idhja22/bayes.rb

@@ -0,0 +1,5 @@
+module Idhja22
+  class Bayes
+    
+  end
+end

data/lib/idhja22/config/default.rb

@@ -0,0 +1,5 @@
+Configuration.for('default') {
+  default_probability 0.5
+  termination_probability 0.95
+  min_dataset_size 20
+}

data/lib/idhja22/dataset/tree_methods.rb

@@ -15,12 +15,12 @@ module Idhja22
 
       def entropy
         total = self.size
-        return 1.0 if total < Idhja22::MIN_DATASET_SIZE
+        return 1.0 if total < Idhja22.config.min_dataset_size
         category_counts.values.inject(0.0) { |ent, count|  prop = count.to_f/total.to_f; ent-prop*Math.log(prop,2)  }
       end
       
       def terminating?
-        probability > Idhja22::TERMINATION_PROBABILITY || probability < 1-Idhja22::TERMINATION_PROBABILITY
+        (probability > Idhja22.config.termination_probability) || (probability < (1-Idhja22.config.termination_probability))
       end
     end
   end

data/lib/idhja22/{node.rb → tree/node.rb}

@@ -2,7 +2,7 @@ module Idhja22
   class Node
     class << self
       def build_node(dataset, attributes_available, depth, parent_probability = nil)
-        if(dataset.size < Idhja22::MIN_DATASET_SIZE)
+        if(dataset.size < Idhja22.config.min_dataset_size)
           return Idhja22::LeafNode.new(probability_guess(parent_probability, depth), dataset.category_label)
         end
 
@@ -48,7 +48,7 @@ module Idhja22
       end
 
       def probability_guess(parent_probability, depth)
-        return (parent_probability + (Idhja22::DEFAULT_PROBABILITY-parent_probability)/2**depth)
+        return (parent_probability + (Idhja22.config.default_probability-parent_probability)/2**depth)
       end
     end
 

data/lib/idhja22/tree.rb

@@ -1,3 +1,5 @@
+require "idhja22/tree/node"
+
 module Idhja22
   # The main entry class for a training, viewing and evaluating a decision tree.
   class Tree
@@ -34,7 +36,7 @@ module Idhja22
     end
 
     def initialize(dataset, attributes_available)
-      raise Idhja22::Dataset::InsufficientData, "require at least #{Idhja22::MIN_DATASET_SIZE} data points, only have #{dataset.size} in data set provided" if(dataset.size < Idhja22::MIN_DATASET_SIZE)
+      raise Idhja22::Dataset::InsufficientData, "require at least #{Idhja22.config.min_dataset_size} data points, only have #{dataset.size} in data set provided" if(dataset.size < Idhja22.config.min_dataset_size)
       @root = Node.build_node(dataset, attributes_available, 0)
     end
 

data/lib/idhja22/version.rb

@@ -1,3 +1,3 @@
 module Idhja22
-  VERSION = "0.14.3"
+  VERSION = "0.14.4"
 end

data/lib/idhja22.rb

@@ -1,10 +1,23 @@
+require 'configuration'
+require 'idhja22/config/default'
+
 require "idhja22/version"
 require "idhja22/dataset"
 require "idhja22/tree"
-require "idhja22/node"
+require "idhja22/bayes"
 
 module Idhja22
-  DEFAULT_PROBABILITY = 0.5
-  TERMINATION_PROBABILITY = 0.95
-  MIN_DATASET_SIZE = 20
+  def self.default_config
+    Configuration.for('default')
+  end
+
+  def self.configure(name)
+    new_config = Configuration.for(name)
+    @cached_config = new_config
+  end
+
+  def self.config
+    @cached_config ||= default_config
+  end
+
 end

data/spec/bayes_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Idhja22::Bayes do
+
+end

data/spec/spec_helper.rb

@@ -9,11 +9,11 @@ $: << File.dirname(__FILE__) + '/../lib'
 require 'idhja22'
 require 'ruby-debug'
 
-module Idhja22
-  MIN_DATASET_SIZE = 2
-end
-
+Configuration.for('spec', Idhja22.config) {
+  min_dataset_size 2
+}
 
+Idhja22.configure('spec')
 
 RSpec.configure do |config|
   

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 == '0.14.3'
+      Idhja22::VERSION.should == '0.14.4'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idhja22
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: configuration
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Decision Trees
 email: 
 executables:
@@ -124,14 +140,17 @@ files:
 - bin/idhja22
 - idhja22.gemspec
 - lib/idhja22.rb
+- lib/idhja22/bayes.rb
+- lib/idhja22/config/default.rb
 - lib/idhja22/dataset.rb
 - lib/idhja22/dataset/datum.rb
 - lib/idhja22/dataset/errors.rb
 - lib/idhja22/dataset/tree_methods.rb
-- lib/idhja22/node.rb
 - lib/idhja22/tree.rb
+- lib/idhja22/tree/node.rb
 - lib/idhja22/version.rb
 - spec/another_large_spec_data.csv
+- spec/bayes_spec.rb
 - spec/dataset/example_spec.rb
 - spec/dataset_spec.rb
 - spec/large_spec_data.csv
@@ -154,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2323453043414878291
+      hash: -803768552583374641
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2323453043414878291
+      hash: -803768552583374641
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -172,6 +191,7 @@ specification_version: 3
 summary: A gem for creating decision trees
 test_files:
 - spec/another_large_spec_data.csv
+- spec/bayes_spec.rb
 - spec/dataset/example_spec.rb
 - spec/dataset_spec.rb
 - spec/large_spec_data.csv