ruby-jgap 0.0.1-java → 0.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db26a50b8deeb21c693163a8fab9578fb2c37990
-  data.tar.gz: 552e7b2836d796b8d8baca0f7dbfb949ea6d77ec
+  metadata.gz: da1f5d18e0a46faaca1b2436d0c25b5017d15f2b
+  data.tar.gz: 7689a9b162d30599dcae4f29fda432135b3d1261
 SHA512:
-  metadata.gz: f423e8b532b9bc6612129c9922ab6e020fc50b9e1892d75c17eda072d41c6d1eb25231f638546f291f8dc07f3e38896cc84453925b773211abc2b2a69fbd149d
-  data.tar.gz: 2a86fe2c6293ea8167313676ccc3cdeba541675bcb4e3145cdc94969159a6975a3a4ec2abe4dcd2232c036bccf2d2ab13797acc569bdeba5c1af3dc43cb3d4f8
+  metadata.gz: 6d715b18d2df55f9415f7dc2bfbc93e52dc9012e579c403b2ed7db67b1341b3072236eece58ad960ebc8be509ff47987797bbdcb61dbac4e268241d93e29e259
+  data.tar.gz: e2059b74fd96d9584d239b8d9ac410e43e74f69ca915bcaf794d5b23565152277a38b58a519ea70271ba78af6d6a7f15e1aa99678c3a4a9da7c8fe376505fa92

data/README.md

@@ -10,16 +10,18 @@ JGAP is licensed under the GNU Lesser Public license; if you would like to use t
 
     gem install ruby-jgap
 
