rubylabs 0.8.3 → 0.9.0

data/lib/tsplab.rb

@@ -476,29 +476,44 @@ module TSPLab
     return factorial(n-1) / 2
   end
   
+# Exhaustive search
+
+  def xsearch(m)
+    best = m.make_tour
+    m.each_tour { |t| best = t if t.cost < best.cost }
+    return best
+  end
+  
 # Random search
   
-  def rsearch( matrix, nsamples )
+
+  def rsearch( matrix, nsamples, userOptions = {} )
+    options = @@rsearchOptions.merge(userOptions)
+    
     Tour.reset
+    
     best = matrix.make_tour(:random)
     if @@drawing
       make_histogram([])      # clear histogram display
       view_tour(best) 
-      init_labels(["tours:", "cost:"])
+      init_labels(["#tours:", "cost:"])
     end
+    
     (nsamples-1).times do |i|
       t = matrix.make_tour(:random)
-      update = t.cost < best.cost
-      best = t if update
+      if t.cost < best.cost
+        best = t
+        if @@drawing
+          view_tour(t)
+          @@drawing.labels[1].update(sprintf( "cost: %.2f", best.cost ))
+        end
+      end
       if @@drawing
-        view_tour(t) if update
-        labels = []
-        labels << sprintf( "#tours: %d", Tour.count )
-        labels << sprintf( "cost: %.2f", best.cost )
-        update_labels( labels )
+        @@drawing.labels[0].update(sprintf( "#tours: %d", Tour.count ))
       end
+      sleep options[:pause]
     end
-    Canvas.sync
+    
     return best
   end
 
@@ -518,7 +533,6 @@ module TSPLab
     
     if @@drawing
       make_histogram(a) 
-      Canvas.sync
     end
     
     return a
@@ -548,7 +562,6 @@ module TSPLab
     
     if @@drawing && toplevel
       show_survivors( population ) 
-      Canvas.sync
     end
     
     return population
@@ -564,7 +577,7 @@ module TSPLab
 
 # :begin :rebuild_population
   def rebuild_population( population, popsize, userOptions = {} )
-    options = @@tourOptions.merge(userOptions)
+    options = @@esearchOptions.merge(userOptions)
     tracing = (options[:trace] == :on)
     
     map = population[0].matrix      # assume they're all from the same map...
@@ -600,7 +613,6 @@ module TSPLab
     
     if @@drawing
       update_histogram(population) 
-      Canvas.sync
     end
 
     return population
@@ -622,9 +634,8 @@ module TSPLab
         updated = false
       end
       ngen += 1
-      update_tour_display( population, ngen, updated ) if @@drawing
+      update_tour_display( population, ngen, updated, options[:pause] ) if @@drawing
     end    
-    Canvas.sync if @@drawing
     return best
   end
 # :end :evolve
@@ -639,7 +650,7 @@ module TSPLab
 =end
 
   def esearch( matrix, maxgen, userOptions = {} )
-    options = @@tourOptions.merge(userOptions)
+    options = @@esearchOptions.merge(userOptions)
     
     if options[:continue]
       if @@previousPopulation
@@ -673,19 +684,18 @@ module TSPLab
     @@previousOptions = options
     @@previousNGen = maxgen
     
-    Canvas.sync if @@drawing
-
     return population[0]
   end
   
-  def update_tour_display(population, ngen, draw_tour)    
-    view_tour(population[0]) if draw_tour
+  def update_tour_display(population, ngen, new_tour, dt)
+    if new_tour
+      view_tour(population[0]) 
+      @@drawing.labels[2].update(sprintf( "cost: %.2f", population[0].cost ))
+    end
     update_histogram(population)
-    labels = []
-    labels << sprintf( "generations: %d", ngen )
-    labels << sprintf( "#tours: %d", Tour.count )
-    labels << sprintf( "cost: %.2f", population[0].cost )
-    update_labels(labels)
+    @@drawing.labels[0].update(sprintf( "generations: %d", ngen ))
+    @@drawing.labels[1].update(sprintf( "#tours: %d", Tour.count ))
+    sleep dt
   end
   
 =begin rdoc
@@ -740,11 +750,10 @@ module TSPLab
     r = options[:dotRadius]
     m.labels.each do |loc|
       x, y = m.coords(loc)
-      nodes << Canvas.circle( x, y, r, :fill => options[:dotColor] )
-      Canvas.text(loc.to_s, x+r, y+r)
+      nodes << Canvas::Circle.new( x, y, r, :fill => options[:dotColor] )
+      Canvas::Text.new(loc.to_s, x+r, y+r)
     end
     @@drawing = MapView.new(m, nodes, links, [], [], options)
-    Canvas.sync
     return true    
   end
   
@@ -753,45 +762,47 @@ module TSPLab
       puts "call view_map to initialize the canvas"
       return nil
     end
-    options = @@tourOptions.merge(userOptions)
+    options = @@esearchOptions.merge(userOptions)
     map = @@drawing.cities
-    @@drawing.links.each { |x| x.delete }
+    # @@drawing.links.each { |x| x.erase }
+    Canvas::Line.erase_all(:path)
     @@drawing.links.clear
     x0, y0 = map.coords(t.path[-1])
     for i in 0...t.path.length
       x1, y1 = map.coords(t.path[i])
-      @@drawing.links << Canvas.line(x0, y0, x1, y1)
+      @@drawing.links << Canvas::Line.new(x0, y0, x1, y1, :tags => :path)
       x0, y0 = x1, y1
     end
     @@drawing.nodes.each { |x| x.raise }
-    Canvas.sync
     return true
   end
   
+=begin rdoc
+  Initialize a set of text label objects.  Erase any old labels saved
+  for this drawing, replace them with new ones.
+=end
+  
   def init_labels(a)
     labelx = 525
     labely = 350
     dy = 20
-    labels = @@drawing.labels
-    if labels.length > 0
-      labels.each { |x| x.text = "" }
+    @@drawing.labels.each do |x|
+      x.erase
     end
-    labels.clear
+    @@drawing.labels.clear
     for i in 0...a.length
-      if i == labels.length
-        labels << Canvas.text("", labelx, labely)
-        labely += dy
-      end
-      labels[i].text = a[i]
+      @@drawing.labels << Canvas::Text.new(a[i], labelx, labely)
+      labely += dy
     end
+    return @@drawing.labels
   end
   
-  def update_labels(a)
-    labels = @@drawing.labels
-    for i in 0...labels.length
-      labels[i].text = a[i]
-    end
-  end
+  # def update_labels(a)
+  #   labels = @@drawing.labels
+  #   for i in 0...labels.length
+  #     labels[i].update(a[i])
+  #   end
+  # end
   
   # todo! color bin red if new tour comes from crossover? but what if > 1 tour per bin?
   
@@ -799,7 +810,7 @@ module TSPLab
   
   def make_histogram(pop)
     if @@drawing.histogram.length > 0
-      @@drawing.histogram.each { |box| box.delete }
+      @@drawing.histogram.each { |box| box.erase }
       @@drawing.histogram.clear
     end
     return if pop.length == 0
@@ -813,7 +824,7 @@ module TSPLab
     (0..pop.length-1).step(npb) do |i|
       h = pop[i..(i+npb-1)].inject(0.0) { |sum, tour| sum + tour.cost }
       h = (h/npb)*scale
-      @@drawing.histogram << Canvas.rectangle(x, y+ymax-h, x+w, y+ymax, :fill => 'darkblue' )
+      @@drawing.histogram << Canvas::Rectangle.new(x, y+ymax-h, x+w, y+ymax, :fill => 'darkblue' )
       x += w
     end
     @@drawing.options[:scale] = scale
@@ -849,30 +860,41 @@ module TSPLab
     end
     @@recolor = true
   end
-  
-  def show_lineage(tour, userOptions = {} )
-    options = @@lineageOptions.merge(userOptions)
-    dt = options[:dt]
-    a = []
-    while tour.parent
-      a << tour
-      tour = tour.parent
-    end
-    init_labels(["id:", "cost:", "op:"]) if @@drawing
-    a.reverse.each do |x|
-      puts x.inspect + ": " + x.op.inspect
-      if @@drawing
-        view_tour(x)
-        labels = []
-        labels << sprintf( "id: %d", x.id )
-        labels << sprintf( "cost: %.2f", x.cost )
-        labels << sprintf( "op: %s", x.op.inspect )
-        update_labels(labels)
-        sleep(dt)
-      end
-    end
-    return true
-  end
+
+# Outdated attempt to show sequence of ancestors -- if revived, needs to
+# be updated for new Tk interface
+ 
+  # def show_lineage(tour, userOptions = {} )
+  #   options = @@lineageOptions.merge(userOptions)
+  #   dt = options[:dt]
+  #   a = []
+  #   while tour.parent
+  #     a << tour
+  #     tour = tour.parent
+  #   end
+  #   init_labels(["id:", "cost:", "op:"]) if @@drawing
+  #   a.reverse.each do |x|
+  #     puts x.inspect + ": " + x.op.inspect
+  #     if @@drawing
+  #       view_tour(x)
+  #       labels = []
+  #       labels << sprintf( "id: %d", x.id )
+  #       labels << sprintf( "cost: %.2f", x.cost )
+  #       labels << sprintf( "op: %s", x.op.inspect )
+  #       update_labels(labels)
+  #       sleep(dt)
+  #     end
+  #   end
+  #   return true
+  # end
+  
+  # def test_setup
+  #   m = Map.new(15)
+  #   view_map(m)
+  #   t = m.make_tour(:random)
+  #   view_tour(t)
+  #   return [m, t]
+  # end
     
   # Values accessible to all the methods in the module
   
@@ -883,11 +905,11 @@ module TSPLab
     :dotRadius => 5.0,
   }
   
-  # @@rsearchOptions = {
-  #   :pause => 0.0,
-  # }
+  @@rsearchOptions = {
+    :pause => 0.01,
+  }
 
-  @@tourOptions = {
+  @@esearchOptions = {
     :popsize => 10,
     :maxgen => 25,
     :profiles => {
@@ -898,7 +920,7 @@ module TSPLab
       :all_cross => [0.0, 0.0, 1.0],
     }, 
     :distribution => :all_small,
-    :pause => 0.0,
+    :pause => 0.02,
   }
   
   @@histogramOptions = {

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubylabs
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 3
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors: 
 - conery
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -07:00
+date: 2010-12-19 00:00:00 -08:00
 default_executable: lab-setup.rb
 dependencies: []
 
@@ -82,19 +76,6 @@ files:
 - lib/sievelab.rb
 - lib/spherelab.rb
 - lib/tsplab.rb
-- test/bit_test.rb
-- test/eliza_test.rb
-- test/encryption_test.rb
-- test/hash_test.rb
-- test/iteration_test.rb
-- test/mars_test.rb
-- test/random_test.rb
-- test/recursion_test.rb
-- test/rubylabs_test.rb
-- test/sieve_test.rb
-- test/sphere_test.rb
-- test/test_helper.rb
-- test/tsp_test.rb
 has_rdoc: true
 homepage: http://github.com/conery/rubylabs
 licenses: []
@@ -105,27 +86,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: rubylabs
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Software and data for lab projects for Explorations in Computing.