ant_colony_optimizer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e408d909edc458bbf40177c1660389e2e48f34d9
-  data.tar.gz: 7da6cf9b2f3097b09fca57059b8114b084ae7c00
+  metadata.gz: c2c50dc0a687d8571ee8dc1625a4e9b012b2a4de
+  data.tar.gz: faa09ae4dab05be3948524d2b35ecb1f4cf67079
 SHA512:
-  metadata.gz: 1317dd16d277115333217d771fac152f68e35dac8c12f95ffa44398af3436aee8756c49b2cc376d51ea46376a408092777f08dea9a66f0ce1357f5117fa2b9f9
-  data.tar.gz: 93cb11aab75c1361f22979fc84f899d6caf0b8a9f47e619a21c96ae63efc4f21911c7831a1a19ff05d62b7a6dd9114e40ea086e2af1b30adf49a2a52c9a9ad2d
+  metadata.gz: 91d37722dac921ad657cfdf2c4018378b27b7ec1005fe66e53ea47b7fbc6c42b73628241ef480c7380421e8a513142f040344f00bebbde19435ed967fde81eb3
+  data.tar.gz: d668d3cbe4bd343e85afbf98ee044aed515d807c7c8c462c727ca37e773ce4efdaff5bec14719e86eff023d80fed028d7cba8886c7e68f612678d811cc719b75

data/Rakefile

@@ -11,4 +11,4 @@ Rake::TestTask.new(:test) do |t|
   end
 end
 
-task :default => :spec
+task :default => :test

data/lib/ant_colony_optimizer.rb

@@ -11,6 +11,8 @@ class AntColonyOptimizer
     @q = q
     @ants = ants
     initialize_pheromone
+    @min_cost = Float::MAX
+    @best_path = nil
   end
 
   def self.greedy_path_cost(matrix, start)
@@ -44,7 +46,7 @@ class AntColonyOptimizer
     initial_phero = @ants / avg
     @pheromone = @node_num.times.map{|i|
       @node_num.times.map{|j|
-        if i == j
+        if i == j or @matrix[i][j] == 0
           0
         else
           initial_phero
@@ -55,6 +57,7 @@ class AntColonyOptimizer
 
   def find_path
     # start from index 0
+    costs = []
     cost = 0.0
     i = 0
     visited = [0]
@@ -62,7 +65,11 @@ class AntColonyOptimizer
     until remain.empty?
       sum = 0.0
       probs = remain.map{|j|
-        p = (@pheromone[i][j] ** @alpha) * (@matrix[i][j] ** -@beta)
+        if @matrix[i][j] == 0
+          p = 0.0
+        else
+          p = (@pheromone[i][j] ** @alpha) * (@matrix[i][j] ** -@beta)
+        end
         sum += p
         sum
       }
@@ -72,17 +79,23 @@ class AntColonyOptimizer
       remain.delete(next_i)
       visited << next_i
       cost += @matrix[i][next_i]
+      if @matrix[0][next_i] == 0
+        costs << cost
+        cost = 0.0
+      end
       i = next_i
     end
     visited << 0
     cost += @matrix[i][0]
-    [visited, cost]
+    costs << cost
+    [visited, costs.max]
   end
 
   def update_pheromone(paths)
     @node_num.times do |i|
       @node_num.times do |j|
         next if i == j
+        next if @matrix[i][j] == 0.0
         curr = @pheromone[i][j]
         new = curr * @ro + paths.inject(0.0){|sum, (path, cost)|
           if path.each_cons(2).find{|cons| cons == [i,j] or cons == [j,i] }
@@ -115,16 +128,20 @@ class AntColonyOptimizer
     [best_path, min_cost]
   end
 
-  def optimize(iteration)
-    min_cost = Float::MAX
-    best_path = nil
-    iteration.times do
+  def optimize(iteration, best_path_callback: nil)
+    iteration.times do |i|
       path, cost = step
-      if cost < min_cost
-        min_cost = cost
-        best_path = path
+      if block_given?
+        yield [i, path, cost]
+      end
+      if cost < @min_cost
+        @min_cost = cost
+        @best_path = path
+        if best_path_callback.respond_to?(:call)
+          best_path_callback.call(i, path, cost)
+        end
       end
     end
-    [best_path, min_cost]
+    [@best_path, @min_cost]
   end
 end

data/lib/ant_colony_optimizer/version.rb

@@ -1,3 +1,3 @@
 class AntColonyOptimizer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ant_colony_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - nagachika
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies: []
 description: Ant Colony Optimizer Library
 email: