Algorithmically 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c3ff69c1deb1ef40a3b013235db5301c5fabe69
-  data.tar.gz: 079f3e9fa0f0855bbdff52e73d6047e5a1c8e56d
+  metadata.gz: 834e24f733f439348830da9a6eedcc2ace840fe4
+  data.tar.gz: 36df1221be7719139bdf5f39e0fa5cf799ada70d
 SHA512:
-  metadata.gz: 39a4454297e4961ba194fecad4c33c03447b00e702e5411251ccc43dd966fee3d0159af90ad6b9f3887a19788b702427d9239f8ba44b615be9b2e96f35f3cdd1
-  data.tar.gz: 3bf6a86a8e384a28438e38ab15cf3d00626fcd38c3cc7b91326b079ee6bb3812eee3f741cffa8e0b3b694f16c97ec0923ed58a1fb046640e59eae3c034a30195
+  metadata.gz: 81628e3e9a0881dcc61c025c0febfe61e0265e4a7841f878e5fe790f8e9c6214bebf8eb92e6aab04ca578e1755d0aecd28c1230e6aa1bb88533979089d635cfc
+  data.tar.gz: b0cc0c5471c98c879ad3b08ce912cb0b483ac581b5f00534ec93764807c9553f2a6b8f71298d4b3bb0a8e6a1c8d8d205b2476978a061f5ea4f8ae15427d4fa82

data/.ruby-version

@@ -0,0 +1 @@
+2.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Algorithmically (0.1.2)
+    Algorithmically (0.1.7)
 
 GEM
   remote: https://rubygems.org/
@@ -25,4 +25,4 @@ DEPENDENCIES
   rake (~> 11.3)
 
 BUNDLED WITH
-   1.13.1
+   1.14.5

data/README.md

@@ -1,6 +1,6 @@
 # Algorithmically
 
-Nature-Inspired Programming Recipes 
+Nature-Inspired Programming Recipes [![Gem Version](https://badge.fury.io/rb/Algorithmically.svg)](https://badge.fury.io/rb/Algorithmically)
 
 ## Installation
 
@@ -30,13 +30,22 @@ Or install it yourself as:
 
 ### Stochastic Algorithms
     
-    Algorithmically::Neural::RandomSearch.new(2, 50)
+    Algorithmically::Stochastic::RandomSearch.new(2, 50)
 
-    Algorithmically::Neural::AdaptiveRandomSearch.new(1000, 2, 0.05, 1.3, 3.0, 10, 30)
+    Algorithmically::Stochastic::AdaptiveRandomSearch.new(1000, 2, 0.05, 1.3, 3.0, 10, 30)
     
-    Algorithmically::Neural::HillClimbing.new(2, 1000)
+    Algorithmically::Stochastic::HillClimbing.new(2, 1000)
     
-    Algorithmically::Neural::GuidedLocalSearch.new(150, [[565,575],[25,185],[345,750],[945,685]], 20, 0.3)
+    Algorithmically::Stochastic::GuidedLocalSearch.new(150, [[565,575],[25,185],[345,750],[945,685]], 20, 0.3)
+    
+    b52 = [[595,360],[1340,725],[1740,245]]
+    max_iterations = 150
+    max_no_improv = 20
+    alpha = 0.3
+    local_search_optima = 12000.0
+    lambda = alpha * (local_search_optima/b52.size.to_f)
+    
+    Algorithmically::Stochastic::Iterated_Local_Search.search(max_iterations, b52, max_no_improv, lambda)
 
 ### Swarm Algorithms
 

data/lib/Algorithmically/Stochastic/iterated_local_search.rb

@@ -0,0 +1,84 @@
+module Algorithmically
+  module Stochastic
+
+    class Iterated_Local_Search
+
+      def euc_2d(c1, c2)
+        Math.sqrt((c1[0] - c2[0]) ** 2.0 + (c1[1] - c2[1]) ** 2.0).round
+      end
+
+      def cost(permutation, cities)
+        distance = 0
+        permutation.each_with_index do |c1, i|
+          c2 = (i == permutation.size - 1) ? permutation[0] : permutation[i + 1]
+          distance += euc_2d(cities[c1], cities[c2])
+        end
+        distance
+      end
+
+      def random_permutation(cities)
+        perm = Array.new(cities.size) { |i| i }
+        perm.each_index do |i|
+          r = rand(perm.size - i) + i
+          perm[r], perm[i] = perm[i], perm[r]
+        end
+        perm
+      end
+
+      def stochastic_two_opt(permutation)
+        perm = Array.new(permutation)
+        c1, c2 = rand(perm.size), rand(perm.size)
+        exclude = [c1]
+        exclude << ((c1 == 0) ? perm.size - 1 : c1 - 1)
+        exclude << ((c1 == perm.size - 1) ? 0 : c1 + 1)
+        c2 = rand(perm.size) while exclude.include?(c2)
+        c1, c2 = c2, c1 if c2 < c1
+        perm[c1...c2] = perm[c1...c2].reverse
+        perm
+      end
+
+      def local_search(best, cities, max_no_improv)
+        count = 0
+        begin
+          candidate = {:vector => stochastic_two_opt(best[:vector])}
+          candidate[:cost] = cost(candidate[:vector], cities)
+          count = (candidate[:cost] < best[:cost]) ? 0 : count + 1
+          best = candidate if candidate[:cost] < best[:cost]
+        end until count >= max_no_improv
+        best
+      end
+
+      def double_bridge_move(perm)
+        pos1 = 1 + rand(perm.size / 4)
+        pos2 = pos1 + 1 + rand(perm.size / 4)
+        pos3 = pos2 + 1 + rand(perm.size / 4)
+        p1 = perm[0...pos1] + perm[pos3..perm.size]
+        p2 = perm[pos2...pos3] + perm[pos1...pos2]
+        p1 + p2
+      end
+
+      def perturbation(cities, best)
+        candidate = {}
+        candidate[:vector] = double_bridge_move(best[:vector])
+        candidate[:cost] = cost(candidate[:vector], cities)
+        candidate
+      end
+
+      def search(cities, max_iterations, max_no_improv)
+        best = {}
+        best[:vector] = random_permutation(cities)
+        best[:cost] = cost(best[:vector], cities)
+        best = local_search(best, cities, max_no_improv)
+        max_iterations.times do |iter|
+          candidate = perturbation(cities, best)
+          candidate = local_search(candidate, cities, max_no_improv)
+          best = candidate if candidate[:cost] < best[:cost]
+          puts " > iteration #{(iter+1)}, best=#{best[:cost]}"
+        end
+        best
+      end
+
+    end
+
+  end
+end

data/lib/Algorithmically/version.rb

@@ -1,3 +1,3 @@
 module Algorithmically
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Algorithmically
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - popac
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Algorithmically.gemspec
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -81,6 +82,7 @@ files:
 - lib/Algorithmically/Stochastic/adaptive_random_search.rb
 - lib/Algorithmically/Stochastic/guided_local_search.rb
 - lib/Algorithmically/Stochastic/hill_climbing.rb
+- lib/Algorithmically/Stochastic/iterated_local_search.rb
 - lib/Algorithmically/Stochastic/random_search.rb
 - lib/Algorithmically/Swarm/particle_swarm.rb
 - lib/Algorithmically/version.rb
@@ -105,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Algorithmically