gimuby 0.7.2 → 0.7.3

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: 774ea577ca0cd0fe53bc732d56a6e6e560adfc22
+  data.tar.gz: 84804ec18561b0fda31713951c3f41e06b7d5733
+SHA512: 
+  metadata.gz: d01872dc51ad8d00723f0c78a48188181020818a0f9366bb254d88dee504ccb7b78054f62f8e3c69550b6d5df4763c46e251ee1b266045b514749b040f4ad37c
+  data.tar.gz: 9ac69252b798eedca91c88d64c7ac6045c7ad17ad288c54fc9f5d19b01e7c5610ef7f1156f92cc195a239c7f5027de55e49c8be10846495934f94a1393880f39

data/Gemfile

@@ -1 +1,4 @@
-rake
+source "https://rubygems.org"
+
+gemspec
+gem 'rake'

data/README.md

@@ -0,0 +1,3 @@
+[![Build Status](https://secure.travis-ci.org/frantzmiccoli/Gimuby.png)](http://travis-ci.org/   frantzmiccoli/Gimuby)
+
+[Gimuby's presentation page](http://frantzmiccoli.github.io/Gimuby/ "Gimuby").

data/lib/gimuby/factory.rb

@@ -133,8 +133,8 @@ class Factory
     archipelago.connect_strategy = get_random_connect_strategy
     # between 0.01% and ~35%
     archipelago.migration_rate = (rand() * 35.0 / 100.0) + 0.0001
-    archipelago.migration_symmetric = [true, false].choice
-    archipelago.migration_type = [:random, :synchronized, :fixed_time].choice
+    archipelago.migration_symmetric = random_entry(true, false)
+    archipelago.migration_type = random_entry(:random, :synchronized, :fixed_time)
     get_populations_number.times do |_|
       archipelago.add_population(_get_population(:archipelago, &solution_generator))
     end
@@ -176,7 +176,7 @@ class Factory
     solutions_per_population = 0
     min_solutions_per_population = min_population_size / populations_number
     begin
-      picked_solutions_number = solutions_number_range.choice
+      picked_solutions_number = random_entry(solutions_number_range)
       picked_solutions_number /= populations_number
       picked_solutions_number *= populations_number
       solutions_per_population = picked_solutions_number / populations_number
@@ -200,7 +200,8 @@ class Factory
       populations_number_range = *(10..29)
     end
 
-    @_populations_number = populations_number_range.choice
+    
+    @_populations_number = random_entry(populations_number_range)
     @_populations_number
   end
 
@@ -272,4 +273,19 @@ class Factory
     strategy
   end
 
-end
+  def self.random_entry *args
+    array = args.flatten
+
+    if array.respond_to? :sample
+      array.sample
+    else
+      array.choice  
+    end
+  end
+  
+  private
+  def random_entry *args
+    self.class.random_entry(*args)
+  end
+
+end

data/lib/gimuby/genetic/archipelago/connect_strategy/watts_strogatz_connect_strategy.rb

@@ -48,7 +48,7 @@ class WattsStrogatzConnectStrategy < ConnectStrategy
       if node1 < node2 # we do not process the other case (undirected model)
         should_rewire = @rewire_rate < rand()
         if should_rewire
-          new_node = nodes.choice while archipelago.has_edge(node1, new_node)
+          new_node = Factory.random_entry(nodes) while archipelago.has_edge(node1, new_node)
           archipelago.remove_edge(node1, node2)
           archipelago.connect(node1, new_node)
         end
@@ -60,4 +60,4 @@ class WattsStrogatzConnectStrategy < ConnectStrategy
     archipelago.get_edges
   end
 
-end
+end

data/lib/gimuby/genetic/population/pick_strategy/tournament_pick_strategy.rb

@@ -7,11 +7,11 @@ class TournamentPickStrategy < PickStrategy
     number = get_number_to_pick(population)
     candidates = solutions.clone
 
-    while candidates.length > number:
-      sol1 = candidates.choice()
+    while candidates.length > number
+      sol1 = Factory.random_entry(candidates)
       sol2 = sol1
-      while sol1 == sol2:
-        sol2 = candidates.choice()
+      while sol1 == sol2
+        sol2 = Factory.random_entry(candidates)
       end
       if population.get_fitness(sol1) < population.get_fitness(sol2)
         candidates.delete(sol2)
@@ -23,4 +23,4 @@ class TournamentPickStrategy < PickStrategy
     candidates
   end
 
-end
+end

data/lib/gimuby/genetic/solution/new_generation_strategy/combined_new_generation_strategy.rb

@@ -22,6 +22,6 @@ class CombinedNewGenerationStrategy < NewGenerationStrategy
   protected
 
   def get_concrete_strategy
-    @strategies.choice
+    Factory.random_entry(@strategies)
   end
-end
+end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gimuby
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - "Fr\xC3\xA4ntz Miccoli"
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-30 00:00:00 Z
+date: 2014-04-14 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -93,36 +87,29 @@ files:
 homepage: https://frantzmiccoli.github.io/Gimuby
 licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ~>
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 31
-      segments: 
-      - 1
-      - 8
       version: "1.8"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: "Gimuby: genetic algorithm and island model for Ruby"
 test_files: []