mhl 0.0.1 → 0.1.0

data/lib/mhl/version.rb

@@ -1,3 +1,3 @@
 module MHL
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/mhl.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'bitstring'
-  spec.add_dependency 'concurrent-ruby'
+  spec.add_dependency 'concurrent-ruby', '~> 0.5'
   spec.add_dependency 'erv'
+  spec.add_dependency 'facter'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
 end

data/test/mhl/genetic_algorithm_solver_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+
+describe MHL::GeneticAlgorithmSolver do
+
+  it 'should accept bitstring representation genotypes' do
+    MHL::GeneticAlgorithmSolver.new(
+      :population_size           => 128,
+      :genotype_space_type       => :bitstring,
+      :mutation_threshold        => 0.5,
+      :recombination_threshold   => 0.5,
+      :genotype_space_conf       => {
+        :bitstring_length => 120,
+      },
+      :logger                    => :stderr,
+      :log_level                 => ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN,
+    )
+  end
+
+  it 'should accept integer representation genotypes' do
+    MHL::GeneticAlgorithmSolver.new(
+      :population_size           => 128,
+      :genotype_space_type       => :integer,
+      :mutation_probability      => 0.5,
+      :recombination_probability => 0.5,
+      :genotype_space_conf       => {
+        :dimensions         => 6,
+        :recombination_type => :intermediate,
+      },
+      :logger                    => :stderr,
+      :log_level                 => ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN,
+    )
+  end
+
+  it 'should solve a 2-dimension parabola in integer space' do
+    solver = MHL::GeneticAlgorithmSolver.new(
+      :population_size           => 40,
+      :genotype_space_type       => :integer,
+      :mutation_probability      => 0.5,
+      :recombination_probability => 0.5,
+      :genotype_space_conf       => {
+        :dimensions         => 2,
+        :recombination_type => :intermediate,
+        :random_func        => lambda { Array.new(2) { rand(20) } }
+      },
+      :exit_condition => lambda {|generation,best_sample| best_sample[:fitness] == 0},
+      :logger                    => :stderr,
+      :log_level                 => ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN,
+    )
+    solver.solve(Proc.new{|genotype| -(genotype[0]**2 + genotype[1]**2) })
+  end
+
+end

data/test/mhl/integer_genotype_space_test.rb

@@ -0,0 +1,77 @@
+require 'test_helper'
+
+describe MHL::IntegerVectorGenotypeSpace do
+  let :logger do
+    l = Logger.new(STDOUT)
+    l.level = ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN
+    l
+  end
+
+  it 'should refuse to work with non-positive dimensions' do
+    assert_raises(ArgumentError) do
+      MHL::IntegerVectorGenotypeSpace.new(
+        :dimensions         => -rand(100),
+        :recombination_type => :intermediate,
+        :logger             => logger,
+        # :random_func        => lambda { Array.new(2) { rand(20) } }
+      )
+    end
+  end
+
+  it 'should refuse to work with non- line or intermediate recombination' do
+    assert_raises(ArgumentError) do
+      MHL::IntegerVectorGenotypeSpace.new(
+        :dimensions         => 2,
+        :recombination_type => :something,
+        :logger             => logger,
+      )
+    end
+  end
+
+  describe 'with constraints' do
+    it 'should enforce constraints on generation' do
+      x1 =  rand(100); x2 = x1 + rand(200)
+      y1 = -rand(100); y2 = y1 + rand(200)
+      is = MHL::IntegerVectorGenotypeSpace.new(
+        :dimensions         => 2,
+        :recombination_type => :intermediate,
+        :constraints => [ { :from => x1, :to => x2 },
+                          { :from => y1, :to => y2 } ],
+        :logger             => logger,
+      )
+      genotype = is.get_random
+      genotype.size.must_equal 2
+      genotype[0].must_be :>=, x1
+      genotype[0].must_be :<=, x2
+      genotype[1].must_be :>=, y1
+      genotype[1].must_be :<=, y2
+    end
+
+    it 'should enforce constraints on reproduction' do
+      x1 =  rand(100); x2 = x1 + rand(200)
+      y1 = -rand(100); y2 = y1 + rand(200)
+      is = MHL::IntegerVectorGenotypeSpace.new(
+        :dimensions         => 2,
+        :recombination_type => :intermediate,
+        :constraints => [ { :from => x1, :to => x2 },
+                          { :from => y1, :to => y2 } ],
+        :logger             => logger,
+      )
+      g1 = { :genotype => [ x1, y1 ] }
+      g2 = { :genotype => [ x2, y2 ] }
+      a, b = is.reproduce_from(
+        g1, g2,
+        ERV::RandomVariable.new(:distribution           => :geometric,
+                                :probability_of_success => 0.05),
+        ERV::RandomVariable.new(:distribution => :uniform,
+                                :min_value    => -0.25,
+                                :max_value    =>  1.25)
+      )
+      a[:genotype][0].must_be :>=, x1
+      a[:genotype][0].must_be :<=, x2
+      b[:genotype][1].must_be :>=, y1
+      b[:genotype][1].must_be :<=, y2
+    end
+  end
+
+end

