gga4r 0.9.0 → 0.9.1

data/README.txt

@@ -1,8 +1,8 @@
-README for gga4r
-===============
+=README for gga4r
+
+
+==Introduction
 
-Introduction
-************
 General Genetic Algorithm for ruby is a Ruby Genetic Algorithm so simple to use:
 
 	1) Take a class to evolve it and define fitness, recombine and mutate methods.
@@ -13,8 +13,8 @@ General Genetic Algorithm for ruby is a Ruby Genetic Algorithm so simple to use:
 			
 			    def recombine(c2)
 			      cross_point = (rand * c2.size).to_i
-			      c1_a, c1_b = self.split(cross_point)
-			      c2_a, c2_b = c2.split(cross_point)
+			      c1_a, c1_b = self.separate(cross_point)
+			      c2_a, c2_b = c2.separate(cross_point)
 			      [StringPopulation.new(c1_a + c2_b), StringPopulation.new(c2_a + c1_b)]
 			    end
 			
@@ -40,8 +40,7 @@ General Genetic Algorithm for ruby is a Ruby Genetic Algorithm so simple to use:
 			100.times { |i|  ga.evolve }
 			p ga.best_fit[0]
 
-Install
-*******
+==Install
 
 1) Execute:
 	gem install gga4r
@@ -51,20 +50,18 @@ Install
 	require "gga4r"
 
 
-Attention
-*********
- Please note that Gga4r adds shuffle!, each_pair and split methods to the Array class.
+==Attention
+
+ Please note that Gga4r adds shuffle!, each_pair and separate methods to the Array class.
 
-Documentation
-*************
+==Documentation
 
 Documentation can be generated using rdoc tool under the source code with:
 
   rdoc README lib
 
 
-Copying
-*******
+==Copying
 
 This work is developed by Sergio Espeja ( www.upf.edu/pdi/iula/sergio.espeja, sergio.espeja at gmail.com )
 mainly in Institut Universitari de Lingüística Aplicada of Universitat Pompeu Fabra ( www.iula.upf.es ),

data/examples/ga_fitness_all_1s.rb

@@ -7,8 +7,8 @@ class StringPopulation < Array
 
     def recombine(c2)
       cross_point = (rand * c2.size).to_i
-      c1_a, c1_b = self.separate(cross_point)
-      c2_a, c2_b = c2.separate(cross_point)
+      c1_a, c1_b = self.split(cross_point)
+      c2_a, c2_b = c2.split(cross_point)
       [StringPopulation.new(c1_a + c2_b), StringPopulation.new(c2_a + c1_b)]
     end
 

data/lib/gga4r/gga4r_main.rb

@@ -1,5 +1,6 @@
 require "yaml"
 require "logger"
+require "active_support"
 
 class GeneticAlgorithm
   attr_reader :generations, :p_combination, :p_mutation
@@ -22,7 +23,7 @@ class GeneticAlgorithm
     @p_mutation = prop[:p_mutation] || 0.01
     @max_population =  prop[:max_population]
     @logger = prop[:logger] if prop[:logger]
-
+    @use_threads = prop[:use_threads] if prop[:use_threads]
 #    mean_fitness
   end
 
@@ -77,7 +78,7 @@ class GeneticAlgorithm
   # Evolves the actual generation num_steps steps (1 by default).
   def evolve(num_steps = 1)
     num_steps.times do
-      @generations << evaluation(@generations[-1])
+      @generations << evaluation_with_threads(@generations[-1])
       selection!
       recombination! 
       mutation!
@@ -97,6 +98,25 @@ class GeneticAlgorithm
     end
   end
 
+  # Prepares given generation for evaluation ( evaluates its fitness ),
+  # using Threads
+  def evaluation_with_threads(g)
+    @logger.debug "Evaluation " + g.size.to_s + " chromosomes." if @logger
+    threads = []
+    i = 0
+    g.each do |chromosome|
+      i += 1
+      @logger.debug "Evaluating chromosome #{i}:" if @logger
+      @logger.debug "#{chromosome.stats.join("\n")}" if @logger
+      threads << Thread.new(chromosome) do |t_chromosome|
+        t_chromosome.fitness
+        puts "Thread finished #{Thread.current.id} - #{Thread.current.status}"
+      end
+    end
+    # Wait for threads for finish
+    threads.each {|thread| puts "#{thread.status}"; thread.join; puts "#{thread.status}"}
+    return g
+  end
 
   
   # Selects population to survive and recombine
@@ -113,10 +133,10 @@ class GeneticAlgorithm
     new_generation = g.dup.shuffle!
     @logger.debug "Shuffled!" if @logger
     new_childs = []
-    new_generation.each_pair do |chromosome1, chromosome2|
+    new_generation.in_groups_of(2) do |chromosome1, chromosome2|
       if rand > (1 - @p_combination)
         @logger.debug "Recombining" if @logger
-        new_childs = chromosome1.recombine(chromosome2)
+        new_childs += chromosome1.recombine(chromosome2)
       end
     end
     new_generation + new_childs    
@@ -142,8 +162,10 @@ class GeneticAlgorithm
     new_generation = []
     g.each do |chromosome|
       num_rep = 0
-      num_rep += (chromosome.fitness/mean_fitness).to_i
-      num_rep += 1 if rand > (1 - (chromosome.fitness/mean_fitness)%1)
+      if chromosome.fitness > 0
+        num_rep += (chromosome.fitness.to_f/mean_fitness).to_i
+        num_rep += 1 if rand > (1 - (chromosome.fitness/mean_fitness)%1)
+      end
       new_generation = new_generation + ([chromosome] * num_rep)
     end
     new_generation

data/lib/gga4r/version.rb

@@ -2,7 +2,7 @@ module Gga4r #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: gga4r
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2007-03-23 00:00:00 +01:00
+  version: 0.9.1
+date: 2007-11-22 00:00:00 +01:00
 summary: "A Ruby Genetic Algorithm. So simple to use: 1, take a class to evolve it and define fitness, recombine and mutate methods. 2, create a GeneticAlgorithm object with the population. 3, call evolve method as many times as you want.description of gem"
 require_paths: 
 - lib
+- test
 email: sergio.espeja@gmail.com
 homepage: http://gga4r.rubyforge.org
 rubyforge_project: gga4r
@@ -41,8 +42,8 @@ files:
 - test/test_helper.rb
 - test/gga4r_test.rb
 - examples/ga_fitness_all_1s.rb
-test_files: 
-- test/gga4r_test.rb
+test_files: []
+
 rdoc_options: []
 
 extra_rdoc_files: []