redshift 1.3.24 → 1.3.30

data/lib/redshift/util/isaac.rb

@@ -1,8 +1,8 @@
-require 'redshift/util/isaac/isaac.so'
+require 'isaac'
 
 # Adaptor class to use ISAAC with redshift/util/random distributions.
 # See test/test_flow_trans.rb for an example.
-class ISAACGenerator < ISAAC
+class ISAACGenerator < PRNG::ISAAC
   def initialize(*seeds)
     super()
     if seeds.compact.empty?

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

@@ -2,7 +2,7 @@
 # Depends on:
 #   gem install tkar
 # See also:
-#   http://tkar.rubyforge.org
+#   https://github.com/vjoel/tkar
 class TkarDriver
   # +dragger+ is a callable object that takes (id, x, y) and should
   # move object id to (x,y)

data/test/test.rb

@@ -37,7 +37,7 @@ tests.sort!
 #end
 
 require 'rbconfig'
-ruby = Config::CONFIG["RUBY_INSTALL_NAME"]
+ruby = RbConfig::CONFIG["RUBY_INSTALL_NAME"]
 
 pending = tests.dup
 failed = []

data/test/test_buffer.rb

@@ -7,9 +7,9 @@ RedShift.with_library do |library|
   library.define_buffer
 end
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestBuffer < Test::Unit::TestCase
+class TestBuffer < Minitest::Test
 
   class T < Component
     RedShift.with_library do

data/test/test_connect.rb

@@ -26,9 +26,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestConnect < Test::Unit::TestCase
+class TestConnect < Minitest::Test
 
   def setup
     @world = World.new

data/test/test_connect_parallel.rb

@@ -20,9 +20,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestConnect < Test::Unit::TestCase
+class TestConnect < Minitest::Test
 
   def setup
     @world = World.new

data/test/test_connect_strict.rb

@@ -56,9 +56,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestConnectStrict < Test::Unit::TestCase
+class TestConnectStrict < Minitest::Test
 
   def setup
     @world = SCWorld.new
@@ -114,9 +114,8 @@ class TestConnectStrict < Test::Unit::TestCase
       a.x = a.k = 12.34
     end
     @b.port(:y) << a.port(:x)
-    assert_nothing_raised do
-      @b.port(:y) << a.port(:k)
-    end
+    #assert_nothing_raised
+    @b.port(:y) << a.port(:k)
   end
   
   # One check per step, despite the Dummy

data/test/test_constant.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
@@ -41,9 +39,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestConstant < Test::Unit::TestCase
+class TestConstant < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_delay.rb

@@ -102,9 +102,9 @@ class StateChanger < Component
   end
 end
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestDelay < Test::Unit::TestCase
+class TestDelay < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_derivative.rb

@@ -27,9 +27,9 @@ class DerivativeTestComponent < Component
   end
 end
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestDerivative < Test::Unit::TestCase
+class TestDerivative < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_discrete.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
@@ -561,9 +559,9 @@ test guard phases
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestDiscrete < Test::Unit::TestCase
+class TestDiscrete < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_discrete_isolated.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
@@ -60,9 +58,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestDiscrete < Test::Unit::TestCase
+class TestDiscrete < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_dvector-float.rb

