neuro 0.4.0 → 0.4.1

data/CHANGES

@@ -0,0 +1,6 @@
+2009-08-27 (0.4.1)
+  * Started using rake-compiler.
+  * Some reorganisation of the repository contents, documentation etc.
+  * Create a gemspec file.
+2005-10-02 (0.4.0)
+  * Initial Released Version

data/Rakefile

@@ -1,42 +1,44 @@
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/gempackagetask'
+begin
+  require 'rake/gempackagetask'
+  require 'rake/extensiontask'
+rescue LoadError
+end
+
 require 'rbconfig'
 include Config
-require 'find'
-include Find
 
+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['**/*']
-PKG_FILES.exclude('CVS')
-PKG_FILES.exclude('pkg')
-PKG_FILES.exclude(/\.dump$/)
+PKG_FILES = FileList["**/*"].exclude(/CVS|pkg|doc|tmp|coverage|(\.dump\Z)/).to_a
 
-task :default => [:test]
+task :default => :test
 
 desc "Run unit tests"
-task(:test => [:compile]) do
-  cd 'tests' do
-    ruby %{-I../ext runner.rb}
-  end
+task :test => :compile_ext do
+  sh 'testrb -Iext:lib tests/test_*.rb'
 end
 
 desc "Creating documentation"
 task :doc do
-  sh 'rdoc -m Neuro -d -o doc ext/neuro.c'# lib/neuro/display.rb'
+  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 do
+task :compile_ext do
   cd 'ext' do
     ruby 'extconf.rb'
-    sh 'make'
+    sh MAKE
   end
 end
 
 desc "Installing library"
-task(:install => [:test]) do
+task :install => :test do
   src = "ext/neuro.#{CONFIG['DLEXT']}"
   filename = File.basename(src)
   dst = File.join(CONFIG["sitelibdir"], filename)
@@ -49,68 +51,81 @@ task(:install => [:test]) do
   install(src, dst, :verbose => true, :mode => 0644)
 end
 
-task :clean do
-  find('.') do |f|
-    if f =~ /\.dump$/
-      rm f
-    end
-  end
-  cd 'ext' do
-    sh 'make distclean' rescue nil
-  end
-end
-
-spec = Gem::Specification.new do |s|
-
-  #### Basic information.
-
-  s.name = 'neuro'
-  s.version = PKG_VERSION
-  s.summary = "Neural Network Extension for Ruby"
-  s.description = <<EOF
+if defined?(Gem) and defined?(Rake::GemPackageTask) and
+  defined?(Rake::ExtensionTask)
+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
 A Ruby extension that provides a 2-Layer Back Propagation Neural Network, which
 can be used to categorize datasets of arbitrary size.
 EOF
 
-  #### Dependencies and requirements.
+      s.files = #{PKG_FILES.to_a.sort.inspect}
 
-  #s.add_dependency('log4r', '> 1.0.4')
-  #s.requirements << ""
+      s.extensions = "ext/extconf.rb"
 
-  s.files = PKG_FILES
+      s.require_paths << 'ext' << 'lib'
 
-  #### C code extensions.
+      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.extensions << "ext/extconf.rb"
-
-  #### Load-time details: library and application (you will need one or both).
-
-  s.require_path = 'ext'             # Use these for libraries.
-  s.autorequire = 'neuro'
-
-  #s.bindir = "bin"                 # Use these for applications.
-  #s.executables = ["foo.rb"]
-  #s.default_executable = "foo.rb"
-
-  #### Documentation and testing.
+      s.author = "Florian Frank"
+      s.email = "flori@ping.de"
+      s.homepage = "http://neuro.rubyforge.org"
+      s.rubyforge_project = '#{PKG_NAME}'
+    end
+  GEM
 
-  s.has_rdoc = true
-  s.extra_rdoc_files = [ 'ext/neuro.c' ]
-  s.rdoc_options << '--main' << 'Neuro'
-  s.test_files << 'tests/runner.rb'
+  desc 'Create a gemspec file'
+  task :gemspec do
+    File.open("#{PKG_NAME}.gemspec", 'w') do |f|
+      f.puts spec_src
+    end
+  end
 
-  #### Author and project details.
+  spec = eval(spec_src)
+  Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_tar      = true
+    pkg.package_files = PKG_FILES
+  end
 
-  s.author = "Florian Frank"
-  s.email = "flori@ping.de"
-  s.homepage = "http://neuro.rubyforge.org"
-  s.rubyforge_project = "neuro"
+  Rake::ExtensionTask.new do |ext|
+    ext.name            = PKG_NAME
+    ext.gem_spec        = spec
+    ext.cross_compile   = true
+    ext.cross_platform  = 'i386-mswin32'
+    ext.ext_dir         = 'ext'
+    ext.lib_dir         = 'lib'
+  end
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.package_files += PKG_FILES
-  pkg.need_tar = true
+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
+  end
 end
 
-task :release => [ :clean, :compile, :package ]
-  # vim: set et sw=2 ts=2:
+task :default => [ :version, :gemspec, :test ]
+
+desc "Build all gems and archives for a new release."
+task :release => [ :clean, :version, :gemspec, :cross, :native, :gem ] do
+  system "#$0 clean native gem"
+  system "#$0 clean package"
+end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/doc-main.txt

@@ -0,0 +1,33 @@
+== Description
+
+A Ruby extension that provides a 2-Layer Back Propagation Neural Network,
+which can be used to categorize datasets of arbitrary size.
+
+The network can be easily stored to or restored from the hard disk with
+the help of Ruby's Marshal facility.
+
+== Author
+
+Florian Frank <mailto:flori@ping.de>
+
+== License
+
+This is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License Version 2 as published by
+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://neuro.rubyforge.org
+
+== Examples
+
+An example for optical character recognition can be found in the examples
+subdirectory. Don't forget to check out the tests subdirectory, which
+contains some additional examples.

data/examples/ocr.rb

@@ -113,7 +113,8 @@ if $0 == __FILE__
   ocr = OCR.new
   loop do
     puts "", "Input a character from 'A'-'Z': "
-    c = gets.chomp
+    c = gets or break
+    c.chomp!
     c.tr!('a-z', 'A-Z')
     break unless /^[A-Z]$/.match(c)
     input_char = OCR.noisify(c, 5)
@@ -122,4 +123,3 @@ if $0 == __FILE__
     puts "Understood '#{rec_char.char}':", rec_char
   end
 end
-  # vim: set et sw=2 ts=2:

data/ext/neuro.c

@@ -624,46 +624,9 @@ static VALUE rb_network_load(VALUE klass, VALUE string)
     return Data_Wrap_Struct(klass, NULL, rb_network_free, network);
 }
 
-/*
- * 
- * = neuro - Neuronal Network Extension for Ruby
- *
- * == Description
- *
- * A Ruby extension that provides a 2-Layer Back Propagation Neural Network,
- * which can be used to categorize datasets of arbitrary size.
- *
- * The network can be easily stored to or restored from the hard disk with
- * the help of Ruby's Marshal facility.
- *
- * == Author
- *
- * Florian Frank <mailto:flori@ping.de>
- *
- * == License
- *
- * This is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License Version 2 as published by
- * 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://neuro.rubyforge.org
- *
- * == Examples
- *
- * An example for optical character recognition can be found in the examples
- * subdirectory. Don't forget to check out the tests subdirectory, which
- * contains some additional examples.
- */
 void Init_neuro()
 {
+    rb_require("neuro/version");
     rb_mNeuro = rb_define_module("Neuro");
     rb_cNetwork = rb_define_class_under(rb_mNeuro, "Network", rb_cObject);
     rb_cNeuroError = rb_define_class("NetworkError", rb_eStandardError);
@@ -691,4 +654,3 @@ void Init_neuro()
     id_class = rb_intern("class");
     id_name = rb_intern("name");
 }
-	/* vim: set cin sw=4 ts=4: */

data/install.rb

@@ -5,18 +5,25 @@ include Config
 require 'fileutils'
 include FileUtils::Verbose
 
-cd 'ext' do
-  system 'ruby extconf.rb'
-  system 'make'
+MAKE = if RUBY_PLATFORM =~ /mswin32/i 
+  'nmake'
+else
+  ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
 end
 
-file = "ext/neuro.#{CONFIG['DLEXT']}"
-dst = CONFIG["sitelibdir"]
-install(file, dst)
+bindir  = CONFIG['bindir']
+archdir = CONFIG['sitearchdir']
+libdir  = CONFIG['sitelibdir']
+dlext   = CONFIG['DLEXT']
 
-file = 'lib/neuro/display.rb'
-dst_dir = File.join(CONFIG["sitelibdir"], 'neuro')
-dst = File.join(dst_dir, File.basename(file))
-mkdir_p dst_dir
-install(file, dst)
-  # vim: set et sw=2 ts=2:
+cd 'ext' do
+  system 'ruby extconf.rb' or exit 1
+  system "#{MAKE}" or exit 1
+  mkdir_p archdir
+  install "neuro.#{dlext}", archdir
+end
+
+mkdir_p dst_dir = File.join(libdir, 'neuro')
+for file in Dir['lib/neuro/*.rb']
+  install file, File.join(dst_dir, File.basename(file))
+end

data/lib/neuro/display.rb

