rubylabs 0.7.4 → 0.7.5

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/data/spheres/solarsystem.txt

@@ -1,7 +1,7 @@
 # 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)
+# where mass is in kilograms; 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.
 

data/data/spheres/urey.txt

@@ -1,5 +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
+melon 3.0 0 6.371E6 0 0 0 0 10 pink
 earth 5.9736E+24 0 0 0 0 0 0 1000 darkgreen

data/lib/rubylabs.rb

@@ -208,7 +208,7 @@ Similar to TestArray, but draws random words from a file.
 
   class RandomArray < Array
 
-	  data = File.join(File.dirname(__FILE__), '..', 'data')    
+	  data = File.join(File.dirname(__FILE__), '..', 'data', 'arrays')    
 	  
 		@@sources = {
 		  :cars => "#{data}/cars.txt",

data/lib/spherelab.rb

@@ -78,7 +78,8 @@ module SphereLab
     end
   
     def inspect
-      sprintf "<%s, %s, %s>", @x.to_s, @y.to_s, @z.to_s
+      pos = [@x,@y,@z].map { |x| sprintf "%.5g", x }
+      return "(" + pos.join(",") + ")"
     end
   
 =begin rdoc
@@ -187,32 +188,20 @@ module SphereLab
     attr_accessor :mass, :position, :velocity, :force
     attr_accessor :name, :size, :color, :prevx, :prevy, :graphic
   
-=begin rdoc
-  The constructor can be called with a variety of different arguments:
-    * for the main n-body simulation, initial conditions are read from a data file,
-      and the constructor is passed three parameters:  mass, position vector, and
-      velocity vector; an optional 4th parameter is a name string
-    * for interactive experiments, pass two floats, which become the mass and the
-      x component of the velocity; an optional 3rd parameter is the name
-    * also for interactive experiments pass :rand to make a body with random
-      mass, position, and velocity
-    * pass no parameters to get a body with all attributes set to 0
-=end
-
     def initialize(*args)
       if args[1].class == Vector
         @mass, @position, @velocity, @name = args
-      elsif args[0] == :random
-        @mass = rand(10000) * 1e6
-        @position = Vector.new(rand(300)-150, rand(300)-150, 0)
-        @velocity = Vector.new(rand(20)-10, rand(10)-5, 0)
-        @name = "b" + self.object_id.to_s
-      elsif args[0].is_a?(Numeric) && args[1].is_a?(Numeric)
-        @mass = args[0]
-        @position = Vector.new(args[1], 0.0, 0.0)
-        @velocity = Vector.new(0.0, 0.0, 0.0)
-        @name = args[2]
-        @linear = true
+      # elsif args[0] == :random
+      #   @mass = rand(10000) * 1e6
+      #   @position = Vector.new(rand(300)-150, rand(300)-150, 0)
+      #   @velocity = Vector.new(rand(20)-10, rand(10)-5, 0)
+      #   @name = "b" + self.object_id.to_s
+      # elsif args[0].is_a?(Numeric) && args[1].is_a?(Numeric)
+      #   @mass = args[0]
+      #   @position = Vector.new(args[1], 0.0, 0.0)
+      #   @velocity = Vector.new(0.0, 0.0, 0.0)
+      #   @name = args[2]
+      #   @linear = true
       else
         @mass = 0.0
         @position = Vector.new(0.0, 0.0, 0.0)
@@ -223,15 +212,8 @@ module SphereLab
     end
   
     def inspect
-      s = ""
-      s << @name + ": " if @name
-      s << @mass.to_s + "g "
-      if @linear
-        s << "x: " + @position.x.to_s
-      else
-        s << @position.inspect + " " + @velocity.inspect 
-      end
-      return s
+      name = @name ? @name : ""
+      return sprintf "%s: %.3g kg %s %s", name, @mass, @position.inspect, @velocity.inspect
     end
 
 =begin rdoc
@@ -447,7 +429,8 @@ module SphereLab
 
   def random_vectors(r, i, n)
     theta = (2 * PI / n) * i + (PI * rand / n)
-    radius = r + (r/3)*(rand-0.5)
+    # radius = r + (r/3)*(rand-0.5)
+    radius = r + r * (rand-0.5)
     x = radius * cos(theta)
     y = radius * sin(theta)
     vtheta = (PI - theta) * -1 + PI * (rand-0.5)
@@ -459,19 +442,23 @@ module SphereLab
   def random_velocity(v, r)
     res = Vector.new(-r * cos)
   end
+  
+  # todo -- put mm, mr in global options
 
-  def random_bodies(n, big, moving)
+  def random_bodies(n, big)
     big = 1 if big.nil?
     moving = true if moving.nil?
     res = []
     mm = 1e12          # average mass
     mr = 150          # average distance from origin
+    bigm = (mm * 100) / big
     big.times do |i|
       r, v = random_vectors(mr/2, i, big)
-      b = Body.new(mm*100/big, r, v)
+      ms = (1 + (rand/2 - 0.25) )
+      b = Body.new(bigm*ms, r, v)
       b.name = "b#{i}"
       b.color = '#0080ff'
-      b.size = 10
+      b.size = 10*ms
       res << b
     end
     (n-big).times do |i|
@@ -482,12 +469,24 @@ module SphereLab
       b.size = 5
       res << b
     end
-    if !moving
-      res.each { |b| b.velocity.x = b.velocity.y = b.velocity.z = 0.0 }
-    end
     return res
   end
   
+  def falling_bodies(n)
+    raise "n must be 5 or more" unless n >= 5
+    a = random_bodies(n-1, n-1)
+    # b = Body.new(1e13, (a[0].position + a[1].position), Vector.new(0,0,0))
+    b = Body.new(1e13, (a[0].position + a[1].position)*0.85, Vector.new(0,0,0))
+    # pos = a[0].position
+    # (1..(n-2)).each { |i| pos.add( a[i].position ) }
+    # b = Body.new(1e14, pos * (1.0 / n), Vector.new(0,0,0))
+    b.name = "falling"
+    b.size = 5
+    b.color = 'red'
+    a.insert(0, b)
+    return a
+  end
+  
 =begin rdoc
   Initialize a new n-body system, returning an array of body objects.  The
   parameter is the name of a predefined system, the name of a file, or the
@@ -500,7 +499,10 @@ module SphereLab
 		  raise "usage: make_system(id)" unless args.length > 0
 		  if args[0] == :random
 		    raise "usage:  make_system(:random, n, m)" unless args.length >= 2 && args[1].class == Fixnum
-		    return random_bodies(args[1], args[2], args[3])
+		    return random_bodies(args[1], args[2])
+	    elsif args[0] == :falling
+		    raise "usage:  make_system(:falling, n)" unless args.length >= 1 && args[1].class == Fixnum
+	      return falling_bodies(args[1])
 	    end
 	    filename = args[0]
   	  if filename.class == Symbol
@@ -518,6 +520,16 @@ module SphereLab
         b.size = a[-2].to_i
         b.color = a[-1]
         bodies << b
+      end
+      if args[0] == :urey
+        class <<bodies[0]
+          def height
+            return 0 if prevy.nil?
+            return position.y - prevy
+          end
+          # def height=(x)
+          # end
+        end       
       end
 		rescue
 			puts "error: #{$!}"
@@ -559,23 +571,33 @@ module SphereLab
   Demonstrate adding force vectors by moving only one body
 =end
 
-  def update_one(bodies, i, time)
-    b = bodies[i]
+  def update_one(bodies, time)
+    b = bodies[0]
     if b.graphic.nil?
       puts "display the system with view_system"
       return nil
     end
-    for j in 0...bodies.length
-      next if i == j
+    for j in 1...bodies.length
       Body.interaction( b, bodies[j] )
     end
     b.move(time)
+    if @@drawing.options.has_key?(:dash)
+      @@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
     newx, newy = scale(b.position, @@drawing.origin, @@drawing.scale)
     Canvas.move(b.graphic, newx-b.prevx, newy-b.prevy, @@drawing.options[:pendown])
     b.prevx = newx
     b.prevy = newy
     b.clear_force
+    # puts b.velocity.norm
+    # if (speed = b.velocity.norm) > 7.5
+    #   b.velocity.scale(7.5 / speed)
+    # end
     Canvas.sync
+    return true
   end
 
 =begin rdoc
@@ -584,17 +606,17 @@ module SphereLab
 =end
 
 # :begin :step_system
-  def step_system(bodies, time)
+  def step_system(bodies, dt)
     nb = bodies.length
   
-    for i in 0...nb         # compute all pairwise interactions
-      for j in (i+1)...nb
+    for i in 0..(nb-1)         # compute all pairwise interactions
+      for j in (i+1)..(nb-1)
         Body.interaction( bodies[i], bodies[j] )
       end
     end
   
     bodies.each do |b|
-      b.move(time)          # apply the accumulated forces
+      b.move(dt)          # apply the accumulated forces
       b.clear_force         # reset force to 0 for next round
     end
   end
@@ -686,12 +708,6 @@ module SphereLab
     mymax = earth.coords[1]
     melon = Canvas.circle(mxmin, mymax, 5, :fill => blist[0].color)
     blist[0].graphic = melon
-    class <<blist[0]
-      def height
-        return 0 if prevy.nil?
-        return position.y - prevy
-      end
-    end
     scale = (mymax-mymin) / hmax.to_f
     @@drawing = MelonView.new(blist, scale, blist[0].position.y, melon.coords, options)
     Canvas.sync
@@ -706,7 +722,7 @@ module SphereLab
   
   def position_melon(blist, height)
     melon = blist[0]
-    if @@drawing
+    if @@drawing && blist[0].graphic
       if height < 0 || height > @@drawing.options[:hmax]
         puts "Height must be between 0 and #{@@drawing.options[:hmax]} meters"
         return false
@@ -732,7 +748,7 @@ module SphereLab
     my = melon.position.y
     return "splat" if melon.prevy.nil? || my < melon.prevy
     step_system(blist, dt)
-    if @@drawing
+    if @@drawing && blist[0].graphic
       if @@drawing.options[:dash] > 0
         @@drawing.options[:dashcount] = (@@drawing.options[:dashcount] + 1) % @@drawing.options[:dash]
         if @@drawing.options[:dashcount] == 0
@@ -744,7 +760,7 @@ module SphereLab
       Canvas.move(melon.graphic, dx, dy, @@drawing.options[:pendown])
       Canvas.sync
     end
-    return dt
+    return blist[0].height
   end
   
   # :begin :drop_melon

data/lib/tsplab.rb

@@ -126,7 +126,7 @@ minutes.
     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
 
@@ -247,6 +247,9 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
 
 =end
 
+=begin
+  TODO don't give access to path (unless there's a way to make it read-only -- freeze it?)
+=end
 
   class Tour 
     attr_reader :id, :path, :cost, :matrix, :nm, :nx
@@ -292,6 +295,33 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
   		end
   	end
 
+    # Another constructor -- return the next tour lexicographically
+    # following tour t
+    
+    def Tour.next(t)
+      p = t.path.clone
+      n = p.length
+      # find largest j s.t. path[j] < path[j+1]
+      j = n-2
+      while j >= 0
+        break if p[j] < p[j+1]
+        j -= 1
+      end
+      return nil if j < 0
+      # find largest i s.t. path[j] < path[i]
+      i = n-1
+      loop do
+        break if p[j] < p[i]
+        i -= 1
+      end
+      # exchange path[j], path[i]
+      p[j], p[i] = p[i], p[j]
+      # reverse path from j+1 to end
+      tmp = p.slice!(j+1, n-1)
+      p += tmp.reverse
+      return Tour.new(t.matrix, p)
+    end
+
     def to_s()
       return "\##{@id}: #{@path} / #{@cost}"
     end
@@ -342,12 +372,12 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
       @nm += t.nm
       self
     end
-
+    
     # private methods -- compute the cost of a path, given a matrix; apply
     # mutations (point mutations, cross-overs)
 
     private
-
+    
     def pathcost(m,s)
       sum = m.distance(s[0],s[-1]) 	# link from end to start
       for i in 0..s.length-2

metadata

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