@@ -0,0 +1,110 @@
+require 'redshift/dvector-float/dvector-float'
+require 'minitest/autorun'
+
+DVectorFloat = RedShift::DVectorFloat
+
+class TestDVectorFloat < Minitest::Test
+  def make_dvs n
+    #assert_nothing_thrown do
+    n.times do
+      DVectorFloat.new
+    end
+  end
+
+  def test_gc
+    GC.start
+    n = ObjectSpace.each_object(DVectorFloat){}
+
+    #assert_nothing_thrown
+    make_dvs 100
+    
+    GC.start
+    n2 = ObjectSpace.each_object(DVectorFloat){}
+
+    assert((0..n+1) === n2, "Not in #{0}..#{n+1}: #{n2}")
+  end
+  
+  def test_gc_stress
+    GC.stress = true
+    #assert_nothing_thrown
+    make_dvs 10
+  ensure
+    GC.stress = false
+  end
+  
+  def test_push_pop
+    dv = DVectorFloat.new
+    #assert_nothing_thrown
+    dv.push(1)
+    dv.push(2.567)
+    dv.push(3)
+
+    assert_equal(3, dv.pop)
+    assert_in_delta(2.567, dv.pop, 0.01)
+    assert_equal(1, dv.pop)
+    assert_equal(nil, dv.pop)
+  end
+  
+  def test_each
+    dv = DVectorFloat[1, 2.567, 3]
+    a = []
+    dv.each do |x|
+      a << x
+    end
+    [1,2.567,3].zip a do |x,y|
+      assert_in_delta(x, y, 0.01)
+    end
+  end
+  
+  def test_to_a
+    dv = DVectorFloat[1, 2.567, 3]
+    [1,2.567,3].zip dv.to_a do |x,y|
+      assert_in_delta(x, y, 0.01)
+    end
+  end
+  
+  def test_length
+    dv = DVectorFloat[1, 2.567, 3]
+    assert_equal(3, dv.length)
+    dv = DVectorFloat.new
+    assert_equal(0, dv.length)
+  end
+  
+  def test_equal
+    dv1 = DVectorFloat[1, 2.567, 3]
+    dv2 = DVectorFloat[1, 2.567, 3, 4]
+    assert_equal(false, dv1 == dv2)
+    assert_equal(false, dv1 == [1,2.567,3])
+    assert_equal(false, dv1 == 123)
+    assert_equal(true, dv1 == dv1)
+    assert_equal(true, DVectorFloat.new == DVectorFloat.new)
+    assert_equal(true, DVectorFloat[1] == DVectorFloat[1.0])
+  end
+  
+  def test_eql
+    dv1 = DVectorFloat[1, 2.567, 3]
+    dv2 = DVectorFloat[1, 2.567, 3, 4]
+    assert_equal(false, dv1.eql?(dv2))
+    assert_equal(false, dv1.eql?([1,2.567,3]))
+    assert_equal(false, dv1.eql?(123))
+    assert_equal(true, dv1.eql?(dv1))
+    assert_equal(true, DVectorFloat.new.eql?(DVectorFloat.new))
+  end
+  
+  def test_hash
+    h = {}
+    h[DVectorFloat[1,2.567,3]] = true
+    assert_equal(true, h[DVectorFloat[1,2.567,3]])
+    assert_equal(nil, h[DVectorFloat[1,2.567,3,4]])
+  end
+  
+  def test_dup
+    DVectorFloat[1,2.567,3] == DVectorFloat[1,2.567,3].dup
+  end
+  
+  def test_marshal
+    dv = DVectorFloat[1, 2.567, 3]
+    dv2 = Marshal.load(Marshal.dump(dv))
+    assert_equal(dv.to_a, dv2.to_a)
+  end
+end

data/test/test_dvector.rb

@@ -1,14 +1,13 @@
 require 'redshift/dvector/dvector'
-require 'test/unit'
+require 'minitest/autorun'
 
 DVector = RedShift::DVector
 
-class TestDVector < Test::Unit::TestCase
+class TestDVector < Minitest::Test
   def make_dvs n
-    assert_nothing_thrown do
-      n.times do
-        DVector.new
-      end
+    #assert_nothing_thrown
+    n.times do
+      DVector.new
     end
   end
 
@@ -16,9 +15,8 @@ class TestDVector < Test::Unit::TestCase
     GC.start
     n = ObjectSpace.each_object(DVector){}
 
-    assert_nothing_thrown do
-      make_dvs 100
-    end
+    #assert_nothing_thrown
+    make_dvs 100
     
     GC.start
     n2 = ObjectSpace.each_object(DVector){}
@@ -28,20 +26,20 @@ class TestDVector < Test::Unit::TestCase
   
   def test_gc_stress
     GC.stress = true
-    assert_nothing_thrown do
-      make_dvs 10
-    end
+    #assert_nothing_thrown
+    make_dvs 10
+
   ensure
     GC.stress = false
   end
   
   def test_push_pop
     dv = DVector.new
-    assert_nothing_thrown do
-      dv.push(1)
-      dv.push(2)
-      dv.push(3)
-    end
+    #assert_nothing_thrown
+    dv.push(1)
+    dv.push(2)
+    dv.push(3)
+
     assert_equal(3, dv.pop)
     assert_equal(2, dv.pop)
     assert_equal(1, dv.pop)