@@ -430,4 +430,3 @@ if $0 == __FILE__
   ngui.start
   par.run
 end
-  # vim: set et sw=2 ts=2:

data/lib/neuro/version.rb

@@ -0,0 +1,8 @@
+module Neuro
+  # Neuro version
+  VERSION         = '0.4.1'
+  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

data/neuro.gemspec

@@ -0,0 +1,25 @@
+    Gem::Specification.new do |s|
+      s.name = 'neuro'
+      s.version = '0.4.1'
+      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
+
+      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"]
+
+      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 ["tests/test_even_odd.rb", "tests/test_parity.rb"]
+
+      s.author = "Florian Frank"
+      s.email = "flori@ping.de"
+      s.homepage = "http://neuro.rubyforge.org"
+      s.rubyforge_project = 'neuro'
+    end

data/tests/test_even_odd.rb

@@ -1,11 +1,10 @@
-#!/usr/bin/env ruby
 #
 # Stupid little test, that finds out if 5-bit numbers are even or odd.
 #
 require 'test/unit'
 require 'neuro'
 
-class TC_EvenOdd < Test::Unit::TestCase
+class TestEvenOdd < Test::Unit::TestCase
   include Neuro
 
   @@even = [
@@ -66,4 +65,3 @@ class TC_EvenOdd < Test::Unit::TestCase
     end
   end
 end
-  # vim: set et sw=2 ts=2:

data/tests/test_parity.rb

@@ -1,9 +1,7 @@
-#!/usr/bin/env ruby
-
 require 'test/unit'
 require 'neuro'
 
-class TC_Parity < Test::Unit::TestCase
+class TestParity < Test::Unit::TestCase
   include Neuro
 
   MAX_BITS = 4
@@ -55,4 +53,3 @@ class TC_Parity < Test::Unit::TestCase
     end
   end
 end
-  # vim: set et sw=2 ts=2:

metadata

@@ -1,59 +1,77 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: neuro
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2005-10-03 00:00:00 +02:00
-summary: Neural Network Extension for Ruby
-require_paths: 
-  - ext
-email: flori@ping.de
-homepage: http://neuro.rubyforge.org
-rubyforge_project: neuro
-description: "A Ruby extension that provides a 2-Layer Back Propagation Neural Network, which
-  can be used to categorize datasets of arbitrary size."
-autorequire: neuro
-default_executable: 
+  version: 0.4.1
+platform: ruby
+authors: 
+- Florian Frank
+autorequire: 
 bindir: bin
+cert_chain: []
+
+date: 2009-08-31 00:00:00 +02:00
+default_executable: 
+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: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- doc-main.txt
+files: 
+- CHANGES
+- Rakefile
+- VERSION
+- examples/ocr.rb
+- ext/extconf.rb
+- ext/neuro.c
+- install.rb
+- lib/neuro.so
+- lib/neuro/display.rb
+- lib/neuro/version.rb
+- neuro.gemspec
+- tests/test_even_odd.rb
+- tests/test_parity.rb
+- doc-main.txt
 has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
+homepage: http://neuro.rubyforge.org
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --main
+- doc-main.txt
+- --title
+- Neural Network Extension for Ruby
+require_paths: 
+- lib
+- ext
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
-platform: ruby
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: neuro
+rubygems_version: 1.3.4
 signing_key: 
-cert_chain: 
-authors: 
-  - Florian Frank
-files: 
-  - examples
-  - Rakefile
-  - VERSION
-  - install.rb
-  - ext
-  - lib
-  - tests
-  - examples/ocr.rb
-  - ext/extconf.rb
-  - ext/neuro.c
-  - lib/neuro
-  - lib/neuro/display.rb
-  - tests/runner.rb
-  - tests/test_even_odd.rb
-  - tests/test_parity.rb
+specification_version: 3
+summary: Neural Network Extension for Ruby
 test_files: 
-  - tests/runner.rb
-rdoc_options: 
-  - "--main"
-  - Neuro
-extra_rdoc_files: 
-  - ext/neuro.c
-executables: []
-extensions: 
-  - ext/extconf.rb
-requirements: []
-dependencies: []
+- tests/test_even_odd.rb
+- tests/test_parity.rb

data/tests/runner.rb

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test/unit/ui/console/testrunner'
-require 'test/unit/testsuite'
-$:.unshift File.expand_path(File.dirname($0))
-require 'test_parity'
-require 'test_even_odd'
-
-class TS_AllTests
-  def self.suite
-    suite = Test::Unit::TestSuite.new
-    suite << TC_Parity.suite
-    suite << TC_EvenOdd.suite
-    suite
-  end
-end
-Test::Unit::UI::Console::TestRunner.run(TS_AllTests)
-  # vim: set et sw=2 ts=2: