rubylabs 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/data/tsp/pac10.txt

@@ -1,55 +1,68 @@
-% Driving distances (in minutes) between Pac-10 stadiums
-
-Seattle Pullman 320
-Seattle Corvallis 317
-Seattle Eugene 338
-Seattle Berkeley 863
-Seattle Stanford 914
-Seattle Pasadena 1190
-Seattle Los_Angeles 1190
-Seattle Tempe 1620
-Seattle Tucson 1800
-
-Pullman Corvallis 470
-Pullman Eugene 492
-Pullman Berkeley 1070
-Pullman Stanford 1123
-Pullman Pasadena 1437
-Pullman Los_Angeles 1437
-Pullman Tempe 1560
-Pullman Tucson 1680
-
-Corvallis Eugene 55
-Corvallis Berkeley 572
-Corvallis Stanford 624
-Corvallis Pasadena 898
-Corvallis Los_Angeles 899
-Corvallis Tempe 1268
-Corvallis Tucson 1379
-
-Eugene Berkeley 526
-Eugene Stanford 578
-Eugene Pasadena 852
-Eugene Los_Angeles 852
-Eugene Tempe 1222
-Eugene Tucson 1332
-
-Berkeley Stanford 58
-Berkeley Pasadena 369
-Berkeley Los_Angeles 371
-Berkeley Tempe 740
-Berkeley Tucson 857
-
-Stanford Pasadena 370
-Stanford Los_Angeles 371
-Stanford Tempe 740
-Stanford Tucson 858
-
-Pasadena Los_Angeles 16
-Pasadena Tempe 373
-Pasadena Tucson 483
-
-Los_Angeles Tempe 375
-Los_Angeles Tucson 486
-
-Tempe Tucson 122
+:map Pac-10 conference
+
+ 91  92 uw
+145 113 wsu
+ 61 148 osu
+ 84 161 uo
+ 78 256 ucb
+ 60 278 lsju
+116 310 ucla
+100 328 usc
+193 337 asu
+197 369 ua
+
+:matrix driving distances (in minutes) between stadiums
+
+uw wsu 320
+uw osu 317
+uw uo 338
+uw ucb 863
+uw lsju 914
+uw ucla 1190
+uw usc 1190
+uw asu 1620
+uw ua 1800
+
+wsu osu 470
+wsu uo 492
+wsu ucb 1070
+wsu lsju 1123
+wsu ucla 1437
+wsu usc 1437
+wsu asu 1560
+wsu ua 1680
+
+osu uo 55
+osu ucb 572
+osu lsju 624
+osu ucla 898
+osu usc 899
+osu asu 1268
+osu ua 1379
+
+uo ucb 526
+uo lsju 578
+uo ucla 852
+uo usc 852
+uo asu 1222
+uo ua 1332
+
+ucb lsju 58
+ucb ucla 369
+ucb usc 371
+ucb asu 740
+ucb ua 857
+
+lsju ucla 370
+lsju usc 371
+lsju asu 740
+lsju ua 858
+
+ucla usc 16
+ucla asu 373
+ucla ua 483
+
+usc asu 375
+usc ua 486
+
+asu ua 122

data/data/tsp/test.txt

@@ -1,2 +1,9 @@
-% [[443, 493], [496, 981], [539, 666], [617, 337], [698, 224], [750, 450], [850, 850], [987, 237]]
-% a.each { |p| Canvas.circle(p[0]/3, p[1]/3, 3, :fill => 'darkblue') }
+:map eight random points
+443 493
+496 981
+539 666
+617 337
+698 224
+750 450
+850 850
+987 237

data/lib/rubylabs.rb

@@ -528,6 +528,10 @@ Similar to TestArray, but draws random words from a file.
       @@tkroot
     end
     
+    def Canvas.create(*args)
+      @@canvas.send(:create, *args)
+    end
+    
     # Idea for the future, abandoned for now: allow applications to define a coordinate
     # system, e.g. cartesian with the origin in the middle of the canvas, and map coords
     # pass to line, rectangle, etc from user-specified coordinates to Tk coordinates.

data/lib/spherelab.rb

@@ -31,6 +31,7 @@ module SphereLab
     :mxmin => 100,
     :mymin => 50,
     :hmax => 100,
+    :dash => 1,
   }
   
   @@robotOptions = {
@@ -427,23 +428,27 @@ module SphereLab
     res = Vector.new(-r * cos)
   end
 
-  def random_bodies(n, big = 1)
+  def random_bodies(n, big)
+    big = 1 if big.nil?
     res = []
     mm = 1e12          # average mass
     mr = 150          # average distance from origin
-    # write_tuple( :scale, [ 1.0 ] )
     big.times do |i|
-      r0, v0 = random_vectors(mr/2, i, big)
-      res << Body.new(mm*100/big, r0, v0)
-      # write_tuple( :view, [i, 10, "#0080ff"] )
+      r, v = random_vectors(mr/2, i, big)
+      b = Body.new(mm*100/big, r, v)
+      b.name = "b#{i}"
+      b.color = '#0080ff'
+      b.size = 10
+      res << b
     end
     (n-big).times do |i|
       r, v = random_vectors(mr, i, n-big)
       b = Body.new(mm, r, v)
-      # write_tuple( :view, [i+big, 5, "#0080ff"] )
+      b.name = "b#{i+big}"
+      b.color = '#0080ff'
+      b.size = 5
       res << b
     end
-    res.each_with_index { |b,i| b.name = "b#{i}"; b.color = '#0080ff'; b.size = 5 }
     return res
   end
   
@@ -458,8 +463,8 @@ module SphereLab
 		begin
 		  raise "usage: make_system(id)" unless args.length > 0
 		  if args[0] == :random
-		    raise "usage:  make_system(:random, n)" unless args.length == 2 && args[1].class == Fixnum
-		    return random_bodies(args[1])
+		    raise "usage:  make_system(:random, n, m)" unless args.length >= 2 && args[1].class == Fixnum
+		    return random_bodies(args[1], args[2])
 	    end
 	    filename = args[0]
   	  if filename.class == Symbol
@@ -608,7 +613,6 @@ module SphereLab
   
   def view_melon(blist, userOptions = {})
     options = @@droppingOptions.merge(userOptions)
-    options[:dash] = 1
     options[:dashcount] = 0
     options[:pendown] = :track
     edge = options[:canvasSize]
@@ -636,8 +640,8 @@ module SphereLab
   def position_melon(blist, height)
     melon = blist[0]
     if @@drawing
-      if height > @@drawing.options[:hmax]
-        puts "max height: #{@@drawing.options[:hmax]}"
+      if height < 0 || height > @@drawing.options[:hmax]
+        puts "Height must be between 0 and #{@@drawing.options[:hmax]} meters"
         return false
       end
       melon.prevy = @@drawing.ground
@@ -652,6 +656,11 @@ module SphereLab
       melon.position.y += height
     end
     melon.velocity.y = 0.0
+    class <<melon
+      def height
+        return position.y - prevy
+      end
+    end
     return height
   end
   
@@ -662,10 +671,12 @@ module SphereLab
     return "splat" if melon.prevy.nil? || my < melon.prevy
     step_system(blist, dt)
     if @@drawing
-      @@drawing.options[:dashcount] = (@@drawing.options[:dashcount] + 1) % @@drawing.options[:dash]
-      if @@drawing.options[:dashcount] == 0
-        @@drawing.options[:pendown] = @@drawing.options[:pendown].nil? ? :track : nil
-      end        
+      if @@drawing.options[:dash] > 0
+        @@drawing.options[:dashcount] = (@@drawing.options[:dashcount] + 1) % @@drawing.options[:dash]
+        if @@drawing.options[:dashcount] == 0
+          @@drawing.options[:pendown] = @@drawing.options[:pendown].nil? ? :track : nil
+        end
+      end     
       dx = (melon.position.x - mx) * @@drawing.scale
       dy = (my - melon.position.y) * @@drawing.scale
       Canvas.move(melon.graphic, dx, dy, @@drawing.options[:pendown])

data/lib/tsplab.rb

@@ -10,6 +10,17 @@
   TODO test: selection only, no mutations
   TODO test: random draws only, no selection
   TODO plot space: get all 180K costs, order lexicographically, plot (smoothed)
+  
+  TODO hide mutate, cross methods -- but accept optional params in call to reproduce constructor so students can control effects to see how method works
+  TODO (idea is that genes are fixed when critter made, don't change after that)
+=end
+
+=begin
+  TODO clean up interface
+  todo two constructors (mutate, cross) instead of one
+  todo distances are floats, not ints
+  todo wider histogram, up to 100 bins 3 pixels wide
+  todo line color = blue if bin width 4 or less
 =end
 
 module RubyLabs
@@ -17,6 +28,8 @@ module RubyLabs
 module TSPLab
 
   require 'set'
+  
+  MapView = Struct.new(:cities, :nodes, :links, :histogram, :options)
 
 =begin rdoc
 
@@ -35,25 +48,21 @@ minutes.
 #   values() returns an array of city names
 #   [x] returns the name of the city with key x
 #   distance(x,y) returns the distance between cities with keys x and y
-
+#   coords(x) returns x, y coordinates of city
 
   class CityList
+    
+    attr_reader :cities, :matrix
   
-=begin rdoc
-The lines in the input file passed to the constructor come from a
-program that uses Google Maps to look up dirving times, so there are
-3 distance fields: days, hours, minutes.  The input record format is
-city 1, city 2, days, hours, minutes, all separated by tabs.  Each
-city is assigned a one-letter key.  
-=end
-
-    def initialize(matrix)
-      if matrix.class == String || matrix.class == Symbol
-        read_file(matrix)
-      elsif matrix.class == Array
-        make_map(matrix)
+    def initialize(arg)
+      if arg.class == String || arg.class == Symbol
+        read_file(arg)
+      elsif arg.class == Array
+        make_map(arg)
+      elsif arg.class == Fixnum
+        make_random_map(arg)
       else
-        raise "CityList: parameter must be a file name or array of points"
+        raise "CityList: parameter must be a file name, array of points, or an integer"
       end
     end
 
@@ -70,6 +79,20 @@ city is assigned a one-letter key.
       end
       return true
     end
+    
+    def print_matrix
+      # colarray = 
+      puts "      " + (?B..(@key-1)).map { |x| x.chr }.join("   ") 
+      (?A..(@key-2)).each_with_index do |i, n|
+        s = sprintf "%2s: ", i.chr
+        s += "    " * n
+        (i+1..@key-1).each do |j|
+          s += sprintf " %3d", @matrix[i][j]
+        end
+        puts s
+      end
+      return true      
+    end
   
     def size()
       return @key - ?A
@@ -96,6 +119,10 @@ city is assigned a one-letter key.
       return nil unless y >= ?A && y < @key
       return @matrix[x][y]
     end
+    
+    def coords(name)
+      return @coords[name]
+    end
 
   # private methods -- return the key for a city (make a new one if necessary),
   # get a time value from an input line, save a distance
@@ -110,23 +137,32 @@ city is assigned a one-letter key.
       @key = ?A
       @cities = Hash.new          # initially a map from name string to one-letter key
       @matrix = Hash.new
-
+      @coords = Hash.new
+      readingLocations = true
+      
       File.open(matrixfilename).each do |line|
-        next if line.chomp.length == 0
-        next if line[0] == ?%
+        line.chomp!
+        next if line.length == 0
         rec = line.split
-        i = getKey(rec[0])
-        j = getKey(rec[1])
-        dist = rec[2].to_i
-        assign(i,j,dist)
-        assign(j,i,dist)
+        if rec[0][0] == ?:
+          readingLocations = false if rec[0] == ":matrix"
+          # tbd -- deal with other directives
+        elsif readingLocations
+          @coords[getKey(rec[2]).chr] = [rec[0].to_i, rec[1].to_i]
+        else
+          i = getKey(rec[0])
+          j = getKey(rec[1])
+          dist = rec[2].to_i
+          assign(i,j,dist)
+          assign(j,i,dist)
+        end
       end
-
-      @cities = @cities.invert    # from now on a map from key to name string
+      
+      @cities = @cities.invert    # from now on @cities is a map from key to name string
 
       errs = 0
-      (?A..@key-1).each do |i|
-        (i+1..@key-1).each do |j|
+      (?A...@key).each do |i|
+        (i+1...@key).each do |j|
           unless @matrix[i][j] && @matrix[j][i]
             errs += 1
             puts "CityList.new: missing distance between #{@cities[i]} and #{@cities[j]}"
@@ -137,14 +173,38 @@ city is assigned a one-letter key.
     end
     
     def make_map(a)
-      @key = ?A + a.length - 1
+      @key = ?A + a.length
       @cities = Hash.new
       @matrix = Hash.new
+      @coords = Hash.new
       for i in 0...a.length
-        for j in i...a.length
+        chi = ?A + i
+        @cities[chi] = chi.chr
+        for j in (i+1)...a.length
+          x = a[i][0] - a[j][0]
+          y = a[i][1] - a[j][1]
+          d = Math.sqrt(x**2 + y**2).round
+          chj = ?A + j
+          assign(chi,chj,d)
+          assign(chj,chi,d)
         end
+        @coords[chi.chr] = a[i]
       end
     end
+    
+    def make_random_map(n)
+      h = Hash.new
+      a = Array.new      
+  		while h.size < n
+  			h[rand(400)] = 1		
+  		end
+  		h.keys.each do |k|
+  		  x = k / 20
+  		  y = k % 20
+  		  a << [x*20 + rand(5) + 50, y*20 + rand(5) + 50]
+  		end    
+      make_map(a)
+    end
 
     def getKey(s)
       if @cities[s] == nil
@@ -218,6 +278,7 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
   		if y.nil? || y == :trace
         i = rand(x.path.length)
         j = (i+1) % x.path.length
+        # j = rand(x.path.length)
     	  trace = :trace if y == :trace       # handle calls like reproduce(x, :trace)
   			x.clone.mutate(i, j, trace)
   		else
@@ -389,6 +450,11 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
       puts "maxstatic: #{maxstatic}"
       puts "pcross: #{param[:pcross]}"
     end
+    
+    if @@drawing
+      view_tour(best)
+      make_histogram(p)
+    end
 
     while ngen < maxgen && nstatic < maxstatic
       puts "best tour: #{p[0]}" if param[:verbose]
@@ -396,9 +462,11 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
       if p[0].cost < best.cost
         best = p[0]
         nstatic = 0
+        view_tour(best) if @@drawing
       else
         nstatic += 1
       end
+      update_histogram(p) if @@drawing
       ngen += 1
     end
 
@@ -441,10 +509,87 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
     puts "Copy of #{matrix} saved in #{outfilename}"
   end
   
+=begin rdoc
+  Methods for displaying a map and a tour
+=end
+
+  def view_map(m, userOptions = {} )
+    options = @@mapOptions.merge(userOptions)
+    Canvas.init(700, 500, "TSPLab")
+    links = Array.new
+    nodes = Array.new
+    m.keys.each do |loc|
+      x, y = m.coords(loc)
+      nodes << Canvas.circle( x, y, options[:dotRadius], :fill => options[:dotColor] )
+    end
+    @@drawing = MapView.new(m, nodes, links, Array.new, options)
+    Canvas.sync
+    return true    
+  end
+  
+  def view_tour(t, userOptions = {} )
+    map = @@drawing.cities
+    @@drawing.links.each { |x| x.delete }
+    @@drawing.links.clear
+    x0, y0 = map.coords(t.path[-1].chr)
+    for i in 0...t.path.length
+      x1, y1 = map.coords(t.path[i].chr)
+      @@drawing.links << Canvas.line(x0, y0, x1, y1)
+      x0, y0 = x1, y1
+    end
+    @@drawing.nodes.each { |x| x.raise }
+    sleep 0.1
+  end
+  
+  # todo -- get drawing params from options
+  # todo -- make_histogram and update_histogram are private
+  # todo -- check to see if new histogram has same number of bins as old one -- throw some out or make some new ones
+  # todo -- scale w to fit number of tours, min size = 1
+  # todo -- max bins 100 -- if pop size over that just show first 100 tours
+  # todo! color bin red if new tour comes from crossover
+  
+  def make_histogram(pop)
+    if @@drawing.histogram.length > 0
+      update_histogram(pop)
+    else
+      x = 520
+      y = 100
+      ymax = 200.0
+      w = 5
+      scale = ymax / pop[-1].cost
+      pop[0..29].each do |t|
+        h = t.cost*scale
+        @@drawing.histogram << Canvas.rectangle(x, y+ymax-h, x+w, y+ymax, :fill => 'darkblue' )
+        x += w
+      end
+      @@drawing.options[:scale] = scale
+    end
+  end
+  
+  def update_histogram(pop)
+    y = 100
+    ymax = 200.0
+    scale = @@drawing.options[:scale]
+    @@drawing.histogram.each_with_index do |box, i|
+      h = pop[i].cost * scale
+      x0, y0, x1, y1 = box.coords
+      box.coords = x0, y+ymax-h, x1, y1
+    end
+  end
+  
   # Values accessible to all the methods in the module
   
   @@dataDirectory = File.join(File.dirname(__FILE__), '..', 'data', 'tsp')
 
+  @@mapOptions = {
+    :dotColor => '#cccccc',
+    :dotRadius => 5.0,
+  }
+  
+  @@tourOptions = {
+    
+  }
+
 end # module TSPLab
 
 end # module RubyLabs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubylabs
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - conery
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2010-02-26 00:00:00 -08:00
 default_executable: 
 dependencies: []