data/test/test_exit.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
@@ -33,9 +31,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestExit < Test::Unit::TestCase
+class TestExit < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_flow.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
@@ -188,9 +186,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestFlow < Test::Unit::TestCase
+class TestFlow < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_flow_link.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
@@ -242,9 +240,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestFlow < Test::Unit::TestCase
+class TestFlow < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_flow_sub.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
@@ -54,9 +52,9 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestFlow < Test::Unit::TestCase
+class TestFlow < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_flow_trans.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 require 'redshift/util/random'
 require 'redshift/util/isaac'
@@ -21,7 +19,7 @@ class Flow_Transition_Alg_To_Other < FlowTestComponent
     alg "x=42"
   end
   transition A => B
-  
+
   def assert_consistent test
     if state == B
       test.assert_equal(42, x)
@@ -33,23 +31,23 @@ end
 
 class Flow_Transition < FlowTestComponent
   state :Alg, :Diff, :Euler, :Empty, :Switch
-  
+
   flow Alg, Diff, Euler, Empty do
     diff "t' = 1"
   end
-  
+
   flow Alg do
     alg "x = 10*t"
   end
-  
+
   flow Diff do
     diff "x' = 10"
   end
-  
+
   flow Euler do
     euler "x' = 10"
   end
-  
+
   setup do
     self.x = 0
     @alarm_time = 0
@@ -73,7 +71,7 @@ class Flow_Transition < FlowTestComponent
     puts "  alarm seed = #{@alarm_seq.generator.seeds rescue @alarm_seq.generator.seed}"
     puts "  state seed = #{@state_seq.generator.seeds rescue @state_seq.generator.seed}"
   end
-  
+
   transition Enter => Switch,
              Alg   => Switch, Diff  => Switch,
              Euler => Switch, Empty => Switch do
@@ -91,7 +89,7 @@ class Flow_Transition < FlowTestComponent
       end
     }
   end
-  
+
   transition Switch => Alg do
     guard { @current == Alg }
   end
@@ -104,7 +102,7 @@ class Flow_Transition < FlowTestComponent
   transition Switch => Empty do
     guard { @current == Empty }
   end
-  
+
   transition Empty => Empty do
     guard { t > (@last_empty_t || 0) }
     action {
@@ -112,7 +110,7 @@ class Flow_Transition < FlowTestComponent
       self.x = 10 * t   # manually update x
     }
   end
-  
+
   def assert_consistent test
     # In the alg case, calling the accessor invokes the update method. We want
     # to test that alg flows work even if the update method isn't called.
@@ -124,7 +122,7 @@ class Flow_Transition < FlowTestComponent
         "in #{state.name} after #{t} sec,\n")
     end
   end
-  
+
   def finish test
 #    puts "At finish: t = #{t}, alarm_time = #{@alarm_time}"
   end
@@ -193,9 +191,9 @@ class Flow_AlgebraicAction < FlowTestComponent
   constant :k
   link :other => self
   flow {alg " x = other.y + k "}
-  
+
   @@first = true
-  
+
   setup do
     self.other = self
     if @@first
@@ -203,21 +201,21 @@ class Flow_AlgebraicAction < FlowTestComponent
       @other = create(Flow_AlgebraicAction) {|c| c.y = 5}
     end
   end
-  
+
   transition Enter => Exit do
     action do
       next unless @other
-      
+
       @x_values = []
       @x_values << x
       other.y = 1
       @x_values << x
       other.y = 2
       @x_values << x
-      
+
       self.other = @other
       @x_values << x
-      
+
       self.k = 10
       @x_values << x
     end
@@ -231,20 +229,20 @@ end
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
+
+class TestFlow < Minitest::Test
 
-class TestFlow < Test::Unit::TestCase
-  
   def setup
     @world = World.new
     @world.time_step = 0.01
     @world.zeno_limit = 100
   end
-  
+
   def teardown
     @world = nil
   end
-  
+
   def test_flow
     testers = []
     ObjectSpace.each_object(Class) do |cl|
@@ -253,7 +251,7 @@ class TestFlow < Test::Unit::TestCase
         testers << @world.create(cl)
       end
     end
-    
+
     testers.each { |t| t.assert_consistent self }
     @world.run 1000 do
       testers.each { |t| t.assert_consistent self }