rubylabs 0.7.2 → 0.7.3

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/spherelab.rb

@@ -43,7 +43,7 @@ module SphereLab
   @@delay = 0.1
   
   NBodyView = Struct.new(:bodies, :origin, :scale, :options)
-  TurtleView = Struct.new(:turtle, :center)
+  TurtleView = Struct.new(:turtle, :options)
   MelonView = Struct.new(:bodies, :scale, :ground, :startloc, :options)
 
 =begin rdoc
@@ -287,13 +287,14 @@ module SphereLab
 
   class Turtle
     
-    attr_accessor :position, :velocity, :graphic
+    attr_accessor :position, :velocity, :reference, :graphic
     
     @@turtleOptions = {
       :x => 20,
       :y => 100,
       :heading => 0,
       :speed => 10,
+      :track => :off,
     }
     
     @@north = Vector.new(0, 10, 0)
@@ -306,6 +307,8 @@ module SphereLab
       @position = Vector.new(options[:x], options[:y], 0.0)
       @velocity = Vector.new(-1.0 * options[:speed] * cos(alpha), options[:speed] * sin(alpha), 0.0)
       @graphic = nil
+      @reference = nil
+      @tracking = options[:track]
     end
     
     def inspect
@@ -331,8 +334,8 @@ module SphereLab
       y = @velocity.x * sin(theta) + @velocity.y * cos(theta)
       @velocity.x = x
       @velocity.y = y
-      if graphic
-        Canvas.rotate(graphic,alpha)
+      if @graphic
+        Canvas.rotate(@graphic,alpha)
         Canvas.sync
       end
       return alpha
@@ -342,13 +345,40 @@ module SphereLab
       prevx = @position.x
       prevy = @position.y
       @position.add( @velocity * dt )
-      if graphic
-        Canvas.move(graphic, @position.x-prevx, prevy-@position.y, :track)
+      if @graphic
+        Canvas.move(@graphic, @position.x-prevx, prevy-@position.y, @tracking)
         Canvas.sync
       end
       return dt
-    end    
-  end
+    end  
+    
+    def orient
+      if @reference.nil?
+        puts "no reference point"
+        return nil
+      end
+      mx, my = @reference
+      tx, ty = @position.x, @position.y
+      mid = Vector.new(tx-mx, ty-my, 0.0)
+      theta = Canvas.degrees(mid.angle(@velocity))
+      alpha = 2 * (90.0 - theta)
+      turn(alpha)
+      Canvas.sync if @graphic
+      return alpha      
+    end
+    
+    def track(val)
+      case val
+      when :off  : @tracking = :off
+      when :on   : @tracking = :track
+      else
+        puts "tracking is either :on or :off"
+        return nil
+      end
+      return val
+    end
+    
+  end # class Turtle
   
 =begin rdoc
   Set up an experiment with a robot/turtle.  Initialize the canvas, make the turtle,
@@ -368,11 +398,27 @@ module SphereLab
     Canvas.init(edge, edge, "SphereLab")
     turtle = Turtle.new( :x => edge/10, :y => edge/2, :heading => 0, :speed => 10 )
     turtle.graphic = Canvas.polygon(poly, :outline => 'black', :fill => '#00ff88')
-    Canvas.circle( edge/2, edge/2, 3, :fill => 'darkblue' )
-    @@drawing = TurtleView.new( turtle, [edge/2, edge/2] )
+    if options[:flag]
+      turtle.set_flag( *options[:flag] )
+    end
+    if options[:track]
+      turtle.track( options[:track] )
+    end
+    class <<turtle
+      def plant_flag
+        set_flag( @position.x, @position.y )
+        Canvas.sync
+      end
+    end
+    @@drawing = TurtleView.new( turtle, options )
     Canvas.sync
     return true
   end
+  
+  def set_flag(fx, fy)
+    Canvas.circle( fx, fy, 3, :fill => 'darkblue' )
+    @reference = [ fx, fy ]          
+  end
     
   def robot
     if @@drawing.nil?
@@ -382,27 +428,13 @@ module SphereLab
       return @@drawing.turtle
     end
   end
-    
-  # TODO -- aim toward point on circle at original radius, not current radius...
-
-  def orient_robot
-    r = robot
-    mx, my = @@drawing.center
-    tx, ty = r.position.x, r.position.y
-    mid = Vector.new(tx-my, ty-my, 0.0)
-    theta = Canvas.degrees(mid.angle(r.velocity))
-    alpha = 2 * (90.0 - theta)
-    r.turn(alpha)    
-    Canvas.sync
-    return alpha
-  end
-  
+      
   # :begin :make_circle
   def make_circle(nseg, time, angle)
     view_robot
-    turn_robot( angle/2 )
-    nseg.times { advance_robot(time); turn_robot(angle) }
-    turn_robot( -angle/2 )
+    robot.turn( angle/2 )
+    nseg.times { robot.advance(time); robot.turn(angle) }
+    robot.turn( -angle/2 )
     return true
   end
   # :end :make_circle
@@ -428,8 +460,9 @@ module SphereLab
     res = Vector.new(-r * cos)
   end
 
-  def random_bodies(n, big)
+  def random_bodies(n, big, moving)
     big = 1 if big.nil?
+    moving = true if moving.nil?
     res = []
     mm = 1e12          # average mass
     mr = 150          # average distance from origin
@@ -449,6 +482,9 @@ 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
   
@@ -464,7 +500,7 @@ 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])
+		    return random_bodies(args[1], args[2], args[3])
 	    end
 	    filename = args[0]
   	  if filename.class == Symbol
@@ -489,7 +525,7 @@ module SphereLab
 		end
 		return bodies
 	end
-		
+	
 =begin rdoc
   Initialize the drawing canvas by drawing a circle for each body in list b.
 =end
@@ -516,7 +552,30 @@ module SphereLab
     Canvas.sync
     return true  
   end
-  
+
+=begin rdoc
+  Demonstrate adding force vectors by moving only one body
+=end
+
+  def update_one(bodies, i, time)
+    b = bodies[i]
+    if b.graphic.nil?
+      puts "display the system with view_system"
+      return nil
+    end
+    for j in 0...bodies.length
+      next if i == j
+      Body.interaction( b, bodies[j] )
+    end
+    b.move(time)
+    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
+    Canvas.sync
+  end
+
 =begin rdoc
   Call SphereLab::step(bodies, time) to calculate the pairwise interactions between all
   Body objects in the array +bodies+ and then compute their new positions after +time+ seconds.
@@ -625,6 +684,12 @@ 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
@@ -656,11 +721,6 @@ module SphereLab
       melon.position.y += height
     end
     melon.velocity.y = 0.0
-    class <<melon
-      def height
-        return position.y - prevy
-      end
-    end
     return height
   end
   

data/lib/tsplab.rb

@@ -5,6 +5,9 @@
 =end
 
 =begin
+  todo unit tests
+  todo set up options, defaults as in mars, spheres (@@options...)
+  todo :trace as one of the options, array of things to print
   TODO test predigree counts
   TODO add "phylogeny" links -- keep refs to parent(s)
   TODO test: selection only, no mutations
@@ -528,6 +531,10 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
   end
   
   def view_tour(t, userOptions = {} )
+    if @@drawing.nil?
+      puts "call view_map to initialize the canvas"
+      return nil
+    end
     map = @@drawing.cities
     @@drawing.links.each { |x| x.delete }
     @@drawing.links.clear
@@ -538,7 +545,7 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
       x0, y0 = x1, y1
     end
     @@drawing.nodes.each { |x| x.raise }
-    sleep 0.1
+    Canvas.sync
   end
   
   # todo -- get drawing params from options
@@ -589,6 +596,8 @@ inherited from a parent, and incremented whenever a mutation or crossover is app
   @@tourOptions = {
     
   }
+  
+  @@drawing = nil
 
 end # module TSPLab
 

metadata

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