redshift 1.3.22 → 1.3.23

data/lib/redshift/util/isaac.rb

@@ -6,8 +6,8 @@ class ISAACGenerator < ISAAC
   def initialize(*seeds)
     super()
     if seeds.compact.empty?
-      if defined?(Random::Sequence.random_seed)
-        seeds = [Random::Sequence.random_seed]
+      if defined?(RandomDistribution::Sequence.random_seed)
+        seeds = [RandomDistribution::Sequence.random_seed]
       else
         seeds = [rand]
       end

data/lib/redshift/util/random.rb

@@ -1,4 +1,4 @@
-module Random
+module RandomDistribution
 
   # Base class for sequences that sample different kinds of distributions.
   # The actual PRNG must be plugged in at initialization, or else ruby's

data/lib/redshift/world.rb

@@ -1,4 +1,5 @@
 require 'pstore'
+require 'redshift/dvector/dvector'
 
 module RedShift
 
@@ -94,12 +95,16 @@ class World
   # Can override the options using assignments in the block.
   # Note that clock_start should not be assigned after the block.
   def initialize # :yields: world
-    self.curr_A = []; self.curr_P = []; self.curr_CR = []
-    self.curr_S = []; self.next_S = []; self.curr_T = []
-    self.active_E = []; self.prev_active_E = []
-    self.awake = []; self.prev_awake = []
-    self.strict_sleep = []; self.inert = []
-    self.diff_list = []; self.queue_sleep = {}
+    dv_vars = %w{
+      curr_A curr_P curr_CR curr_S next_S curr_T
+      active_E prev_active_E awake prev_awake
+      strict_sleep inert diff_list
+    }
+    dv_vars.each do |var|
+      send "#{var}=", DVector[]
+    end
+    
+    self.queue_sleep = {}
     @components = ComponentList.new  \
       awake, prev_awake, curr_T, strict_sleep, inert # _not_ diff_list
 

data/test/test_discrete.rb

@@ -578,7 +578,7 @@ class TestDiscrete < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= DiscreteTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_discrete_isolated.rb

@@ -77,7 +77,7 @@ class TestDiscrete < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= DiscreteIsolatedTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         world = World.new
         world.time_step = 0.1
         testers << [world, world.create(cl)]

data/test/test_dvector.rb

@@ -0,0 +1,110 @@
+require 'redshift/dvector/dvector'
+require 'test/unit'
+
+DVector = RedShift::DVector
+
+class TestDVector < Test::Unit::TestCase
+  def make_dvs n
+    assert_nothing_thrown do
+      n.times do
+        DVector.new
+      end
+    end
+  end
+
+  def test_gc
+    GC.start
+    n = ObjectSpace.each_object(DVector){}
+
+    assert_nothing_thrown do
+      make_dvs 100
+    end
+    
+    GC.start
+    n2 = ObjectSpace.each_object(DVector){}
+
+    assert((0..n+1) === n2, "Not in #{0}..#{n+1}: #{n2}")
+  end
+  
+  def test_gc_stress
+    GC.stress = true
+    assert_nothing_thrown do
+      make_dvs 10
+    end
+  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_equal(3, dv.pop)
+    assert_equal(2, dv.pop)
+    assert_equal(1, dv.pop)
+    assert_equal(nil, dv.pop)
+  end
+  
+  def test_each
+    dv = DVector[1, 2, 3]
+    a = []
+    dv.each do |x|
+      a << x
+    end
+    assert_equal([1,2,3], a)
+  end
+  
+  def test_to_a
+    dv = DVector[1, 2, 3]
+    assert_equal([1,2,3], dv.to_a)
+  end
+  
+  def test_length
+    dv = DVector[1, 2, 3]
+    assert_equal(3, dv.length)
+    dv = DVector.new
+    assert_equal(0, dv.length)
+  end
+  
+  def test_equal
+    dv1 = DVector[1, 2, 3]
+    dv2 = DVector[1, 2, 3, 4]
+    assert_equal(false, dv1 == dv2)
+    assert_equal(false, dv1 == [1,2,3])
+    assert_equal(false, dv1 == 123)
+    assert_equal(true, dv1 == dv1)
+    assert_equal(true, DVector.new == DVector.new)
+    assert_equal(true, DVector[1] == DVector[1.0])
+  end
+  
+  def test_eql
+    dv1 = DVector[1, 2, 3]
+    dv2 = DVector[1, 2, 3, 4]
+    assert_equal(false, dv1.eql?(dv2))
+    assert_equal(false, dv1.eql?([1,2,3]))
+    assert_equal(false, dv1.eql?(123))
+    assert_equal(true, dv1.eql?(dv1))
+    assert_equal(true, DVector.new.eql?(DVector.new))
+    assert_equal(false, DVector[1].eql?(DVector[1.0]))
+  end
+  
+  def test_hash
+    h = {}
+    h[DVector[1,2,3]] = true
+    assert_equal(true, h[DVector[1,2,3]])
+    assert_equal(nil, h[DVector[1,2,3,4]])
+  end
+  
+  def test_dup
+    DVector[1,2,3] == DVector[1,2,3].dup
+  end
+  
+  def test_marshal
+    dv = DVector[1, 2, 3]
+    dv2 = Marshal.load(Marshal.dump(dv))
+    assert_equal(dv.to_a, dv2.to_a)
+  end
+end