data/test/mhl/multiswarm_qpso_solver_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+describe MHL::MultiSwarmQPSOSolver do
+
+  it 'should solve a 2-dimension parabola in real space' do
+    solver = MHL::MultiSwarmQPSOSolver.new(
+      :swarm_size           => 20,
+      :num_swarms           => 4,
+      :random_position_func => lambda { Array.new(2) { rand(20).to_f } },
+      :random_velocity_func => lambda { Array.new(2) { rand(10).to_f } },
+      :exit_condition       => lambda {|generation,best_sample| best_sample[:height].abs < 0.001 },
+      :logger               => :stdout,
+      :log_level            => ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN,
+    )
+    solver.solve(Proc.new{|position| -(position[0]**2 + position[1]**2) })
+  end
+
+end

data/{spec/mhl/particle_swarm_optimization_solver_spec.rb → test/mhl/particle_swarm_optimization_solver_test.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'test_helper'
 
 describe MHL::ParticleSwarmOptimizationSolver do
 
@@ -8,9 +8,10 @@ describe MHL::ParticleSwarmOptimizationSolver do
       :random_position_func => lambda { Array.new(2) { rand(20) } },
       :random_velocity_func => lambda { Array.new(2) { rand(10) } },
       :exit_condition       => lambda {|generation,best_sample| best_sample[:height].abs < 0.001 },
+      :logger               => :stderr,
+      :log_level            => ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN,
     )
     solver.solve(Proc.new{|position| -(position[0]**2 + position[1]**2) })
   end
 
 end
-

data/test/mhl/quantum_particle_swarm_optimization_solver_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+describe MHL::QuantumPSOSolver do
+
+  it 'should solve a 2-dimension parabola in real space' do
+    solver = MHL::QuantumPSOSolver.new(
+      :swarm_size           => 40,
+      :random_position_func => lambda { Array.new(2) { rand(20) } },
+      :exit_condition       => lambda {|generation,best_sample| best_sample[:height].abs < 0.001 },
+      :logger               => :stderr,
+      :log_level            => ENV['DEBUG'] ? Logger::DEBUG : Logger::WARN,
+    )
+    solver.solve(Proc.new{|position| -(position[0]**2 + position[1]**2) })
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+require 'minitest/autorun'
+require 'minitest/spec'
+
+require 'logger'
+
+require 'mhl'

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: mhl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Mauro Tortonesi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   name: bitstring
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
+  name: concurrent-ruby
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: erv
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: erv
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: facter
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
 description: A Ruby Metaheuristics library
 email:
 - mauro.tortonesi@unife.it
@@ -107,14 +107,26 @@ files:
 - Rakefile
 - lib/mhl.rb
 - lib/mhl/bitstring_genotype_space.rb
