ruby-jgap 0.0.2-java → 0.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da1f5d18e0a46faaca1b2436d0c25b5017d15f2b
-  data.tar.gz: 7689a9b162d30599dcae4f29fda432135b3d1261
+  metadata.gz: e9aa49148ce53319cbbaf0da2f9a73ec6810e546
+  data.tar.gz: b55811369919a6374621068f2a02f141440b755c
 SHA512:
-  metadata.gz: 6d715b18d2df55f9415f7dc2bfbc93e52dc9012e579c403b2ed7db67b1341b3072236eece58ad960ebc8be509ff47987797bbdcb61dbac4e268241d93e29e259
-  data.tar.gz: e2059b74fd96d9584d239b8d9ac410e43e74f69ca915bcaf794d5b23565152277a38b58a519ea70271ba78af6d6a7f15e1aa99678c3a4a9da7c8fe376505fa92
+  metadata.gz: 875ebd2d014740e7e0693c5f91fc92df874a654c6254efdac00d6aa3f32960370a07062bf87e60a29e8d936bec3c94e4b6da4322c931b247d2aa70835ae2bf79
+  data.tar.gz: 0408d1f318923d8a82f5d3984aa1f461ad1753fef9c74693e42e245e4a936fec60db1654ca66c08c1f117e38cf4dff34eedcf39fe957ea109c64b16d049b47f2

data/lib/JGAP/problem.rb

@@ -30,13 +30,6 @@ module JGAP
       subject.gene(@names[name]).allele
     end
     
-    def salesman(name, cities)
-      new_gene = IntegerGene.new(@config, 0, cities - 1)
-      new_gene.set_allele java.lang.Integer.new(@genes.length)
-      @names[name] = @genes.length
-      @genes << new_gene
-    end
-    
     def integer(name, opts={})
       @names[name] = @genes.length
       unless opts.empty?
@@ -92,7 +85,7 @@ module JGAP
       chromosome
       population_size
     end
-  
+    
     
     def setup
       # Override me!
@@ -120,6 +113,18 @@ module JGAP
       end
     end
     
+    def minimize(value)
+      1.0/(1 + value.abs)
+    end
+    
+    def maximize(value)
+      if value <= 0
+        1/value.abs
+      else
+        value
+      end
+    end
+    
     ## MACROS
     
     def self.population_size(size)

data/lib/JGAP/salesman.rb

@@ -12,6 +12,23 @@ java_import %w(
 
 module JGAP
   
+  class ChromosomeBuilder
+
+    def salesman(names)
+      names.each do |name|
+        new_gene = IntegerGene.new(@config, 0, names.length)
+        new_gene.set_allele java.lang.Integer.new(@genes.length)
+        @names[name] = @genes.length
+        @genes << new_gene
+      end
+    end
+    
+    def get_name(num)
+      @names.invert[num]
+    end
+    
+  end
+  
   class Salesman < org.jgap.impl.salesman.Salesman
     attr_reader :best_solution
     
@@ -25,7 +42,14 @@ module JGAP
       chromosome
       population_size
     end
-  
+    
+    def distance(from, to)
+      distance_function(from.allele, to.allele)
+    end
+    
+    def get_name(num)
+      @builder.get_name(num)
+    end
     
     def setup
       # Override me!
@@ -54,15 +78,12 @@ module JGAP
       end
     end
     
-    def distance(from, to)
-      # Override me!
-    end
-    
     ## MACROS
     
     def self.population_size(size)
       define_method(:population_size) do
         @population_size = size
+        set_population_size(@population_size)
         @config.set_population_size(@population_size)
       end
     end
@@ -77,10 +98,8 @@ module JGAP
         @chromosome
       end
     end
+
     
-    def self.fitness_function(&block)
-      define_method(:evaluate, &block)
-    end
   end
   
 end

data/ruby-jgap.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "ruby-jgap"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.platform      = "java"
   spec.authors       = ["William Chen"]
   spec.email         = ["wchen298@gmail.com"]

data/salesman_test.rb

@@ -1,36 +1,29 @@
 require 'ruby-jgap'
 
-$table = [
-  [0, 0],
-  [-1, 1],
-  [-7, -1],
-  [-8, -2],
-  [2, -1],
-  [10, 2],
-  [7, -1]
-]
+$table = {
+  A: [0, 0],
+  B: [1, 1],
+  C: [2, 2],
+  D: [3, 3],
+  E: [4, 4],
+  F: [5, 5],
+  G: [6, 6],
+  H: [7, 7],
+  I: [8, 8]
+}
 
 class TSP < JGAP::Salesman
   
-  population_size 100000
+  population_size 1000
 
   # define our solution chromosome
   chromosome do
-    salesman :paris, 7
-    salesman :london, 7
-    salesman :new_york, 7
-    salesman :boston, 7
-    salesman :berlin, 7
-    salesman :tokyo, 7
-    salesman :shanghai, 7
+    salesman [:A, :B, :C, :D, :E, :F, :G, :H, :I]
   end
   
-  def distance(from, to)
-    f = from.allele
-    t = to.allele
-    x1, y1 = $table[f]
-    x2, y2 = $table[t]
-    
+  def distance_function(from, to)
+    x1, y1 = $table[get_name from]
+    x2, y2 = $table[get_name to]
     Math.sqrt((x1 - x2)**2 + (y1-y2)**2)
   end
   

data/test.rb

@@ -26,9 +26,7 @@ class MakeChangeProblem < JGAP::Problem
     value = 25*q + 10*d + 5*n + p
     delta = (target - value).abs # how far are we from our goal?
     
-    fitness = (99 - delta)
-    fitness += 100 - (10*coins) if value == target # reward if matches with goal
-    return fitness
+    minimize(coins + 2*delta)
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jgap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: java
 authors:
 - William Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: