rubylabs 0.7.0 → 0.7.1

data/data/huffman/aafreq.txt

@@ -0,0 +1,20 @@
+A 0.069
+C 0.021
+D 0.050
+E 0.069
+F 0.038
+G 0.063
+H 0.025
+I 0.048
+K 0.059
+L 0.094
+M 0.023
+N 0.041
+P 0.058
+Q 0.047
+R 0.056
+S 0.083
+T 0.054
+V 0.060
+W 0.011
+Y 0.031

data/data/huffman/hacodes.txt

@@ -0,0 +1,35 @@
+# The binary numbers are Hawaiian words, encoded with a Huffman code based on the
+# letter frequencies in hafreq.txt.  The word next to a code is the English translation
+# of the Hawaiian word -- after decoding a string of bits look for the word in a 
+# Hawaiian-English dictionary to see if the decoding is correct.
+
+011010	rain
+001010	sugarcane
+0011111	carving
+110011010	night
+0011000110	duck
+1100001010	chicken
+1001110110	swordfish
+111001101111	large
+001010111010	leeward
+110000100010110	island
+1100001010111010	ocean
+0001110101111101	octopus
+0000101110101111	porch
+1110110111101101	goose
+0010110110000110	teacher
+100000111101111111	royalty
+00110000110001101111	beach
+11000100001100000010	thankyou
+11000100011011101111	wind
+0001010100000010000110	friend
+0011000110000111111000110	morning
+0001100110011101000001111	happy
+110001000110000111110011111	year
+00010100111010001111111001110	hospitality
+1100010000011110001111111101111	visitor
+11000100010110100001111111101101 mother
+00011000001000110000111110011111	pineapple
+110001101111011010001011011101101	imp
+0011011110011011000100001111111101101	daughter
+000101101100001100001011011000011011100110001011011100110001011010110011011010011110	triggerfish

data/data/huffman/hafreq.txt

@@ -0,0 +1,16 @@
+# Letter frequencies for the Hawaiian alphabet
+# Source:  http://www.cryptogram.org/cdb/words/frequency.html
+
+'  0.068
+A  0.262
+E  0.072
+H  0.045
+I  0.084
+K  0.106
+L  0.044
+M  0.032
+N  0.083
+O  0.106
+P  0.030
+U  0.059
+W  0.009

data/data/huffman/hvfreq.txt

@@ -0,0 +1,5 @@
+A  0.45
+E  0.12
+I  0.15
+O  0.18
+U  0.10

data/data/spheres/fourbody.txt

@@ -0,0 +1,6 @@
+# A small 4-body system to demonstrate the simulator 
+
+a 1.4e18 50 70 0 0 1 0 10 #ff6666
+b 1.2e16 50 225 0 -1000 2 0 3 #ff6666
+c 2.1e16 175 -75 0 -1 -5 0 5 #ff6666
+d 4.5e16 300 -75 0 -5 2 0 6 #ff6666

data/data/spheres/solarsystem.txt

@@ -0,0 +1,17 @@
+# Solar system data, downloaded from JPL, from ephemeris created for Jan 1, 1970
+# Format for each line:
+#   name, mass, posx, posy, posz, velx, vely, velz, dia, color
+# where mass is in grams; posx, posy, and posz are the 3d position vector (in meters)
+# and velx, vely, and velz is the 3D velocity vector (m/sec). The last two items are 
+# for the visualization -- radius (in pixels) and color for drawing the body.
+
+sun 1.9891E+30 0 0 0 0 0 0 10 #ffff00
+mercury 3.302E+23 3.83713E+10 2.877025E+10 -1.175808E+09 -38787.67 41093.05 6918.461 3 #ffcc66
+venus 4.8685E+24 -5.377313E+09 -1.085956E+11 -1.164748E+09 34741.48 -1865.747 -2031.506 5 #800080
+earth 5.9736E+24 -2.700743E+10 1.446007E+11 9686451 -29770.44 -5568.042 0.3961261 5 #0000ff
+mars 6.4185E+23 1.983825E+11 7.422924E+10 -3.334841E+09 -7557.626 24761.27 704.7457 4 #ff0000
+jupiter 1.89813E+27 -7.496502E+11 -3.201711E+11 1.811155E+10 4982.522 -11417.83 -64.66531 7 #ffffbf
+saturn 5.68319E+26 1.082806E+12 8.510841E+11 -5.793461E+10 -6487.118 7565.952 125.4422 6 #0080ff
+uranus 8.68103E+25 -2.724616E+12 -2.894003E+11 3.428801E+10 671.3469 -7099.093 -35.04028 5 #008080
+neptune 1.0241E+26 -2.328072E+12 -3.891086E+12 1.337436E+11 4633.961 -2767.423 -49.57268 5 #004080
+pluto 1.314E+22 -4.551135E+12 3.175277E+11 1.282177E+12 635.998 -5762.115 440.8821 2 #dddddd

data/data/spheres/urey.txt

@@ -0,0 +1,5 @@
+# Two body system:  a 6.6 pound watermelon and the earth.  The melon is
+# initially stationary on the the earth's surface.
+
+melon 3000 0 6.371E6 0 0 0 0 10 pink
+earth 5.9736E+24 0 0 0 0 0 0 1000 darkgreen

data/data/tsp/pac10.txt

@@ -0,0 +1,55 @@
+% 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

data/data/tsp/test.txt

@@ -0,0 +1,2 @@
+% [[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') }

data/lib/tsplab.rb

@@ -48,43 +48,28 @@ city is assigned a one-letter key.
 =end
 
     def initialize(matrix)
-      matrixfilename = matrix.to_s + ".txt"
-      matrixfilename = File.join(@@dataDirectory, matrixfilename)
-      raise "Matrix not found: #{matrixfilename}" unless File.exists?(matrixfilename)
-
-      @key = ?A
-      @cities = Hash.new          # initially a map from name string to one-letter key
-      @matrix = Hash.new
-
-      File.open(matrixfilename).each do |line|
-        next if line.chomp.length == 0
-        rec = line.split(/\t/)
-        i = getKey(rec[0])
-        j = getKey(rec[1])
-        dist = ((24 * getValue(rec[2]) + getValue(rec[3])) * 60) + getValue(rec[4])
-        assign(i,j,dist)
-        assign(j,i,dist)
-      end
-
-      @cities = @cities.invert    # from now on a map from key to name string
-
-      errs = 0
-      (?A..@key-1).each do |i|
-        (i+1..@key-1).each do |j|
-          unless @matrix[i][j] && @matrix[j][i]
-            errs += 1
-            puts "CityList.new: missing distance between #{@cities[i]} and #{@cities[j]}"
-          end
-        end
+      if matrix.class == String || matrix.class == Symbol
+        read_file(matrix)
+      elsif matrix.class == Array
+        make_map(matrix)
+      else
+        raise "CityList: parameter must be a file name or array of points"
       end
-      raise "CityList.new: errors in input file" if errs > 0
-
     end
 
     def inspect()
       n = @matrix.length
       return sprintf "TSPLab::CityList (%d x %d)", n, n-1
     end
+    
+    def dump
+      (?A..@key-1).each do |i|
+        (i+1..@key-1).each do |j|
+          printf "%s %s %d\n", @cities[i], @cities[j], @matrix[i][j]
+        end
+      end
+      return true
+    end
   
     def size()
       return @key - ?A
@@ -116,6 +101,50 @@ city is assigned a one-letter key.
   # get a time value from an input line, save a distance
 
     private
+    
+    def read_file(fn)
+      matrixfilename = fn.to_s + ".txt"
+      matrixfilename = File.join(@@dataDirectory, matrixfilename)
+      raise "Matrix not found: #{matrixfilename}" unless File.exists?(matrixfilename)
+
+      @key = ?A
+      @cities = Hash.new          # initially a map from name string to one-letter key
+      @matrix = Hash.new
+
+      File.open(matrixfilename).each do |line|
+        next if line.chomp.length == 0
+        next if line[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)
+      end
+
+      @cities = @cities.invert    # from now on a map from key to name string
+
+      errs = 0
+      (?A..@key-1).each do |i|
+        (i+1..@key-1).each do |j|
+          unless @matrix[i][j] && @matrix[j][i]
+            errs += 1
+            puts "CityList.new: missing distance between #{@cities[i]} and #{@cities[j]}"
+          end
+        end
+      end
+      raise "CityList.new: errors in input file" if errs > 0
+    end
+    
+    def make_map(a)
+      @key = ?A + a.length - 1
+      @cities = Hash.new
+      @matrix = Hash.new
+      for i in 0...a.length
+        for j in i...a.length
+        end
+      end
+    end
 
     def getKey(s)
       if @cities[s] == nil
@@ -387,7 +416,15 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
 
     return best
   end
-
+  
+  # Make a random set of n cities on a 1000 x 1000 grid
+  
+  def random_cities(n)
+    a = Array.new
+    n.times { x = rand(1000); y = rand(1000); a << [x,y] }
+    return a
+  end
+  
   def checkout(matrix, filename = nil)
     matrixfilename = matrix.to_s + ".txt"
     matrixfilename = File.join(@@dataDirectory, matrixfilename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubylabs
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - conery
@@ -39,7 +39,15 @@ files:
 - bin/statistics2-0.53/statistics2.rb
 - bin/statistics2-0.53/t-inv.rb
 - bin/statistics2.rb
+- data/arrays/cars.txt
+- data/arrays/colors.txt
+- data/arrays/fruit.txt
+- data/arrays/wordlist.txt
 - data/eliza/doctor.txt
+- data/huffman/aafreq.txt
+- data/huffman/hacodes.txt
+- data/huffman/hafreq.txt
+- data/huffman/hvfreq.txt
 - data/mars/chang1.txt
 - data/mars/dwarf.txt
 - data/mars/ferret.txt
@@ -53,7 +61,11 @@ files:
 - data/mars/test_hello.txt
 - data/mars/test_mult.txt
 - data/mars/test_threads.txt
-- data/solar.dat
+- data/spheres/fourbody.txt
+- data/spheres/solarsystem.txt
+- data/spheres/urey.txt
+- data/tsp/pac10.txt
+- data/tsp/test.txt
 - lib/bitlab.rb
 - lib/elizalab.rb
 - lib/encryptionlab.rb