charlie 0.7.0 → 0.7.1

data/lib/charlie.rb

@@ -4,7 +4,7 @@ $:.unshift File.dirname(__FILE__)
 
 # This is just a dummy module to avoid making the VERSION constant a global.
 module Charlie
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end
 
 require 'charlie/etc/monkey'

data/lib/charlie/crossover.rb

@@ -13,7 +13,7 @@ end
 # Usage: use SingleChild(UniformCrossover)
 def SingleChild(crossover_module)
   Module.new{
-    include crossover_module
+    include crossover_module.dup
     def cross(parent1,parent2)
       super(parent1,parent2).at_rand
     end

data/lib/charlie/list/list_genotype.rb

@@ -40,8 +40,10 @@ def StringGenotype(n,elements)
  elements = elements.chars if elements.is_a? String # string to array of chars
  elements = elements.to_a
  Class.new(Genotype) {
-  define_method(:size){ n }
-  define_method(:elements){ elements }
+  [self,metaclass].each{|c| c.class_eval{ # include both in class and metaclass
+   define_method(:size){ n }
+   define_method(:elements){ elements }
+  }}
   def initialize
     @genes = Array.new(size){ elements.at_rand }
   end

data/lib/charlie/selection.rb

@@ -48,6 +48,7 @@ module RouletteSelection
 
     new_pop = []
     while new_pop.size < population.size
+      i1 = i2 = nil
       i1,i2 = [0,0].map{ 
         r = rand * sum
         partial_sum.index partial_sum.find{|x| x > r }
@@ -81,6 +82,7 @@ def ScaledRouletteSelection(&block)
     population = population.sort_by(&:fitness)
     new_pop = []
     while new_pop.size < population.size
+      i1 = i2 = nil
       i1,i2 = @@index.at_rand, @@index.at_rand until i1!=i2 # no replacement
       new_pop += yield(population[i1],population[i2])
     end
@@ -99,7 +101,7 @@ ScaledRouletteSelection = ScaledRouletteSelection()
 # Elitism is saving the best +elite_n+ individuals each generation, to ensure the best solutions are never lost.
 def Elitism(sel_module,elite_n=1)
  Module.new{
-  include sel_module
+  include sel_module.dup
   @@elite_n = elite_n
   def next_generation(population)
     population = population.sort_by(&:fitness)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: charlie
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Sander Land
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-11 00:00:00 +01:00
+date: 2008-01-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency