rubylabs 0.9.5 → 0.9.6

data/Rakefile

@@ -18,7 +18,7 @@ begin
     gem.has_rdoc = true
   end
 
-  Jeweler::RubyforgeTasks.new  
+#  Jeweler::RubyforgeTasks.new  
   Jeweler::GemcutterTasks.new
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/data/huffman/hafreq.txt

@@ -6,11 +6,11 @@ A  0.262
 E  0.072
 H  0.045
 I  0.084
-K  0.106
+K  0.105
 L  0.044
 M  0.032
 N  0.083
-O  0.106
+O  0.107
 P  0.030
 U  0.059
 W  0.009

data/lib/iterationlab.rb

@@ -19,6 +19,23 @@ documented here.
 
 module IterationLab
 
+  ArrayView = Struct.new(:array, :rects, :bar, :palette, :history, :options)
+  
+  @@viewOptions = {
+    :array_fill => 'lightblue',
+    :bar_fill => 'darkblue',
+    :canvas_fill => 'white',
+    :mark_color => 'blue',
+    :x0 => 10,                  # left edge of leftmost bar
+    :dx => 10,                  # distance between left edges of adjacent bars
+    :y0 => 50,                  # top edege of tallest bar
+    :y1 => 150,                 # bottom edge of array bars
+    :ymin => 3,                 # minimum height of bar
+    :delay => 0.01,
+  }
+
+  @@drawing = nil
+
 # The RubyLabs implementation of Ruby's <tt>include?</tt> method.
 # Does a linear search of array +a+ to find item +k+, returning
 # +true+ or +false+ depending on whether the item was found.  
@@ -101,17 +118,45 @@ module IterationLab
 # and reinsert it at a location between 0 and +i+ (i.e. move the item
 # to the left in the array).
 #--
+# updated 10/9/2012 for visualization
 # :begin :move_left
   def move_left(a, i)
-    x = a.slice!(i)                 # remove the item at location i
-    j = i-1                         # start scanning from the left of i
-    while j >= 0 && less(x, a[j])
-      j = j-1                       # move left
+    # x = a.slice!(i)                 # remove the item at location i
+    # j = i-1                         # start scanning from the left of i
+    # while j >= 0 && less(x, a[j])
+    #   j = j-1                       # move left
+    # end
+    # a.insert(j+1, x)                # insert x back into a at location j    
+    if @@drawing
+      touch(i) 
+      set_region(i+1)
+      sleep(@@drawing.options[:delay])
+    end
+    while i > 0 && less(a[i], a[i-1])
+      swap(a, i-1, i)
+      i -= 1
     end
-    a.insert(j+1, x)                # insert x back into a at location j    
   end
 # :end :move_left
 
+# Helper method called by +move_left+ to exchange the items at specified
+# locations in an array.
+#--
+# :begin :swap
+  def swap(a, i, j)
+    a[i], a[j] = a[j], a[i]
+    if @@drawing.class == ArrayView
+      dist = (j - i) * @@drawing.options[:dx]
+      ri = @@drawing.rects[i]
+      rj = @@drawing.rects[j]
+      Canvas.move(ri, dist, 0)
+      Canvas.move(rj, -dist, 0)
+      @@drawing.rects[i], @@drawing.rects[j] = @@drawing.rects[j], @@drawing.rects[i]
+      sleep(@@drawing.options[:delay])
+    end
+  end
+# :end :swap
+
 # +less+ is called by +isort+ to compare two items.
 # It is implemented as a helper method in order to allow users to
 # attach a probe to count the number of comparisons.
@@ -153,6 +198,43 @@ module IterationLab
     end
   end
   
+# Visualization
+
+  def view_array(a, userOptions = {})
+    Canvas.init(800, 200, "IterationLab")
+    options = @@viewOptions.merge(userOptions)
+    
+    amax = a.max
+    rects = []
+    a.each_with_index do |val, i| 
+      rx = options[:x0] + i * options[:dx]
+      y = Float(val)
+      dy = options[:y1] - options[:y0] - options[:ymin]     # height of tallest bar
+      ry = options[:y1] - options[:ymin] - (y/amax)*dy      # height of this bar 
+      rects << Canvas::Rectangle.new( rx, ry, rx + options[:dx], options[:y1], :fill => options[:array_fill], :outline => options[:canvas_fill] ) 
+    end
+    bar = Canvas::Rectangle.new( options[:x0], options[:y1] + 10, options[:x0] + a.length*options[:dx], options[:y1]+15, :fill => options[:bar_fill] )
+    
+    @@drawing = ArrayView.new(a, rects, bar, ['#000080','#BADFEB'], [], options)
+    return true
+  end
+  
+  def touch(loc)
+    rect = @@drawing.rects[loc]
+    pmax = @@drawing.palette.length
+    @@drawing.history.pop if @@drawing.history.length >= pmax
+    @@drawing.history.insert(0, rect)
+    @@drawing.history.each_with_index do |r, i|
+      r.fill = @@drawing.palette[i]
+    end   
+  end
+  
+  def set_region(loc)
+    x1, y1, x2, y2 = @@drawing.bar.coords
+    x1 = @@drawing.options[:x0] + loc * @@drawing.options[:dx]
+    @@drawing.bar.coords = [x1, y1, x2, y2]
+  end
+  
 end # IterationLab
 
 end # RubyLabs

data/lib/lifelab.rb