+or
+
+    jruby -S gem install ruby-jgap
+
 ### Usage
 
 ```ruby
-
 require 'java'
 require 'ruby-jgap'
 
 # subclass JGAP::Problem
 class MakeChangeProblem < JGAP::Problem
-
   population_size 500
 
   # define our solution chromosome
@@ -46,12 +48,21 @@ class MakeChangeProblem < JGAP::Problem
     fitness += 100 - (10*coins) if value == target # reward if matches with goal
     return fitness
   end
-
-
 end
 
 problem = MakeChangeProblem.new
 problem.run(100) # 100 generations
 problem.print_best
 
-```
+```
+
+This outputs (probably):
+
+```
+quarters: 1
+dimes: 2
+nickels: 0
+pennies: 2
+```
+
+Adapted from the [Getting Started](http://jgap.sourceforge.net/doc/tutorial.html) page on JGAP's site.

data/lib/JGAP/problem.rb

@@ -1,8 +1,4 @@
-require 'java'
-require 'java/jgap.jar'
-
 java_import %w(
-  org.jgap.FitnessFunction
   org.jgap.impl.DefaultConfiguration
   org.jgap.impl.IntegerGene
   org.jgap.impl.BooleanGene
@@ -34,9 +30,16 @@ 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
-      if opts
+      unless opts.empty?
         @genes << IntegerGene.new(@config, opts[:min], opts[:max])
       else
         @genes << IntegerGene.new(@config)
@@ -45,7 +48,7 @@ module JGAP
     
     def decimal(name, opts={})
       @names[name] = @genes.length
-      if opts
+      unless opts.empty?
         @genes << DoubleGene.new(@config, opts[:min], opts[:max])
       else
         @genes << DoubleGene.new(@config)
@@ -59,7 +62,7 @@ module JGAP
     
     def string(name, opts={})
       @names[name] = @genes.length
-      if opts && opts[:alphabet]
+      if !opts.empty? && opts[:alphabet]
         @genes << StringGene.new(@config,
           opts[:min], opts[:max], opts[:alphabet])
       elsif opts
@@ -74,17 +77,20 @@ module JGAP
   
   ####
   
-  class Problem < FitnessFunction
+  class Problem < org.jgap.FitnessFunction
     
     attr_reader :best_solution
     
     def initialize
       @config = DefaultConfiguration.new
       @chromosome = nil
-      @population_size = 0
+      @population_size = 512
       @population = nil
       @best_solution = nil
       @builder = ChromosomeBuilder.new(@config)
+      
+      chromosome
+      population_size
     end
   
     
@@ -93,11 +99,8 @@ module JGAP
     end
     
     def run(cycles=1)
-      chromosome
-      population_size
       @config.set_fitness_function(self)
       @config.set_sample_chromosome(@chromosome)
-      @config.set_population_size(@population_size)
       @population = Genotype.random_initial_genotype(@config)
       @population.evolve(cycles)
       @best_solution = @population.get_fittest_chromosome
@@ -122,6 +125,7 @@ module JGAP
     def self.population_size(size)
       define_method(:population_size) do
         @population_size = size
+        @config.set_population_size(@population_size)
       end
     end
     
@@ -137,4 +141,5 @@ module JGAP
     end
     
   end
+  
 end

data/lib/JGAP/salesman.rb

@@ -0,0 +1,86 @@
+java_import %w(
+  org.jgap.impl.DefaultConfiguration
+  org.jgap.impl.IntegerGene
+  org.jgap.impl.BooleanGene
+  org.jgap.impl.MapGene
+  org.jgap.impl.StringGene
+  org.jgap.impl.DoubleGene
+  org.jgap.Chromosome
+  org.jgap.Genotype
+  org.jgap.Configuration
+)
+
+module JGAP
+  
+  class Salesman < org.jgap.impl.salesman.Salesman
+    attr_reader :best_solution
+    
+    def initialize
+      super
+      @config = create_configuration(nil)
+      @chromosome = nil
+      @population_size = 512
+      @builder = ChromosomeBuilder.new(@config)
+      @best_solution = nil
+      chromosome
+      population_size
+    end
+  
+    
+    def setup
+      # Override me!
+    end
+    
+    def best_solution
+      @best_solution
+    end
+    
+    def run
+      Configuration.reset
+      @best_solution = find_optimal_path(nil)
+    end
+    
+    def read(subject, name)
+      @builder.read(subject, name)
+    end
+    
+    def read_best(name)
+      read(best_solution, name)
+    end
+    
+    def print_best
+      @builder.names.each do |k, v|
+        puts "#{k}: #{read_best k}"
+      end
+    end
+    
+    def distance(from, to)
+      # Override me!
+    end
+    
+    ## MACROS
+    
+    def self.population_size(size)
+      define_method(:population_size) do
+        @population_size = size
+        @config.set_population_size(@population_size)
+      end
+    end
+    
+    def self.chromosome(&block)
+      define_method(:chromosome) do
+        @builder.instance_eval(&block)
+        @chromosome = @builder.chromosome
+      end
+      
+      define_method(:createSampleChromosome) do |init_data|
+        @chromosome
+      end
+    end
+    
+    def self.fitness_function(&block)
+      define_method(:evaluate, &block)
+    end
+  end
+  
+end

data/lib/ruby-jgap.rb

@@ -3,5 +3,5 @@ module JGAP
   require 'java'
   require 'java/jgap.jar'
   require_relative 'JGAP/problem'
-  
+  require_relative 'JGAP/salesman'
 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.1"
+  spec.version       = "0.0.2"
   spec.platform      = "java"
   spec.authors       = ["William Chen"]
   spec.email         = ["wchen298@gmail.com"]

data/salesman_test.rb

@@ -0,0 +1,42 @@
+require 'ruby-jgap'
+
+$table = [
+  [0, 0],
+  [-1, 1],
+  [-7, -1],
+  [-8, -2],
+  [2, -1],
+  [10, 2],
+  [7, -1]
+]
+
+class TSP < JGAP::Salesman
+  
+  population_size 100000
+
+  # 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
+  end
+  
+  def distance(from, to)
+    f = from.allele
+    t = to.allele
+    x1, y1 = $table[f]
+    x2, y2 = $table[t]
+    
+    Math.sqrt((x1 - x2)**2 + (y1-y2)**2)
+  end
+  
+end
+
+tsp = TSP.new
+tsp.run
+tsp.print_best
+p tsp.best_solution.fitness_value

data/test.rb

@@ -9,9 +9,9 @@ class MakeChangeProblem < JGAP::Problem
   # define our solution chromosome
   chromosome do
     integer :quarters, min: 0, max: 3
-    integer :dimes, min: 0, max: 2
-    integer :nickels, min: 0, max: 1
-    integer :pennies, min: 0, max: 4
+    integer :dimes,    min: 0, max: 2
+    integer :nickels,  min: 0, max: 1
+    integer :pennies,  min: 0, max: 4
   end
 
   # define our fitness function
@@ -36,4 +36,4 @@ end
 
 problem = MakeChangeProblem.new
 problem.run(100) # 100 generations
-problem.print_best
+problem.print_best

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jgap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: java
 authors:
 - William Chen
@@ -22,9 +22,11 @@ files:
 - README.md
 - lib/.DS_Store
 - lib/JGAP/problem.rb
+- lib/JGAP/salesman.rb
 - lib/java/jgap.jar
 - lib/ruby-jgap.rb
 - ruby-jgap.gemspec
+- salesman_test.rb
 - test.rb
 homepage: 
 licenses: