evopop 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e6f9dc9b3385fbd06d69e3f4c8d062dab99b93b
-  data.tar.gz: e6ed6c011086a7901b5db7cad7c1e818827b7520
+  metadata.gz: 7807b58e3f22619a088086082e9e487bfcaa367c
+  data.tar.gz: e8b1fe7390fe1bd84a2df0991c3b2106bb1e36b3
 SHA512:
-  metadata.gz: 7cbcf3830e9c614853391008bce76aba3e55a74290cdc9059386af79a3681999fcc53c4bbda2e1c159a82d73300197f52fb2a9b9d45264e0976f84cb5f3a5c18
-  data.tar.gz: eb45100eee7f64bd1bfa03a2fbc3d050f852beaeb32c2e5f94ba6046773bbf06b0467ba19c26443c8018dbea391bce3ac8cbc3d7a3951da57e5a98fb0bac552d
+  metadata.gz: 35f737e742c07176c1527929096b2fd78ae5d4007b486cd3a9775e234efe19b2d933d7e488f7819b99dbabd4334fd2ac3096860cd26093b6d2ae63b8e102d5d4
+  data.tar.gz: 406bd5fce6c6a5b98a8c8621f3f1d5a7fc1944ade0f7ddb4e4356b2a5da87801fe059b625602395dde9cc62756c39eaf5ca41b88ac968858f532671405c23151

data/README.md

@@ -13,18 +13,18 @@ over a fitness function.
 require 'evopop'
 
 # Initialize the population to be trained with good defaults.
-population = Evopop::Population.new
-population.population_size = 1000
-population.dna_len = 2
-population.max_generations = 1000
-population.initial_range_min = -10_000.0
-population.initial_range_max = 10_000.0
+population                    = Evopop::Population.new
+population.population_size    = 1000
+population.dna_len            = 2
+population.max_generations    = 1000
+population.initial_range_min  = -10_000.0
+population.initial_range_max  = 10_000.0
 population.mutation_range_min = -10.0
 population.mutation_range_max = 10.0
-population.mutation_num = 10
-population.crossover_params = { ordinal: (DNA_LEN / 2) }.freeze
+population.mutation_num       = 10
+population.crossover_params   = { ordinal: (DNA_LEN / 2) }.freeze
 population.crossover_function = Evopop::Crossover.method(:one_point)
-population.fitness_function = proc do |dna|
+population.fitness_function   = proc do |dna|
   Math.sin(dna[0]) + Math.cos(dna[1])
 end
 

data/lib/evopop.rb

@@ -3,6 +3,7 @@
 require 'evopop/population'
 require 'evopop/candidate'
 require 'evopop/crossover'
+require 'evopop/crossover_array'
 require 'evopop/dna'
 
 # Toplevel class for evopop project
@@ -25,7 +26,7 @@ module Evopop
 
     def initialize
       @average_fitness = []
-      @population_size = 100
+      @population_size = 500
       @max_generations = 100
       @initial_range_min = -100
       @initial_range_max = 100

data/lib/evopop/crossover.rb

@@ -8,25 +8,18 @@ module Evopop
     # http://en.wikipedia.org/wiki/Crossover_(genetic_algorithm)#One-point_crossover
     def self.one_point(candidates, params)
       ordinal = params[:ordinal]
+      arr_a, arr_b = CrossoverArray.one_point_crossover(candidates[0].dna, candidates[1].dna, ordinal)
 
-      # Compose the dna of the first child from the first chunk of the
-      # first candidate and the second chunk of the second candidate
-      dna_a_left = candidates[0].dna.take(ordinal)
-      dna_b_right = candidates[1].dna.drop(ordinal)
-
-      # Compose the dna of the second child from the first chunk of the
-      # first candidate and the second chunk of the second candidate
-      dna_b_left = candidates[1].dna.take(ordinal)
-      dna_a_right = candidates[0].dna.drop(ordinal)
-
+      # TODO: Move this to its own class, DnaRange
       min_range = candidates[0].dna.min_range
       max_range = candidates[1].dna.max_range
 
+      # TODO: Move this to its own class, DnaMutationRange
       min_mutation = candidates[1].dna.min_mutation
       max_mutation = candidates[1].dna.max_mutation
 
-      dna_a = Evopop::Dna.create(min_range, max_range, min_mutation, max_mutation, dna_a_left + dna_b_right)
-      dna_b = Evopop::Dna.create(min_range, max_range, min_mutation, max_mutation, dna_b_left + dna_a_right)
+      dna_a = Evopop::Dna.create(min_range, max_range, min_mutation, max_mutation, arr_a)
+      dna_b = Evopop::Dna.create(min_range, max_range, min_mutation, max_mutation, arr_b)
 
       # Initialize and assign DNA to children.
       [
@@ -43,18 +36,15 @@ module Evopop
       # Make sure to sort.
       ordinals = params[:ordinals].split(',').sort.collect(&:to_i)
 
-      # Initialize and assign the DNA of the children.
-      cdna_a = candidates[0].dna
-      cdna_b = candidates[1].dna
+      cdna_a, cdna_b = CrossoverArray.two_point_crossover(candidates[0].dna, candidates[1].dna, ordinals)
 
       [
-        Evopop::Candidate.new(combine_on_ordinal(cdna_a, cdna_b, ordinals)),
-        Evopop::Candidate.new(combine_on_ordinal(cdna_b, cdna_a, ordinals))
+        Evopop::Candidate.new(cdna_a),
+        Evopop::Candidate.new(cdna_b)
       ]
     end
 
     def self.combine_on_ordinal(dna_a, dna_b, ordinals)
-      # TODO: Would this be better in dna.rb?
       dna_a[0..ordinals[0]] + dna_b[(ordinals[0] + 1)..ordinals[1]] + dna_a[(ordinals[1] + 1)..dna_a.length - 1]
     end
 
@@ -79,7 +69,7 @@ module Evopop
       ordinals.each do |i|
         n_ordinal = old_ordinal..i
 
-        cdna_a, cdna_b = build_dna_by_synchronous(cdna_a, cdna_b, pdna_a, pdna_b, n_ordinal, synchronous)
+        cdna_a, cdna_b = CrossoverArray.build_dna_by_synchronous(cdna_a, cdna_b, pdna_a, pdna_b, n_ordinal, synchronous)
 
         synchronous = !synchronous
         next_ordinal = i + 1
@@ -87,7 +77,7 @@ module Evopop
         next if ordinals.last != next_ordinal - 1
 
         ordinal_range = next_ordinal..(dna_length - 1)
-        cdna_a, cdna_b = build_dna_by_synchronous(cdna_a, cdna_b, pdna_a, pdna_b, ordinal_range, synchronous)
+        cdna_a, cdna_b = CrossoverArray.build_dna_by_synchronous(cdna_a, cdna_b, pdna_a, pdna_b, ordinal_range, synchronous)
       end
 
       [
@@ -96,15 +86,6 @@ module Evopop
       ]
     end
 
-    def self.build_dna_by_synchronous(cdna_a, cdna_b, pdna_a, pdna_b, ordinal_range, synchronous)
-      pdnas = [pdna_a, pdna_b]
-      pdnas.reverse! unless synchronous
-      cdna_a += pdnas[0][ordinal_range]
-      cdna_b += pdnas[1][ordinal_range]
-
-      [cdna_a, cdna_b]
-    end
-
     def self.average(candidates, _params)
       new_dna = Evopop::Dna.new(
         candidates[0].dna.min_range,

data/lib/evopop/crossover_array.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+# Class for handling crossover against arrays.
+# Supports
+#   * Single point crossover
+#   * n-point corssover
+class CrossoverArray
+  def self.one_point_crossover(a, b, ordinal)
+    # Compose the dna of the first child from the first chunk of the
+    # first candidate and the second chunk of the second candidate
+    dna_a_left = a[0..ordinal]
+    dna_b_right = b[(ordinal + 1)..-1]
+
+    # Compose the dna of the second child from the first chunk of the
+    # first candidate and the second chunk of the second candidate
+    dna_b_left = b[0..ordinal]
+    dna_a_right = a[(ordinal + 1)..-1]
+
+    [dna_a_left + dna_b_right, dna_b_left + dna_a_right]
+  end
+
+  def self.two_point_crossover(cdna_a, cdna_b, ordinals)
+    dna_a = combine_on_ordinal(cdna_a, cdna_b, ordinals)
+    dna_b = combine_on_ordinal(cdna_b, cdna_a, ordinals)
+
+    [dna_a, dna_b]
+  end
+
+  def self.n_point_crossover(dna_a, dna_b, ordinals)
+    ret_a = []
+    ret_b = []
+
+    old_ordinal = 0
+    toggle = true
+    ordinals << dna_a.length + 1
+
+    ordinals.each do |ordinal|
+      if toggle
+        ret_a += dna_a[old_ordinal..ordinal]
+        ret_b += dna_b[old_ordinal..ordinal]
+      else
+        ret_a += dna_b[old_ordinal..ordinal]
+        ret_b += dna_a[old_ordinal..ordinal]
+      end
+
+      old_ordinal = ordinal + 1
+      toggle = !toggle
+    end
+
+    [ret_a, ret_b]
+  end
+
+  def self.combine_on_ordinal(dna_a, dna_b, ordinals)
+    dna_a[0..ordinals[0]] + dna_b[(ordinals[0] + 1)..ordinals[1]] + dna_a[(ordinals[1] + 1)..dna_a.length - 1]
+  end
+
+  def self.build_dna_by_synchronous(cdna_a, cdna_b, pdna_a, pdna_b, ordinal_range, synchronous)
+    pdnas = [pdna_a, pdna_b]
+    pdnas.reverse! unless synchronous
+    cdna_a += pdnas[0][ordinal_range]
+    cdna_b += pdnas[1][ordinal_range]
+
+    [cdna_a, cdna_b]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evopop
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Elvin Lucero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-08 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies: []
 description: A simple library for implementing simple genetic algorithms.
 email: elvin+evopop@1au.io
@@ -21,6 +21,7 @@ files:
 - lib/evopop.rb
 - lib/evopop/candidate.rb
 - lib/evopop/crossover.rb
+- lib/evopop/crossover_array.rb
 - lib/evopop/dna.rb
 - lib/evopop/population.rb
 homepage: https://rubygems.org/gems/evopop