redshift 1.3.17 → 1.3.18

data/lib/redshift/target/c/flow/delay.rb

@@ -21,10 +21,10 @@ module RedShift; class DelayFlow
       tsname      = "#{var_name}_time_step"
       
       cl.class_eval do
-        shadow_attr_accessor bufname    => "Buffer  #{bufname}"
-        shadow_attr_accessor delayname  => "double  #{delayname}"
+        shadow_attr_accessor bufname    => "RSBuffer  #{bufname}"
+        shadow_attr_accessor delayname  => "double    #{delayname}"
           # delay should be set only using the expr designated in :by => "expr"
-        shadow_attr          tsname     => "double  #{tsname}"
+        shadow_attr          tsname     => "double    #{tsname}"
       
         after_commit do
           alias_method "__#{bufname}=", "#{bufname}="
@@ -104,10 +104,10 @@ module RedShift; class DelayFlow
                 #{flow.translate(self, "fill", 0, cl).join("
                 ")};
 
-                buffer_init(&shadow->#{bufname}, len, fill);
+                rs_buffer_init(&shadow->#{bufname}, len, fill);
               }
               else { // # delay != shadow->#{delayname}
-                buffer_resize(&shadow->#{bufname}, len);
+                rs_buffer_resize(&shadow->#{bufname}, len);
               }
               
               shadow->#{delayname} = delay;

data/lib/redshift/target/c/library.rb

@@ -12,7 +12,14 @@ module RedShift
       super
       
       self.purge_source_dir = :delete
-      self.show_times_flag = $REDSHIFT_BUILD_TIMES
+      
+      self.show_times_flag =
+        case $REDSHIFT_BUILD_TIMES
+        when nil, false, /\A(false|0*)\z/i
+          false
+        else
+          true
+        end
 
       if $REDSHIFT_DEBUG
         include_file.include "<assert.h>"
@@ -49,6 +56,10 @@ module RedShift
       end
     end
     
+    def make arg=nil
+      super [$REDSHIFT_MAKE_ARGS, arg].join(" ")
+    end
+    
     def commit
       return if committed?
       precommit

data/lib/redshift/util/histogram.rb

@@ -137,7 +137,7 @@ if __FILE__ == $0
   end
   
   if opts["plot"]
-    require 'sci/plot'
+    require 'redshift/util/plot'
     extend Plot::PlotUtils
     
     gnuplot do |plot|

data/lib/redshift/util/irb-shell.rb

@@ -0,0 +1,81 @@
+require 'irb'
+require 'irb/completion'
+
+# A shell that runs when the user interrupts the main process.
+class IRBShell
+  @@irb_setup_done = false
+  
+  # +args+ are binding, self (both optional)
+  def initialize(*args)
+    ## maybe set some opts here, as in parse_opts in irb/init.rb?
+
+    unless @@irb_setup_done
+      @@irb_setup_done = true
+
+      conf = IRB.conf
+      
+      if File.directory?("tmp")
+        conf[:HISTORY_FILE] = "tmp/.irb_shell_history"
+      else
+        conf[:HISTORY_FILE] = ".irb_shell_history"
+      end
+
+      IRB.setup nil
+      
+      at_exit do
+        IRB.irb_at_exit
+      end
+    end
+
+    workspace = IRB::WorkSpace.new(*args)
+
+    if conf[:SCRIPT] ## normally, set by parse_opts
+      @irb = IRB::Irb.new(workspace, conf[:SCRIPT])
+    else
+      @irb = IRB::Irb.new(workspace)
+    end
+
+    conf[:IRB_RC].call(@irb.context) if conf[:IRB_RC]
+    conf[:MAIN_CONTEXT] = @irb.context
+  end
+  
+  def run
+    @interrupt_requests = nil
+
+    trap("INT") do
+      @irb.signal_handle
+    end
+
+    begin
+      catch(:IRB_EXIT) do
+        @irb.eval_input
+      end
+    ensure
+      install_interrupt_handler
+    end
+  end
+    
+  def install_interrupt_handler
+    unless @interrupt_requests
+      @interrupt_requests = 0
+      trap("INT") do
+        @interrupt_requests += 1
+        if @interrupt_requests == 2
+          puts "\nType one more ^C to abort, or wait for shell."
+        elsif @interrupt_requests >= 3
+          exit!
+        end
+      end
+    end
+  end
+
+  def handle_interrupt after = nil
+    if @interrupt_requests && @interrupt_requests > 0
+      yield if block_given?
+      run
+      true
+    else
+      false
+    end
+  end
+end

data/lib/redshift/util/isaac.rb

@@ -0,0 +1,22 @@
+require 'redshift/util/isaac/isaac.so'
+
+# Adaptor class to use ISAAC with redshift/util/random distributions.
+# See test/test_flow_trans.rb for an example.
+class ISAACGenerator < ISAAC
+  def initialize(*seeds)
+    super()
+    if seeds.compact.empty?
+      if defined?(Random::Sequence.random_seed)
+        seeds = [Random::Sequence.random_seed]
+      else
+        seeds = [rand]
+      end
+    end
+    @seeds = seeds
+    srand(seeds)
+  end
+  
+  attr_reader :seeds
+
+  alias next rand
+end

data/lib/redshift/util/modular.rb

@@ -0,0 +1,48 @@
+# A way to use a class-method-based DSL, like redshift, from within a module.
+# Extend a module M with Modular. Then, use the DSL freely in M, even though M
+# doesn't have the DSL methods. When you include M in some class, it "replays"
+# the class methods. See examples/modular-component-def.rb.
+module Modular
+  def method_missing(meth, *args, &block)
+    (@_modular_saved ||= []) << [meth, args, block, caller]
+  end
+  
+# this would allow unquoted constants, such as state names, but it's a bit
+# too much magic:
+#  def const_missing(c)
+#    c
+#  end
+  
+  def included(m)
+    @_modular_saved && @_modular_saved.each do |meth, args, block, where|
+      begin
+        m.send(meth, *args, &block)
+      rescue => ex
+        ex.set_backtrace where
+        ex.message << " while applying methods from #{self}"
+        raise ex
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+
+  class C # think: Component
+    def self.foo x # think #state, #flow, or #transition
+      p x
+      yield if block_given?
+    end
+  end
+
+  module M
+    extend Modular
+    foo 2 do puts "hi" end # using the DSL
+  end
+
+  class D < C
+    include M
+    foo 3
+  end
+
+end

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

@@ -51,8 +51,7 @@ class TkarDriver
     end
   end
 
-  # :yields: pipe
-  def update
+  def update # :yields: pipe
     return unless @pipe
 
     yield @pipe if block_given?

data/lib/redshift/util/tracer/var.rb

@@ -1,4 +1,4 @@
-require 'sci/tracer/trace'
+require 'redshift/util/tracer/trace'
 
 class Tracer
   # Represents the various options and controls associated with a variable

data/lib/redshift/world.rb

@@ -12,7 +12,8 @@ class World
 
   {
     :Debugger       => "debugger",
-    :ZenoDebugger   => "zeno-debugger"
+    :ZenoDebugger   => "zeno-debugger",
+    :Shell          => "shell"
   }.each {|m,f| autoload(m, "redshift/mixins/#{f}")}
 
   class ComponentList
@@ -38,8 +39,13 @@ class World
     end
     
     def [](idx)
-      warn "#{self.class}#[] is deprecated"
-      to_a[idx] ## very inefficient
+      n = nil
+      summands.each do |enum|
+        n = enum.size
+        return enum[idx] if idx < n
+        idx - n
+      end
+      nil
     end
     
     def clear

data/rakefile

@@ -26,11 +26,19 @@ END
   history_file    'RELEASE-NOTES'
   changes         File.read(history_file)[/^\w.*?(?=^\w)/m]
   rdoc.dir        "rdoc" ## Note: doc dir has original content files
+  rdoc.include    ["README", "RELEASE-NOTES", "ext", "lib"]
+  rdoc.exclude    ["examples", "test", "bench"]
 
   spec.opts << '--color'
-  test.files = Dir["test/test_*.rb"]
+  test.files = [] ## Dir["test/test_*.rb"]
 }
 
+task 'test' do
+  Dir.chdir 'test' do
+    system "./test.rb"
+  end
+end
+
 task 'gem:release' => 'rubyforge:release' # to release to rubyforge as well
 
 task :release => ["rubyforge:release", "rubyforge:doc_release"]

data/test/test.rb

@@ -21,6 +21,12 @@ $REDSHIFT_DEBUG=3 ## what should this be?
 ### have to fix the CLIB_NAME problem before can do this
 ### require 'redshift' ## all the tests will need this anyway
 
+if ARGV.delete("-j2") ## parse better
+  jobs = 2
+else
+  jobs = 1
+end
+
 pat = ARGV.join("|")
 tests = Dir["test_*.rb"].grep(/#{pat}/)
 tests.sort!
@@ -33,17 +39,25 @@ tests.sort!
 require 'rbconfig'
 ruby = Config::CONFIG["RUBY_INSTALL_NAME"]
 
-failed = tests.reject do |file|
-  puts "_"*50 + "\nStarting #{file}...\n"
-  system "#{ruby} #{file}"
-#  pid = fork { ## should use popen3 so we can weed out successful output
-#    $REDSHIFT_CLIB_NAME = file
-#    require 'redshift'
-#    load file
-#  }
-#  Process.waitpid(pid)
+pending = tests.dup
+failed = []
+
+workers = (0...jobs).map do |i|
+  Thread.new do
+    loop do
+      file = pending.shift
+      break unless file
+      puts "_"*50 + "\nStarting #{file}...\n"
+      if not system "#{ruby} #{file}" ## problem with interleaved outputs
+        ## should use popen3 so we can weed out successful output
+        failed << file
+      end
+    end
+  end
 end
 
+workers.each {|w| w.join}
+
 puts "_"*50
 if failed.empty?
   puts "All tests passed."

data/test/test_buffer.rb

@@ -13,7 +13,7 @@ class TestBuffer < Test::Unit::TestCase
 
   class T < Component
     RedShift.with_library do
-      shadow_attr_accessor :b => "Buffer b"
+      shadow_attr_accessor :b => "RSBuffer b"
     end
   end
   

data/test/test_flow_trans.rb

@@ -2,24 +2,7 @@
 
 require 'redshift'
 require 'redshift/util/random'
-### TODO: add pure ruby ISAAC to util
-#require 'isaac'
-
-# Adaptor class to use ISAAC with redshift/util/random distributions.
-#class ISAACGenerator < ISAAC
-#  def initialize(*seeds)
-#    super()
-#    if seeds.compact.empty?
-#      seeds = [Random::Sequence.random_seed]
-#    end
-#    @seeds = seeds
-#    srand(seeds)
-#  end
-#  
-#  attr_reader :seeds
-#
-#  alias next rand
-#end
+require 'redshift/util/isaac'
 
 include RedShift
 
@@ -71,12 +54,12 @@ class Flow_Transition < FlowTestComponent
     self.x = 0
     @alarm_time = 0
     @alarm_seq = Random::Exponential.new(
-      #:generator => ISAACGenerator,
+      :generator => ISAACGenerator,
       :seed => 614822716,
       :mean => 0.5
     )
     @state_seq = Random::Discrete.new(
-      #:generator => ISAACGenerator,
+      :generator => ISAACGenerator,
       :seed => 3871653669, ## doesn't make sense to re-seed the same global gen
       :distrib =>
         {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redshift
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 1
   - 3
-  - 17
-  version: 1.3.17
+  - 18
+  version: 1.3.18
 platform: ruby
 authors: 
 - Joel VanderWerf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -07:00
+date: 2010-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 87
         segments: 
         - 0
-        version: "0"
+        - 16
+        - 4
+        version: 0.16.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 3
         - 4
-        - 6
-        version: 3.4.6
+        - 7
+        version: 3.4.7
   type: :development
   version_requirements: *id002
 description: |
@@ -54,11 +56,14 @@ description: |
 email: vjoel@users.sourceforge.net
 executables: []
 
-extensions: []
-
-extra_rdoc_files: []
-
+extensions: 
+- ext/redshift/buffer/extconf.rb
+- ext/redshift/util/isaac/extconf.rb
+extra_rdoc_files: 
+- README
+- RELEASE-NOTES
 files: 
+- .bnsignore
 - .gitignore
 - README
 - RELEASE-NOTES
@@ -89,11 +94,21 @@ files:
 - examples/external-lib.rb
 - examples/guard-debugger.rb
 - examples/lotka-volterra.rb
+- examples/modular-component-def.rb
 - examples/pid.rb
 - examples/ports.rb
 - examples/queue.rb
 - examples/queue2.rb
 - examples/reset-with-event-val.rb
+- examples/robots/README
+- examples/robots/lib/base.rb
+- examples/robots/lib/explosion.rb
+- examples/robots/lib/missile.rb
+- examples/robots/lib/radar.rb
+- examples/robots/lib/robot.rb
+- examples/robots/lib/shell-world.rb
+- examples/robots/lib/tracker.rb
+- examples/robots/robots.rb
 - examples/scheduler.rb
 - examples/set-dest.rb
 - examples/shell.rb
@@ -108,10 +123,25 @@ files:
 - examples/sync.rb
 - examples/thermostat.rb
 - examples/zeno.rb
+- ext/redshift/buffer/Makefile
+- ext/redshift/buffer/buffer.c
+- ext/redshift/buffer/buffer.h
+- ext/redshift/buffer/buffer.o
+- ext/redshift/buffer/buffer.so
+- ext/redshift/buffer/dir.rb
+- ext/redshift/buffer/extconf.rb
+- ext/redshift/util/isaac/Makefile
+- ext/redshift/util/isaac/extconf.rb
+- ext/redshift/util/isaac/isaac.c
+- ext/redshift/util/isaac/isaac.o
+- ext/redshift/util/isaac/isaac.so
+- ext/redshift/util/isaac/rand.c
+- ext/redshift/util/isaac/rand.h
+- ext/redshift/util/isaac/rand.o
 - lib/redshift.rb
 - lib/redshift/component.rb
 - lib/redshift/meta.rb
-- lib/redshift/mixins/irb-shell.rb
+- lib/redshift/mixins/shell.rb
 - lib/redshift/mixins/zeno-debugger.rb
 - lib/redshift/port.rb
 - lib/redshift/queue.rb
@@ -134,6 +164,9 @@ files:
 - lib/redshift/util/accessible-index.rb
 - lib/redshift/util/argos.rb
 - lib/redshift/util/histogram.rb
+- lib/redshift/util/irb-shell.rb
+- lib/redshift/util/isaac.rb
+- lib/redshift/util/modular.rb
 - lib/redshift/util/object-diff.rb
 - lib/redshift/util/plot.rb
 - lib/redshift/util/random.rb
@@ -186,6 +219,7 @@ rdoc_options:
 - README
 require_paths: 
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -211,35 +245,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simulation of hybrid automata
-test_files: 
-- test/test_setup.rb
-- test/test_inherit_link.rb
-- test/test_discrete_isolated.rb
-- test/test_connect_strict.rb
-- test/test_buffer.rb
-- test/test_world.rb
-- test/test_flow_link.rb
-- test/test_reset.rb
-- test/test_inherit_flow.rb
-- test/test_connect.rb
-- test/test_inherit_state.rb
-- test/test_flow_trans.rb
-- test/test_delay.rb
-- test/test_strict_reset_error.rb
-- test/test_flow.rb
-- test/test_derivative.rb
-- test/test_inherit.rb
-- test/test_inherit_transition.rb
-- test/test_connect_parallel.rb
-- test/test_queue_alone.rb
-- test/test_exit.rb
-- test/test_discrete.rb
-- test/test_strictness_error.rb
-- test/test_sync.rb
-- test/test_queue.rb
-- test/test_flow_sub.rb
-- test/test_inherit_setup.rb
-- test/test_numerics.rb
-- test/test_strict_continuity.rb
-- test/test_constant.rb
-- test/test_inherit_event.rb
+test_files: []
+