neuro 0.4.2 → 0.4.3

data/.gitignore

@@ -0,0 +1,3 @@
+.*.sw[pon]
+Gemfile.lock
+pkg

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - ree
+  - rbx

data/CHANGES

@@ -1,3 +1,8 @@
+2011-12-01 (0.4.3)
+  * Fix remaining Ruby 1.9 bug in ocr.rb example that caused the example network
+    not to converge.
+  * Use gem_hadar library.
+  * Test on travis-ci now.
 2011-05-22 (0.4.2)
   * 1.9.2 compatibility
 2009-08-27 (0.4.1)

data/Gemfile

@@ -0,0 +1,5 @@
+# vim: set filetype=ruby et sw=2 ts=2:
+
+source :rubygems
+
+gemspec

data/{doc-main.txt → README.rdoc}

@@ -1,3 +1,5 @@
+= Neuro - Neural Network Extension for Ruby
+
 == Description
 
 A Ruby extension that provides a 2-Layer Back Propagation Neural Network,
@@ -18,13 +20,11 @@ the Free Software Foundation: http://www.gnu.org/copyleft/gpl.html
 
 == Download
 
-The latest version of <b>neuro</b> can be found at
-
-* http://rubyforge.org/frs/?group_id=554
+The homepage should be located at http://flori.github.com/neuro
 
-The homepage should be located at
+Typing this into the shell should install the newest version.
 
-* http://neuro.rubyforge.org
+    $ gem install neuro
 
 == Examples
 

data/Rakefile

@@ -1,119 +1,37 @@
 # vim: set filetype=ruby et sw=2 ts=2:
 
-begin
-  require 'rake/gempackagetask'
-rescue LoadError
-end
-
-require 'rbconfig'
-include Config
-
-require 'rake/clean'
-CLEAN.include 'doc', 'coverage', FileList["**/*.dump"],
-  FileList["ext/*.{o,so,#{CONFIG['DLEXT']}}"], 'lib/*.so',
-  'ext/Makefile'
-
-MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
-PKG_NAME = 'neuro'
-PKG_VERSION = File.read('VERSION').chomp
-PKG_FILES = FileList["**/*"].exclude(/CVS|pkg|doc|tmp|coverage|(\.dump\Z)/).to_a
-
-task :default => :test
-
-desc "Run unit tests"
-task :test => :compile_ext do
-  sh 'testrb -Iext:lib ./tests/test_*.rb'
-end
-
-desc "Creating documentation"
-task :doc do
-  sh 'rdoc -t "neuro - Neural Network Extension for Ruby" -m doc-main.txt -o doc doc-main.txt ext/neuro.c lib/neuro/version.rb' # lib/neuro/display.rb'
-end
-
-desc "Compiling library"
-task :compile_ext do
-  cd 'ext' do
-    ruby 'extconf.rb'
-    sh MAKE
-  end
-end
-
-desc "Installing library"
-task :install => :test do
-  src = "ext/neuro.#{CONFIG['DLEXT']}"
-  filename = File.basename(src)
-  dst = File.join(CONFIG["sitelibdir"], filename)
-  install(src, dst, :verbose => true, :mode => 0644)
-  src = 'lib/neuro/display.rb'
-  filename = File.basename(src)
-  dst_dir = File.join(CONFIG["sitelibdir"], 'neuro')
-  mkdir_p dst_dir
-  dst = File.join(dst_dir, filename)
-  install(src, dst, :verbose => true, :mode => 0644)
-end
-
-if defined?(Gem) and defined?(Rake::GemPackageTask)
-then
-  spec_src = <<-GEM
-    Gem::Specification.new do |s|
-      s.name = '#{PKG_NAME}'
-      s.version = '#{PKG_VERSION}'
-      s.summary = "Neural Network Extension for Ruby"
-      s.description = <<EOF
+require 'gem_hadar'
+
+GemHadar do
+  name        'neuro'
+  author      'Florian Frank'
+  email       'flori@ping.de'
+  homepage    "http://flori.github.com/#{name}"
+  summary     'Neural Network Extension for Ruby'
+  description <<EOT
 A Ruby extension that provides a 2-Layer Back Propagation Neural Network, which
 can be used to categorize datasets of arbitrary size.
-EOF
-
-      s.files = #{PKG_FILES.to_a.sort.inspect}
-
-      s.extensions = "ext/extconf.rb"
-
-      s.require_paths << 'ext' << 'lib'
-
-      s.has_rdoc = true
-      s.extra_rdoc_files << 'doc-main.txt'
-      s.rdoc_options << '--main' << 'doc-main.txt' << '--title' << 'Neural Network Extension for Ruby'
-      s.test_files.concat #{Dir['tests/test_*.rb'].to_a.sort.inspect}
-
-      s.author = "Florian Frank"
-      s.email = "flori@ping.de"
-      s.homepage = "http://flori.github.com/#{PKG_NAME}"
-      s.rubyforge_project = '#{PKG_NAME}'
-    end
-  GEM
-
-  desc 'Create a gemspec file'
-  task :gemspec do
-    File.open("#{PKG_NAME}.gemspec", 'w') do |f|
-      f.puts spec_src
-    end
-  end
-
-  spec = eval(spec_src)
-  Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_tar      = true
-    pkg.package_files = PKG_FILES
-  end
-end
-
-desc m = "Writing version information for #{PKG_VERSION}"
-task :version do
-  puts m
-  File.open(File.join('lib', 'neuro', 'version.rb'), 'w') do |v|
-    v.puts <<EOT
-module Neuro
-  # Neuro version
-  VERSION         = '#{PKG_VERSION}'
-  VERSION_ARRAY   = VERSION.split(/\\./).map { |x| x.to_i } # :nodoc:
-  VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
-  VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
-  VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
-end
 EOT
+  test_dir    'tests'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
+  clean       '*.dump'
+  title       "#{name.camelize} - #{summary}"
+  readme      'README.rdoc'
+  require_paths %w[lib ext]
+  development_dependency 'test-unit', '~>2.4'
+
+  install_library do
+    src = "ext/neuro.#{CONFIG['DLEXT']}"
+    filename = File.basename(src)
+    dst = File.join(CONFIG["sitelibdir"], filename)
+    install(src, dst, :verbose => true, :mode => 0644)
+    dst_dir = File.join(CONFIG["sitelibdir"], 'neuro')
+    mkdir_p dst_dir
+    cd 'lib/neuro' do
+      for src in Dir['*.rb']
+        dst = File.join(dst_dir, src)
+        install(src, dst, :verbose => true, :mode => 0644)
+      end
+    end
   end
 end
-
-task :default => [ :version, :gemspec, :test ]
-
-desc "Build all gems and archives for a new release."
-task :release => [ :clean, :version, :gemspec, :package]

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/examples/ocr.rb

@@ -42,7 +42,7 @@ class OCR
     vector = []
     7.times do |j|
       c = CHAR_BTIMAP[j][6 * number, 5]