data/test/test_flow.rb

@@ -206,7 +206,7 @@ class TestFlow < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= FlowTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_flow_link.rb

@@ -260,7 +260,7 @@ class TestFlow < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= FlowTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_flow_sub.rb

@@ -72,7 +72,7 @@ class TestFlow < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= FlowTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_flow_trans.rb

@@ -53,12 +53,12 @@ class Flow_Transition < FlowTestComponent
   setup do
     self.x = 0
     @alarm_time = 0
-    @alarm_seq = Random::Exponential.new(
+    @alarm_seq = RandomDistribution::Exponential.new(
       :generator => ISAACGenerator,
       :seed => 614822716,
       :mean => 0.5
     )
-    @state_seq = Random::Discrete.new(
+    @state_seq = RandomDistribution::Discrete.new(
       :generator => ISAACGenerator,
       :seed => 3871653669, ## doesn't make sense to re-seed the same global gen
       :distrib =>
@@ -249,7 +249,7 @@ class TestFlow < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= FlowTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_inherit_event.rb

@@ -60,7 +60,7 @@ class TestInheritEvent < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= EventTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_inherit_flow.rb

@@ -127,7 +127,7 @@ class TestInheritFlow < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= FlowTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_inherit_link.rb

@@ -53,7 +53,7 @@ class TestInheritLink < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= LinkTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_inherit_state.rb

@@ -52,7 +52,7 @@ class TestInheritState < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= StateTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_inherit_transition.rb

@@ -148,7 +148,7 @@ class TestInheritTrans < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= TransTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_setup.rb

@@ -107,7 +107,7 @@ class TestSetup < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= SetupTestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl) { |tester| tester.x = 1 }
       end
     end

data/test/test_strict_continuity.rb

@@ -364,7 +364,7 @@ class TestStrictContinuity < Test::Unit::TestCase
     testers = []
     ObjectSpace.each_object(Class) do |cl|
       if cl <= TestComponent and
-         cl.instance_methods.include? "assert_consistent"
+         cl.instance_methods.grep(/^assert_consistent$/).size > 0
         testers << @world.create(cl)
       end
     end

data/test/test_world.rb

@@ -94,7 +94,7 @@ end
 # test create and remove
 
 puts "World#remove TEST DISABLED **************************"
-if false && World.instance_methods.include?("remove")
+if false && World.instance_methods.grep(/^remove$/).size > 0
   class World_3 < World
     setup do @x = create(Component) end
     def run
@@ -292,9 +292,9 @@ class TestWorld < Test::Unit::TestCase
   def test_world
     testers = []
     ObjectSpace.each_object(Class) do |cl|
-      if cl <= World and ## cl.instance_methods.grep /\Aassert_consistent/
-         (cl.instance_methods.include? "assert_consistent_before" or
-          cl.instance_methods.include? "assert_consistent_after")
+      if cl <= World and
+         cl.instance_methods.grep(
+           /^assert_consistent_(?:before|after)$/).size > 0
         testers << cl.new
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redshift
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 3
-  - 22
-  version: 1.3.22
+  - 23
+  version: 1.3.23
 platform: ruby
 authors: 
 - Joel VanderWerf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -07:00
+date: 2010-08-17 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: 81
         segments: 
         - 0
-        version: "0"
+        - 16
+        - 7
+        version: 0.16.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,10 +42,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 117
         segments: 
         - 0
-        version: "0"
+        - 63
+        version: "0.63"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -70,17 +73,22 @@ executables: []
 
 extensions: 
 - ext/redshift/buffer/extconf.rb
+- ext/redshift/dvector/extconf.rb
 - ext/redshift/util/isaac/extconf.rb
 extra_rdoc_files: 
 - README
 - RELEASE-NOTES
 files: 
+- .bnsignore
 - .gitignore
 - README
 - RELEASE-NOTES
 - TODO
 - bench/alg-state.rb
 - bench/algebraic.rb
+- bench/aug17-ruby19.bench
+- bench/aug17.bench
+- bench/aug7.bench
 - bench/bench
 - bench/bench.rb
 - bench/connect.rb
@@ -92,6 +100,7 @@ files:
 - bench/half-strict.rb
 - bench/inertness.rb
 - bench/linked-flows.rb
+- bench/prof.html
 - bench/queues.rb
 - bench/run
 - bench/simple.rb
@@ -143,6 +152,10 @@ files:
 - ext/redshift/buffer/buffer.h
 - ext/redshift/buffer/dir.rb
 - ext/redshift/buffer/extconf.rb
+- ext/redshift/dvector/dvector.c
+- ext/redshift/dvector/dvector.h
+- ext/redshift/dvector/dvector.rb
+- ext/redshift/dvector/extconf.rb
 - ext/redshift/util/isaac/extconf.rb
 - ext/redshift/util/isaac/isaac.c
 - ext/redshift/util/isaac/rand.c
@@ -196,6 +209,7 @@ files:
 - test/test_derivative.rb
 - test/test_discrete.rb
 - test/test_discrete_isolated.rb
+- test/test_dvector.rb
 - test/test_exit.rb
 - test/test_flow.rb
 - test/test_flow_link.rb