rubylabs 0.8.1 → 0.8.2

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.files = FileList['[A-Z]*', 'lib/**/*.rb', 'data/**/*.txt', 'bin/**/*.rb']
     gem.test_files = FileList['test/**/*.rb']
     gem.rubyforge_project = "rubylabs"
+    gem.has_rdoc = true
   end
 
   Jeweler::RubyforgeTasks.new  

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/bin/{lab_setup.rb → lab-setup.rb}

@@ -33,6 +33,5 @@ def configure
 end
 
 if !defined? IRB
-  puts "configuring interactive Ruby environment"
-  # configure
+  configure
 end

data/data/tsp/ireland.txt

@@ -1,10 +1,10 @@
 :map Ireland
 
-299 190 dublin
+353  43 belfast
  80 331 cork
-101 224 limerick
+299 190 dublin
  80 138 galway
-353  43 belfast
+101 224 limerick
 
 :matrix driving distances (in kilometers) between cities
 

data/lib/demos.rb

@@ -134,7 +134,37 @@ module Demos
     end
   end
 
+=begin rdoc
+  Demonstrate modifiers and if statements
+=end
 
+  def compound_names(a)
+    a.each { |s| puts s if s.include?(" ") }
+  end
+  
+  def emphasize(s)
+    if s == "red" || s == "green" || s == "blue"
+      s.upcase!
+      s += "S"
+    end
+    return s
+  end
+  
+  def drink_cup(n)
+    if n == 12
+      return "tall"
+    elsif n == 16
+      return "grande"
+    elsif n == 20
+      return "venti"
+    else
+      return n.to_s + " ounce"
+    end
+  end
+  
+  def make_order(size, kind)
+    puts "I'll have a " + drink_cup(size) + " " + kind + ", please."
+  end
 
 end # Demos
 

data/lib/sievelab.rb

@@ -20,7 +20,6 @@ module SieveLab
 
 # :begin :sieve
 	def sieve(n)
-	  return [] if n < 2
 	  worksheet = Array(2..n)
 		primes = []
 	

data/lib/tsplab.rb

@@ -90,10 +90,12 @@ module TSPLab
   	
   	def make_tour(*args)
   	  begin
-  	    raise "usage" if args.length == 0
+  	    args << :any if args.length == 0
   	    case args[0]
+	      when :any
+	        tour = Tour.new(self, labels)    # note labels returns clone of @labels array...
   	    when :random
-  	      tour = Tour.new(self, permute!(labels))    # note labels returns clone of @labels array...
+  	      tour = Tour.new(self, permute!(labels))
 	      when :mutate
 	        raise "usage" unless args.length >= 2 && args[1].class == Tour && (args[2].nil? || args[2].class == Fixnum)
   	      child = args[1].clone

data/test/sieve_test.rb

@@ -19,12 +19,16 @@ class TestSieve < Test::Unit::TestCase
 
 	# Check length of list generated by sieve with expected number of primes (also from Wikipedia).
 	# pi[i] is the number of primes less than 10**i.  Note: calling sieve(n) with n less than 2
-	# should quietly return an empty list.
+	# raises an exception ("NoMethodError: undefined method `<' for nil:NilClass")
 
   def test_02_pi
     pi = [0, 4, 25, 168, 1229]          # 9592
-    for i in 0..(pi.length-1)
+    for i in 1..(pi.length-1)
       assert_equal pi[i], sieve(10**i).length
     end
   end
+  
+  def test_03_error
+    assert_raise(NoMethodError) { sieve(1) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubylabs
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - conery
@@ -9,16 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
-default_executable: 
+date: 2010-09-27 00:00:00 -07:00
+default_executable: lab-setup.rb
 dependencies: []
 
 description: A set of modules for interactive experiments in an introductory computer science class.
 email: conery@cs.uoregon.edu
 executables: 
-- bb.rb
-- lab_setup.rb
-- statistics2.rb
+- lab-setup.rb
 extensions: []
 
 extra_rdoc_files: 
@@ -29,16 +27,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/bb.rb
-- bin/lab_setup.rb
-- bin/statistics2-0.53/ext/extconf.rb
-- bin/statistics2-0.53/ext/show.rb
-- bin/statistics2-0.53/ext/t.rb
-- bin/statistics2-0.53/mklist.rb
-- bin/statistics2-0.53/sample-tbl.rb
-- bin/statistics2-0.53/statistics2.rb
-- bin/statistics2-0.53/t-inv.rb
-- bin/statistics2.rb
+- bin/lab-setup.rb
 - data/arrays/cars.txt
 - data/arrays/colors.txt
 - data/arrays/fruit.txt

data/bin/bb.rb

@@ -1,12 +0,0 @@
-#! /usr/bin/ruby -rubygems
-
-# From:  http://www.rubyagent.com/2007/03/starting-multi-agent-system-environment
-
-require 'drb/drb'
-require 'rinda/tuplespace'
-
-DRb.start_service("druby://localhost:53783", Rinda::TupleSpace.new)
-
-puts 'The blackboard is running...'
-
-DRb.thread.join

data/bin/statistics2-0.53/ext/extconf.rb

@@ -1,11 +0,0 @@
-require "mkmf"
-create_makefile("statistics2")
-open("Makefile", "a") do |f|
-  f << "test:\n\truby -I./lib:. t.rb\n"
-  f << "\n"
-  f << "uninstall:\n"
-  f << "\t@echo rm $(RUBYLIBDIR)/statistics2.rb\n"
-  f << "\t@$(RM) $(RUBYLIBDIR)/statistics2.rb\n"
-  f << "\t@echo rm $(RUBYARCHDIR)/statistics2.{o,so}\n"
-  f << "\t@$(RM) $(RUBYARCHDIR)/statistics2.{o,so}\n"
-end

data/bin/statistics2-0.53/ext/show.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-require "statistics2.so"
-if $0 == __FILE__
-  if ARGV.empty?
-    puts "Example:"
-    puts "        #$0 normaldist 0.01"
-    puts "        #$0 pf_x 2 3 0.01"
-    exit
-  end
-  p Statistics2.send(ARGV[0], *ARGV[1..-1].map{|x| eval(x)})
-end

data/bin/statistics2-0.53/ext/t.rb

@@ -1,46 +0,0 @@
-require 'test/unit'
-$test = true
-
-$LOAD_PATH.unshift ".."
-require 'sample-tbl'
-
-eval(File.read('../statistics2.rb').sub(/\bStatistics2\b/, 'Statistics20'))
-$mod0 = Statistics20
-
-require 'statistics2.so'
-$mod = Statistics2
-
-class T_Statistics2 < Test::Unit::TestCase
-
-  def test_normal
-    norm_tbl(0.0, 3.1) do |x|
-      a, b = $mod.normal___x(x), $mod0.normal___x(x)
-      assert_in_delta a, b, 0.000001
-    end
-  end
-
-  def test_chi
-    chi2_tbl() do |n, x|
-      a, b = $mod.pchi2_x(n, x), $mod0.pchi2_x(n, x)
-      assert_in_delta a/b, 1.0, 0.01
-    end
-  end
-
-  def test_t
-    t_tbl() do |n, x|
-      a, b = $mod.ptx__x(n, x), $mod.ptx__x(n, x)
-      assert_in_delta a, b, 0.001
-    end
-  end
-
-  def test_f
-    [0.01, 0.025, 0.05].each do |opt|
-      f_tbl(opt) do |n1, n2, y|
-        a, b = $mod.pf_x(n1, n2, y), $mod0.pf_x(n1, n2, y)
-        assert_in_delta a/b, 1.0, 0.01
-      end
-    end
-  end
-end
-
-require "t-inv.rb"

data/bin/statistics2-0.53/mklist.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-cmd = "ruby sample-tbl.rb"
-param_tbl = [["norm", "tbl-nomral.tbl"],
-           ["chi2", "tbl-chi2.tbl"],
-           ["t", "tbl-t.tbl"],
-           ["f 0.05", "tbl-F50.tbl"],
-           ["f 0.025", "tbl-F25.tbl"],
-           ["f 0.01", "tbl-F10.tbl"]]
-
-unless dir = ARGV.shift
-  puts "Usage: $0 DIR"
-  puts "-- This script creates some tables of distributions:"
-  param_tbl.each do |mod, tbl|
-    puts "    " + mod + " => " + tbl
-  end
-  exit
-end
-
-unless File.directory? dir
-  system("mkdir #{dir}")
-end
-
-param_tbl.each do |pa, tbl|
-  file = File.join(dir, tbl)
-  system("#{cmd} #{pa} > #{file}")
-end

data/bin/statistics2-0.53/sample-tbl.rb

@@ -1,129 +0,0 @@
-#!/usr/bin/env ruby
-
-if $test
-  def nop(*a); ""; end
-  alias _sprintf nop
-  alias _printf nop
-  alias _puts nop
-else
-  alias _sprintf sprintf
-  alias _printf printf
-  alias _puts puts
-end
-
-def norm_line(x, n)
-  s = sprintf("%1.1f|", x)
-  (0.00).step(0.09, 0.01) do |y|
-    s << _sprintf(" %1.#{n}f", yield(x + y))
-  end
-  s
-end
-
-def norm_tbl(s, e, ln = nil, tn = nil, &b)
-  n = 4
-  unless ln
-    _printf("    " + (" "*(n-1) + "%1.2f")*10 + "\n", * (0..9).map {|x| x*0.01})
-  end
-  i = 0
-  (s.to_f).step(e.to_f, 0.1) do |x|
-    next if ln && ln.to_i != i+1
-    _puts norm_line(x, n, &b)
-    i += 1
-  end
-end
-
-def chi2_tbl(ln = nil, tn = nil)
-  pers = [0.995, 0.99, 0.975, 0.95, 0.05, 0.025, 0.01, 0.005]
-  arbi = (1..30).to_a + [40, 60, 80, 100]
-  form = "  %7.5f"
-  unless ln
-    _printf("     "); pers.each do |a|; _printf(form, a); end;  _puts
-  end
-  arbi.each_with_index do |n, i|
-    next if ln && ln.to_i != i+1
-    _printf("%4d|", n) unless tn
-    pers.each_with_index do |a, j|
-      next if tn && tn.to_i != j+1
-      form = case n
-             when 1; a >= 0.95 ? " %.4e" : " %6.3f"
-             when 2..5; a >= 0.95 ? "  %7.5f" : "  %7.3f"
-             when 6..24; "  %7.3f"
-             else 26..100; "  %7.2f"
-             end
-      _printf(form, yield(n, a))
-    end
-    _puts
-  end
-end
-
-def t_tbl(ln = nil, tn = nil)
-  pers = [0.5, 0.4, 0.3, 0.2, 0.1, 0.05, 0.02, 0.01, 0.001]
-  arbi = (1..30).to_a + [40, 60, 120]#, 9999]
-  form = " %7.3f"
-  unless ln
-    _printf("     "); pers.each do |a|; _printf(form, a); end;  _puts
-  end
-  arbi.each_with_index do |n, i|
-    next if ln && ln.to_i != i+1
-    _printf("%4d|", n) unless tn
-    pers.each_with_index do |a, j|
-      next if tn && tn.to_i != j+1
-      _printf(form, yield(n, a))
-    end
-    _puts
-  end
-end
-
-def f_tbl(a, k1 = nil, k2 = nil)
-  arbi1 = (1..10).to_a + [12, 15, 20, 24, 30, 40, 60, 120]#, 9999]
-  arbi2 = (1..30).to_a + [40, 60, 120]#, 9999]
-  unless k1
-    _printf("     "); arbi1.each do |n1|; _printf(" %4d", n1); end;  _puts
-  end
-  arbi2.each do |n2|
-    form = n2 == 1 ? " %4d" : n2 == 2 ? " %4.1f" : " %4.2f"
-    next if k2 && k2.to_i != n2
-    _printf("%4d|", n2) unless k2
-    arbi1.each do |n1|
-      next if k1 && k1.to_i != n1
-      _printf(form, yield(n1, n2, a.to_f))
-    end
-    _puts
-  end
-end
-
-def show_tbl(mod, dist, *opts)
-  case dist
-  when nil, "norm"
-    norm_tbl(0.0, 3.1, *opts) do |x|
-      mod.normal___x(x)
-    end
-  when "chi", "chi2"
-    chi2_tbl(*opts) do |n, x|
-      mod.pchi2_x(n, x)
-    end
-  when "t"
-    t_tbl(*opts) do |n, x|
-      mod.ptx__x(n, x)
-    end
-  when "f"
-    f_tbl(*opts) do |n1, n2, a|
-      mod.pf_x(n1, n2, a)
-    end
-  end
-end
-
-
-if $0 == __FILE__
-  if ARGV.empty?
-    puts "-- This script makes tables of distributions"
-    puts "Example:"
-    puts "      #$0 norm"
-    puts "      #$0 chi2"
-    puts "      #$0 t"
-    puts "      #$0 f 0.01"
-    exit
-  end
-  require "statistics2"
-  show_tbl(Statistics2, *ARGV)
-end