-      vector += c.enum_for(:each_byte).map { |x| x == ?* ? 1.0 : -1.0 }
+      vector += c.split(//).map { |x| x == '*' ? 1.0 : -1.0 }
     end
     CHARACTERS << Character.new(char, number, vector)
   end
@@ -62,7 +62,7 @@ class OCR
       eta = 0.2
       max_count = CHARACTERS.size * 10
       count = max_count
-      until count < max_error
+      until count < max_count
         count = 0
         CHARACTERS.sort_by { rand }.each do |character|
           count += @network.learn(character.vector,

data/ext/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-if CONFIG['CC'] == 'gcc'
+if CONFIG['CC'] =~ /gcc/
   CONFIG['CC'] = 'gcc -Wall -O2'
 end
 create_makefile 'neuro'

data/lib/neuro/version.rb

@@ -1,6 +1,6 @@
 module Neuro
   # Neuro version
-  VERSION         = '0.4.2'
+  VERSION         = '0.4.3'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/neuro.gemspec

@@ -1,25 +1,36 @@
-    Gem::Specification.new do |s|
-      s.name = 'neuro'
-      s.version = '0.4.2'
-      s.summary = "Neural Network Extension for Ruby"
-      s.description = <<EOF
-A Ruby extension that provides a 2-Layer Back Propagation Neural Network, which
-can be used to categorize datasets of arbitrary size.
-EOF
+# -*- encoding: utf-8 -*-
 
-      s.files = ["CHANGES", "Rakefile", "VERSION", "examples", "examples/ocr.rb", "ext", "ext/extconf.rb", "ext/neuro.c", "install.rb", "lib", "lib/neuro", "lib/neuro/display.rb", "lib/neuro/version.rb", "neuro.gemspec", "tests", "tests/test_even_odd.rb", "tests/test_parity.rb"]
+Gem::Specification.new do |s|
+  s.name = "neuro"
+  s.version = "0.4.3"
 
-      s.extensions = "ext/extconf.rb"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Florian Frank"]
+  s.date = "2011-12-01"
+  s.description = "A Ruby extension that provides a 2-Layer Back Propagation Neural Network, which\ncan be used to categorize datasets of arbitrary size.\n"
+  s.email = "flori@ping.de"
+  s.extensions = ["ext/extconf.rb"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/neuro/version.rb", "lib/neuro/display.rb", "ext/neuro.c"]
+  s.files = [".gitignore", ".travis.yml", "CHANGES", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "examples/ocr.rb", "ext/extconf.rb", "ext/neuro.c", "install.rb", "lib/neuro/display.rb", "lib/neuro/version.rb", "neuro.gemspec", "tests/test_even_odd.rb", "tests/test_parity.rb"]
+  s.homepage = "http://flori.github.com/neuro"
+  s.rdoc_options = ["--title", "Neuro - Neural Network Extension for Ruby", "--main", "README.rdoc"]
+  s.require_paths = ["lib", "ext"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Neural Network Extension for Ruby"
+  s.test_files = ["tests/test_even_odd.rb", "tests/test_parity.rb"]
 
-      s.require_paths << 'ext' << 'lib'
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
 
-      s.has_rdoc = true
-      s.extra_rdoc_files << 'doc-main.txt'
-      s.rdoc_options << '--main' << 'doc-main.txt' << '--title' << 'Neural Network Extension for Ruby'
-      s.test_files.concat ["tests/test_even_odd.rb", "tests/test_parity.rb"]
-
-      s.author = "Florian Frank"
-      s.email = "flori@ping.de"
-      s.homepage = "http://flori.github.com/neuro"
-      s.rubyforge_project = 'neuro'
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.3"])
+      s.add_development_dependency(%q<test-unit>, ["~> 2.4"])
+    else
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.3"])
+      s.add_dependency(%q<test-unit>, ["~> 2.4"])
     end
+  else
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.3"])
+    s.add_dependency(%q<test-unit>, ["~> 2.4"])
+  end
+end

metadata

@@ -1,36 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: neuro
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.4.3
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
+date: 2011-12-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: gem_hadar
+  requirement: &78750830 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: *78750830
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &78750110 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: *78750110
+description: ! 'A Ruby extension that provides a 2-Layer Back Propagation Neural Network,
+  which
 
-date: 2011-05-22 00:00:00 Z
-dependencies: []
-
-description: |
-  A Ruby extension that provides a 2-Layer Back Propagation Neural Network, which
   can be used to categorize datasets of arbitrary size.
 
+'
 email: flori@ping.de
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
-- doc-main.txt
-files: 
+extra_rdoc_files:
+- README.rdoc
+- lib/neuro/version.rb
+- lib/neuro/display.rb
+- ext/neuro.c
+files:
+- .gitignore
+- .travis.yml
 - CHANGES
+- Gemfile
+- README.rdoc
 - Rakefile
 - VERSION
 - examples/ocr.rb
@@ -42,45 +65,35 @@ files:
 - neuro.gemspec
 - tests/test_even_odd.rb
 - tests/test_parity.rb
-- doc-main.txt
 homepage: http://flori.github.com/neuro
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --main
-- doc-main.txt
+rdoc_options:
 - --title
-- Neural Network Extension for Ruby
-require_paths: 
+- Neuro - Neural Network Extension for Ruby
+- --main
+- README.rdoc
+require_paths:
 - lib
 - ext
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: neuro
-rubygems_version: 1.7.1
+rubyforge_project: 
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Neural Network Extension for Ruby
-test_files: 
+test_files:
 - tests/test_even_odd.rb
 - tests/test_parity.rb