ml 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/method/adaptive_perceptron.rb

@@ -0,0 +1,26 @@
+require 'matrix'
+
+module ML
+  module Learner
+    # Implementation of Adaptive Perceptron Learning Algorithm
+    class AdaptivePerceptronLearner < PerceptronLearner
+      # Initialize an adaptive perceptron learner
+      #
+      # @param [Integer] dim the number of dimension
+      # @param [Float] the eta parameter
+      def initialize dim, eta
+        super(dim)
+        @eta = eta
+      end
+
+    protected
+      def wrongly_classify x, y
+        classify(x) * y <= 1
+      end
+
+      def update_vector x, y
+        @w = @w + @eta * (y - classify(x))* x
+      end
+    end
+  end
+end

data/lib/method/perceptron.rb

@@ -7,7 +7,7 @@ module ML
       # Initialize a perceptron learner
       #
       # @param [Integer] dim the number of dimension
-      def initialize dim
+      def initialize dim, thres = 1.0/0
         @dim = dim
         @w = Matrix.column_vector(Array.new(dim + 1, 0))
       end
@@ -15,25 +15,43 @@ module ML
       # Train with supervised data
       #
       # @param [Hash] data supervised input data (mapping from array to integer)
-      def train! data
-        @update = 0
+      # @param [Numeric] threshold the upper bound of the traning iteration
+      # @return [Array] error_and_update [error, update] error in traning and update numbers used
+      def train! data, threshold = 1.0/0
+        pool = data.to_a
+        update = 0
+        error = 0
+
         while true
+          break if update >= threshold
           misclassified = false
+          order = (1...(pool.size)).to_a.shuffle
 
-          for dat, result in data
+          for i in order
+            dat, result = pool[i]
             aug_data = Matrix.column_vector(dat)
 
-            if classify(aug_data) != result
+            if wrongly_classify aug_data, result
               misclassified = true
 
-              @w = @w + result * aug_data
-              @update += 1
+              update_vector aug_data, result
+              update += 1
               break
             end
           end
 
           break unless misclassified
         end
+
+        # check out errors
+        if update >= threshold
+          for dat, result in pool
+            classified_result = (classify(Matrix.column_vector(dat)) <=> 0)
+            error += 1 unless result == classified_result
+          end
+        end
+
+        [error, update]
       end
 
       # The final coefficient of the line
@@ -43,24 +61,25 @@ module ML
         @w.column(0).to_a
       end
 
-      # The number for updates
-      #
-      # @return [Integer] update count
-      def update_count
-        @update
-      end
-
       # Predict certain data
       #
       # @param [Array] data data in question
       # @return [Integer] prediction
       def predict data
-        classify Matrix.column_vector(data + [1.0])  
+        classify(Matrix.column_vector(data + [1.0])) <=> 0
       end
 
-    private
+    protected
       def classify data
-        (@w.transpose * data)[0,0] <=> 0
+        (@w.transpose * data)[0,0]
+      end
+
+      def wrongly_classify x, y
+        classify(x) * y <= 0
+      end
+
+      def update_vector x, y
+        @w = @w + y * x
       end
     end
   end

data/lib/ml.rb

@@ -6,6 +6,7 @@ require 'data/generator'
 require 'data/parser'
 
 require 'method/perceptron'
+require 'method/adaptive_perceptron'
 
 # Top namespace for machine learning algorithms
 module ML

data/ml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ml"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Liu"]
-  s.date = "2011-10-04"
+  s.date = "2011-10-17"
   s.description = "Machine learning library in Ruby"
   s.email = "andrewliu33@gmail.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "lib/data/generator.rb",
     "lib/data/parser.rb",
     "lib/data/plotter.rb",
+    "lib/method/adaptive_perceptron.rb",
     "lib/method/perceptron.rb",
     "lib/ml.rb",
     "ml.gemspec",

data/spec/learner_spec.rb

@@ -8,13 +8,13 @@ describe "Learner" do
       generator = ML::Data::Generator2D.new
       data = generator.points_2d(10)
 
-      learner.train! data
+      error, update_count = learner.train! data
 
       line = learner.line
       line.should.kind_of?(Array).should == true
       line.size.should == 3
 
-      learner.update_count.should > 0
+      update_count.should > 0
     end
 
     it "should run perceptron learning in hyperspace" do
@@ -23,13 +23,31 @@ describe "Learner" do
       generator = ML::Data::Generator.new(4)
       data = generator.points(10, ML::Data::Generator.generate_vector(4))
 
-      learner.train! data
+      error, update_count = learner.train! data
 
       line = learner.line
       line.should.kind_of?(Array).should == true
       line.size.should == 5
 
-      learner.update_count.should > 0
+      update_count.should > 0
+    end
+  end
+
+  describe "Adpative Perceptron Learner" do
+    it "should run adaptive perceptron learning in hyperspace" do
+      learner = ML::Learner::AdaptivePerceptronLearner.new(4, 0.1)
+
+      generator = ML::Data::Generator.new(4)
+      data = generator.points(10, ML::Data::Generator.generate_vector(4))
+
+      error, update_count = learner.train! data, 1000
+
+      line = learner.line
+      line.should.kind_of?(Array).should == true
+      line.size.should == 5
+
+      update_count.should > 0
+      update_count.should < 1000
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyvis
-  requirement: &2158153020 !ruby/object:Gem::Requirement
+  requirement: &2157025440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158153020
+  version_requirements: *2157025440
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2158152400 !ruby/object:Gem::Requirement
+  requirement: &2157024740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158152400
+  version_requirements: *2157024740
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2158151760 !ruby/object:Gem::Requirement
+  requirement: &2157023900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158151760
+  version_requirements: *2157023900
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2158151260 !ruby/object:Gem::Requirement
+  requirement: &2157022940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2158151260
+  version_requirements: *2157022940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158150660 !ruby/object:Gem::Requirement
+  requirement: &2157022300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2158150660
+  version_requirements: *2157022300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158150040 !ruby/object:Gem::Requirement
+  requirement: &2157021360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2158150040
+  version_requirements: *2157021360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2158149480 !ruby/object:Gem::Requirement
+  requirement: &2157020280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158149480
+  version_requirements: *2157020280
 description: Machine learning library in Ruby
 email: andrewliu33@gmail.com
 executables: []
@@ -105,6 +105,7 @@ files:
 - lib/data/generator.rb
 - lib/data/parser.rb
 - lib/data/plotter.rb
+- lib/method/adaptive_perceptron.rb
 - lib/method/perceptron.rb
 - lib/ml.rb
 - ml.gemspec
@@ -126,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2452539594856608419
+      hash: -383772979455407848
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: