redshift 1.3.19 → 1.3.20

data/README

@@ -2,12 +2,14 @@
 
 A framework for simulation of networks of hybrid automata, similar to SHIFT and Lambda-SHIFT. Includes ruby-based DSL for defining simulation components, and ruby/C code generation and runtime.
 
-There's no documentation yet. Start with the examples.
+There's no documentation yet, but it will be at http://redshift.sourceforge.net and http://redshift.rubyforge.org. For now, start with the examples.
 
 == Requirements
 
 RedShift needs ruby 1.8.x and a compatible C compiler. If you can build native gems, you're all set.
 
+Some of the examples also use Ruby/Tk and the tkar gem.
+
 == Env vars
 
 If you have a multicore system and are using the gnu toolchain, set

data/RELEASE-NOTES

@@ -1,3 +1,11 @@
+redshift 1.3.20
+
+- added hook_remove_comp
+
+- added tkar as dependency
+
+- added orbit example
+
 redshift 1.3.19
 
 - prevent bones from including compiled files

data/examples/orbit.rb

@@ -0,0 +1,130 @@
+# A very simple simulation of orbital mechanics. Planets orbit sun, but do
+# not interact with each other.
+
+require 'redshift'
+require 'redshift/util/tkar-driver'
+
+include RedShift
+
+module OrbitWorld
+  def next_id
+    @next_id ||= 1
+    @next_id += 1
+  end
+  
+  def tkar
+    @tkar ||= TkarDriver.new do |pipe|
+      pipe.puts <<-END
+        title Orbit example
+        background black
+        height 600
+        width 600
+        view_at -50 -50
+        zoom_to 4
+
+        shape planet oval*0,*0,*1,*1,oc:*2,fc:*2 \
+          text0,3,anchor:c,justify:center,width:100,text:*3,fc:white
+      END
+      ## the view_at seems to be needed to overcome a little
+      ## centering bug in tkar
+      
+      # Add the Sun, but never move it.
+      pipe.puts "add planet 0 - 5 0 0 0"
+      pipe.puts "param 0 0 4"
+      pipe.puts "param 0 1 -10"
+      pipe.puts "param 0 2 yellow"
+      pipe.puts "param 0 3 ."
+
+      grep(Planet) do |pl|
+        pipe.puts pl.tk_add
+        pipe.puts pl.tk_update
+      end
+    end
+  end
+  
+  def tk_update
+    tkar.update do |pipe|
+      grep(Planet) do |pl|
+        pipe.puts pl.tk_update
+      end
+    end
+  end
+end
+
+class Planet < Component
+  attr_accessor :name, :id, :color
+  constant :size, :mass
+  
+  constant :g => 1.0
+  constant :mass_sun => 1000.0
+  
+  default do
+    @id = world.next_id
+    @name = id
+    @color = "white"
+    self.mass = 1
+    self.size = 1
+  end
+  
+  flow do
+    diff " x'  = vx "
+    diff " y'  = vy "
+    
+    diff " vx' = ax "
+    diff " vy' = ay "
+    
+    alg  " r = hypot(x, y) "
+    alg  " w = -g * (mass_sun + mass) / pow(r, 3) "
+    alg  " ax = w * x "
+    alg  " ay = w * y "
+  end
+
+  # return string that adds an instance of the shape with label t.name,
+  # position based on (x, y), and
+  # rotation based on (x', y')
+  def tk_add
+    "add planet #{id} - 10 #{x} #{y} 0\n" +
+    "param #{id} 0 #{size}\n" +
+    "param #{id} 1 #{-size}\n" +
+    "param #{id} 2 #{color}\n" +
+    "param #{id} 3 #{name}"
+  end
+  
+  # emit string representing current state
+  def tk_update
+    "moveto #{id} #{x} #{y}"
+  end
+end
+
+w = World.new
+w.extend OrbitWorld
+
+w.time_step = 0.1
+
+earth = w.create Planet do |pl|
+  pl.name = "Earth"
+  pl.color = "blue"
+  pl.size = 2
+  pl.mass = 100
+  pl.x = 40
+  pl.y = 0
+  pl.vx = 0
+  pl.vy = 5
+end
+
+ellipto = w.create Planet do |pl|
+  pl.name = "Ellipto"
+  pl.color = "bisque2"
+  pl.size = 2
+  pl.mass = 100
+  pl.x = 80
+  pl.y = 0
+  pl.vx = 0
+  pl.vy = 2
+end
+
+w.evolve 1000 do
+  #p [earth.x, earth.y]
+  w.tk_update
+  #sleep 0.01
+end

data/lib/redshift/redshift.rb

@@ -33,7 +33,7 @@ end
 module RedShift
   include Math
   
-  VERSION = '1.3.19'
+  VERSION = '1.3.20'
 
   Infinity = Math::Infinity
 

data/lib/redshift/target/c/world-gen.rb

@@ -384,6 +384,7 @@ class World
         assert(comp_shdw->world == shadow);
         comp_shdw->world = 0;
         --RARRAY(list)->len;
+        //%% hook_remove_comp(comp_shdw->self);
       }
       inline static double eval_expr(VALUE comp, VALUE expr)
       {

data/lib/redshift/util/tkar-driver.rb

@@ -6,7 +6,7 @@
 class TkarDriver
   # +dragger+ is a callable object that takes (id, x, y) and should
   # move object id to (x,y)
-  def initialize dragger
+  def initialize dragger = nil
     @dragger = dragger
     cmd =
       case RUBY_PLATFORM

data/rakefile

@@ -22,6 +22,7 @@ A framework for simulation of networks of hybrid automata, similar to SHIFT and
 END
 
   depend_on       'cgen'
+  depend_on       'tkar'
 
   history_file    'RELEASE-NOTES'
   changes         File.read(history_file)[/^\w.*?(?=^\w)/m]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redshift
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 1
   - 3
-  - 19
-  version: 1.3.19
+  - 20
+  version: 1.3.20
 platform: ruby
 authors: 
 - Joel VanderWerf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-26 00:00:00 -07:00
+date: 2010-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bones
+  name: tkar
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,7 +63,7 @@ dependencies:
         - 7
         version: 3.4.7
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: |
   A framework for simulation of networks of hybrid automata, similar to SHIFT and Lambda-SHIFT. Includes ruby-based DSL for defining simulation components, and ruby/C code generation and runtime.
 
@@ -95,6 +109,7 @@ files:
 - examples/guard-debugger.rb
 - examples/lotka-volterra.rb
 - examples/modular-component-def.rb
+- examples/orbit.rb
 - examples/pid.rb
 - examples/ports.rb
 - examples/queue.rb