+- lib/mhl/charged_swarm.rb
+- lib/mhl/generic_particle.rb
+- lib/mhl/generic_swarm.rb
 - lib/mhl/genetic_algorithm_solver.rb
 - lib/mhl/integer_genotype_space.rb
+- lib/mhl/multiswarm_qpso_solver.rb
+- lib/mhl/particle.rb
 - lib/mhl/particle_swarm_optimization_solver.rb
+- lib/mhl/pso_swarm.rb
+- lib/mhl/qpso_swarm.rb
+- lib/mhl/quantum_particle.rb
+- lib/mhl/quantum_particle_swarm_optimization_solver.rb
 - lib/mhl/version.rb
 - mhl.gemspec
-- spec/mhl/genetic_algorithm_spec.rb
-- spec/mhl/particle_swarm_optimization_solver_spec.rb
-- spec/spec_helper.rb
+- test/mhl/genetic_algorithm_solver_test.rb
+- test/mhl/integer_genotype_space_test.rb
+- test/mhl/multiswarm_qpso_solver_test.rb
+- test/mhl/particle_swarm_optimization_solver_test.rb
+- test/mhl/quantum_particle_swarm_optimization_solver_test.rb
+- test/test_helper.rb
 homepage: https://github.com/mtortonesi/ruby-mhl
 licenses:
 - MIT
@@ -135,11 +147,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.1
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: A scientific library for Ruby that provides several metaheuristics
 test_files:
-- spec/mhl/genetic_algorithm_spec.rb
-- spec/mhl/particle_swarm_optimization_solver_spec.rb
-- spec/spec_helper.rb
+- test/mhl/genetic_algorithm_solver_test.rb
+- test/mhl/integer_genotype_space_test.rb
+- test/mhl/multiswarm_qpso_solver_test.rb
+- test/mhl/particle_swarm_optimization_solver_test.rb
+- test/mhl/quantum_particle_swarm_optimization_solver_test.rb
+- test/test_helper.rb

data/spec/mhl/genetic_algorithm_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-
-describe MHL::GeneticAlgorithmSolver do
-
-  it 'should accept bitstring representation genotypes' do
-    lambda {
-      MHL::GeneticAlgorithmSolver.new(
-        :population_size           => 128,
-        :genotype_space_type       => :bitstring,
-        :mutation_threshold        => 0.5,
-        :recombination_threshold   => 0.5,
-        :genotype_space_conf       => {
-            :bitstring_length => 120,
-        }
-      )
-    }.should_not raise_error
-  end
-
-  it 'should accept integer representation genotypes' do
-    lambda {
-      MHL::GeneticAlgorithmSolver.new(
-        :population_size           => 128,
-        :genotype_space_type       => :integer,
-        :mutation_probability      => 0.5,
-        :recombination_probability => 0.5,
-        :genotype_space_conf       => {
-            :dimensions         => 6,
-            :recombination_type => :intermediate,
-        }
-      )
-    }.should_not raise_error
-  end
-
-  it 'should solve a 2-dimension parabola in integer space' do
-    solver = MHL::GeneticAlgorithmSolver.new(
-        :population_size           => 40,
-        :genotype_space_type       => :integer,
-        :mutation_probability      => 0.5,
-        :recombination_probability => 0.5,
-        :genotype_space_conf       => {
-            :dimensions         => 2,
-            :recombination_type => :intermediate,
-            :random_func        => lambda { Array.new(2) { rand(20) } }
-        },
-        :exit_condition => lambda {|generation,best_sample| best_sample[:fitness] == 0}
-    )
-    solver.solve(Proc.new{|genotype| -(genotype[0]**2 + genotype[1]**2)  })
-  end
-
-  # it 'should solve a 2-dimension parabola in real space'
-
-end
-

data/spec/spec_helper.rb

@@ -1,19 +0,0 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-
-require 'mhl'
-
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-end