@@ -0,0 +1,181 @@
+module RubyLabs
+
+=begin rdoc
+  
+== LifeLab
+
+Conway's Game of Life.
+#--
+TODO all of it...
+#++
+=end
+  
+module LifeLab
+  
+    # -- Initializations -- These are "global" vars in the outer LifeLab scope that are
+    # accessible to all the classes and modules defined inside LifeLab
+  
+  @@lifeDirectory = File.join(File.dirname(__FILE__), '..', 'data', 'life')
+
+  @@rule = "B3/S23"
+
+  @@params = {
+    :rounds => 1000,
+    :rows => 20,
+    :cols => 20,
+    :pause => 0.01,
+  }
+  
+  LifeView = Struct.new(:rows, :cols, :options)
+
+  @@viewOptions = {
+    :cellSize => 2,
+    :cellRows => 100,
+    :cellCols => 200,
+    :padding => 20,
+    :traceSize => 10,
+    :cellColor => '#DDDDDD',
+  }
+
+  @@drawing = nil
+
+=begin rdoc
+
+== Life
+
+The Life class defines a singleton object that has the methods used to initialize and run
+simulations.
+
+=end
+
+  class Life
+  
+    # Execute one round.
+    
+    def Life.step
+      puts "step"
+      return true
+    end
+  
+    # Print information about the system.
+  
+    def Life.state
+      puts "state"
+      return true
+    end
+  
+  
+  # Set the value of one of the run-time options.  The options, and their default values, are:
+  #  [TBD]
+  #
+  # Example:
+  #   >>!blue Life.set_option(:name, value)
+  #   => value
+  #
+  # Note: Call Life.state to see the current settings for the options.
+
+    def Life.set_option(key, val)
+      case key
+      # the branches of the case statement are places to validate parameter
+      # values -- see examples from MARSLab below
+      when :todo
+        puts "options TBD"
+        return nil
+      # when :memSize
+      #   if val.class != Fixnum || val < 1024 || val > 16536
+      #     puts ":memSize must be an integer between 1024 and 16536"
+      #     return nil
+      #   end
+      # when :maxRounds, :buffer
+      #   if val.class != Fixnum
+      #     puts ":#{key} must be an integer"
+      #     return nil
+      #   end
+      else
+        puts "Unknown option: #{key}"
+        puts "Call Life.state to see a list of options and their current settings."
+        return nil
+      end
+      @@params[key] = val
+    end
+  
+    # Initialize the RubyLabs canvas with a drawing of the Life board.  The
+    # display will show one rectangle for each cell.
+    
+    def Life.view(userOptions = {} )
+
+      options = @@viewOptions.merge(userOptions)
+      
+      cellsize = options[:cellSize]
+      padding = options[:padding]
+      
+      width = options[:cellCols] * cellsize + 2*padding
+      height = options[:cellRows] * cellsize + 2*padding
+      Canvas.init(width, height, "LifeLab")
+      
+      cells = []
+      for i in 0...options[:cellRows]
+        for j in 0...options[:cellCols]
+          x = j * cellsize + padding
+          y = i * cellsize + padding
+            cells << Canvas::Rectangle.new( x, y, x+cellsize, y+cellsize, :outline => "#888888", :fill => options[:cellColor] ) 
+        end
+      end
+
+      @@drawing = LifeView.new(cells, options)
+      return true
+      
+    end
+    
+    # Close the RubyLabs Canvas window.
+  
+    def Life.close_view
+      Canvas.close
+    end
+      
+    # Reset the game state.
+    
+    def Life.reset
+      puts "fix this!"
+      # if @@drawing
+      #   @@drawing.cells.each do |x|
+      #     x.fill = @@drawing.options[:cellColor]
+      #   end
+      # end
+      return true
+    end
+       
+    # Print a list of programs in the LifeLab data directory.
+
+    def Life.dir
+      # puts "Redcode programs in #{@@marsDirectory}:"
+      # Dir.open(@@marsDirectory).each do |file|
+      #   next if file[0] == ?.
+      #   file.slice!(/\.txt/)
+      #   puts "  " + file
+      # end
+      return nil
+    end
+    
+    private
+    
+    # Drawing hook, called from MARS.step when the canvas is active.
+    
+    # def MARS.updateCells(pc)
+    #   id = pc.id
+    #   a = pc.history[pc.current[:thread]]
+    #   d = @@drawing.palettes[id].length - a.length
+    #   a.each_with_index do |x, i|
+    #     @@drawing.cells[x].fill = @@drawing.palettes[id][i+d]
+    #   end     
+    # end
+      
+  end # class Life
+  
+  # Initialize any class variables here...
+  
+  # @@entries = Array.new
+
+end # LifeLab
+
+end # RubyLabs

data/lib/rubylabs.rb

@@ -8,6 +8,7 @@ autoload :IterationLab,   "iterationlab.rb"
 autoload :RecursionLab,   "recursionlab.rb"
 autoload :HashLab,        "hashlab.rb"
 autoload :BitLab,         "bitlab.rb"
+autoload :LifeLab,        "lifelab.rb"
 autoload :MARSLab,        "marslab.rb"
 autoload :RandomLab,      "randomlab.rb"
 autoload :EncryptionLab,  "encryptionlab.rb"
@@ -325,7 +326,6 @@ call <tt>a.random(:success)</tt> to get a value that is in the array +a+, or cal
         
   end       # class TestArray 
   
-  
 # Equivalent to calling <tt>TestArray.new</tt>.
 #
 # Examples:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubylabs
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - conery
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-10-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubygems-test
@@ -33,8 +33,8 @@ dependencies:
   version_requirements: *id001
 description: A set of modules for interactive experiments in an introductory computer science class.
 email: conery@cs.uoregon.edu
-executables: 
-- lab-setup.rb
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -90,6 +90,7 @@ files:
 - lib/hashlab.rb
 - lib/introlab.rb
 - lib/iterationlab.rb
+- lib/lifelab.rb
 - lib/marslab.rb
 - lib/permute.rb
 - lib/randomlab.rb
@@ -115,8 +116,8 @@ homepage: http://github.com/conery/rubylabs
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubylabs
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Software and data for lab projects for Explorations in Computing.