redshift 1.3.26 → 1.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6efe4898ea37d2d69e2bf76b09c1a8f21a49f5e1
-  data.tar.gz: f49ba364d83aeab669be50e244c09a49499e600c
+  metadata.gz: f9ca8372d265e9b730e14c976f1765a906181e2b
+  data.tar.gz: d7b22f9a9286357acad7ab342ad5ff8d446ad3bf
 SHA512:
-  metadata.gz: 6116140716bae7b6b7555d714aac7d3f3d7f62c04583f1da0128c17303449fc254342ad7857757ae65503bae44f96df031054c176dd7a4a7307b5c164a90653c
-  data.tar.gz: 442f564bc09f72a30b8914e8e32b5bb124fee97b0abffb50f932001c1c0ed011e3d1ceb6304817861f1c7de8e7bca84187aac23ea64048d8b6310c556e57aac3
+  metadata.gz: 3150e6a90aea209e06408c12c8c4b5ae400d94737289a294e16c439c26c20dc72defba138b4a3cdc9b2eb21aee7046de82bd2bd281bc0049ea412265f3f58be0
+  data.tar.gz: 88b2d5634395f0423f6464398206ad235749b472f6e3a1c0396bcfc3d2a48892fde88adcddf5d7a2a681264accd3d2426ecea486f57064d5d6411ebd82c89118

data/RELEASE-NOTES

@@ -1,3 +1,9 @@
+redshift 1.3.27
+
+- cleanup
+- use minitest
+- remove local isaac ext and depend on prng-isaac gem instead
+
 redshift 1.3.26
 
 - updated to ruby 2.0

data/Rakefile

@@ -0,0 +1,26 @@
+require 'rake'
+
+def cur_ruby
+  require 'rbconfig'
+  @cur_ruby ||= RbConfig::CONFIG["RUBY_INSTALL_NAME"]
+end
+
+desc "Run unit tests"
+task :test do |t|
+  sh "cd test && RUBYLIB=../lib:../ext:$RUBYLIB ./test.rb"
+end
+
+desc "build extensions for current ruby: #{RUBY_VERSION}"
+task :build_ext do
+  require 'find'
+  Find.find('ext/redshift') do |f|
+    next unless File.basename(f) == "extconf.rb"
+    d = File.dirname(f)
+    Dir.chdir d do
+      sh "make distclean || true"
+      ruby "extconf.rb"
+      sh "make"
+    end
+  end
+end
+

data/lib/redshift/redshift.rb

@@ -70,7 +70,7 @@ end
 module RedShift
   include Math
   
-  VERSION = '1.3.25'
+  VERSION = '1.3.27'
 
   Infinity = Math::Infinity
 

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/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

@@ -1,14 +1,13 @@
 require 'redshift/dvector-float/dvector-float'
-require 'test/unit'
+require 'minitest/autorun'
 
 DVectorFloat = RedShift::DVectorFloat
 
-class TestDVectorFloat < Test::Unit::TestCase
+class TestDVectorFloat < Minitest::Test
   def make_dvs n
-    assert_nothing_thrown do
-      n.times do
-        DVectorFloat.new
-      end
+    #assert_nothing_thrown do
+    n.times do
+      DVectorFloat.new
     end
   end
 
@@ -16,9 +15,8 @@ class TestDVectorFloat < Test::Unit::TestCase
     GC.start
     n = ObjectSpace.each_object(DVectorFloat){}
 
-    assert_nothing_thrown do
-      make_dvs 100
-    end
+    #assert_nothing_thrown
+    make_dvs 100
     
     GC.start
     n2 = ObjectSpace.each_object(DVectorFloat){}
@@ -28,20 +26,19 @@ class TestDVectorFloat < 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 = DVectorFloat.new
-    assert_nothing_thrown do
-      dv.push(1)
-      dv.push(2.567)
-      dv.push(3)
-    end
+    #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)

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'
@@ -231,9 +229,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_inherit.rb

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

data/test/test_inherit_event.rb

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

data/test/test_inherit_flow.rb

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

data/test/test_inherit_link.rb

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

data/test/test_inherit_setup.rb

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

data/test/test_inherit_state.rb

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

data/test/test_inherit_transition.rb

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

data/test/test_numerics.rb

@@ -1,8 +1,6 @@
-#!/usr/bin/env ruby
-
 require 'mathn' # Use rationals for 1/2 etc.
 
-require 'test/unit'
+require 'minitest/autorun'
 
 require 'redshift'
 
@@ -13,7 +11,7 @@ class Timer < Component
   flow { diff " x' = 1 " }
 end
 
-class TestNumerics < Test::Unit::TestCase
+class TestNumerics < Minitest::Test
   
   def setup
     @world = World.new

data/test/test_queue.rb

@@ -1,7 +1,7 @@
 require 'redshift'
-require 'test/unit'
+require 'minitest/autorun'
 
-class TestQueue < Test::Unit::TestCase
+class TestQueue < Minitest::Test
   class Receiver < RedShift::Component
     queue :q
     transition Enter => Exit do
@@ -37,7 +37,7 @@ class TestQueue < Test::Unit::TestCase
   end
 end
 
-class TestQueueAndStrict < Test::Unit::TestCase
+class TestQueueAndStrict < Minitest::Test
   class Receiver < RedShift::Component
     queue :q
     strictly_continuous :x

data/test/test_queue_alone.rb

@@ -1,9 +1,9 @@
 require 'redshift/queue'
-require 'test/unit'
+require 'minitest/autorun'
 
 # Test queue class outside of simulation using mocked World and
 # Component classes.
-class TestQueueAlone < Test::Unit::TestCase
+class TestQueueAlone < Minitest::Test
   class World
     attr_accessor :step_count, :discrete_step
   end

data/test/test_reset.rb

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

data/test/test_setup.rb

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

data/test/test_strict_continuity.rb

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

data/test/test_strict_reset_error.rb

@@ -1,14 +1,12 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
 
-require 'test/unit'
+require 'minitest/autorun'
 
 # See also test_strict_continuity.rb.
 
-class TestStrictnessError < Test::Unit::TestCase
+class TestStrictnessError < Minitest::Test
 
   class T < Component
 

data/test/test_strictness_error.rb

@@ -1,14 +1,12 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
 
-require 'test/unit'
+require 'minitest/autorun'
 
 # See also test_strict_continuity.rb.
 
-class TestStrictnessError < Test::Unit::TestCase
+class TestStrictnessError < Minitest::Test
 
   class T < Component
 

data/test/test_sync.rb

@@ -4,7 +4,7 @@
 # test chains of symmetric sync
 
 require 'redshift'
-require 'test/unit'
+require 'minitest/autorun'
 
 class DebugSyncWorld #< RedShift::World
   def hook_begin
@@ -25,7 +25,7 @@ class DebugSyncWorld #< RedShift::World
   end
 end
 
-class TestSync < Test::Unit::TestCase
+class TestSync < Minitest::Test
   class Relay < RedShift::Component
     link :next
     

data/test/test_world.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'redshift'
 
 include RedShift
@@ -285,9 +283,9 @@ tests:
 
 #-----#
 
-require 'test/unit'
+require 'minitest/autorun'
   
-class TestWorld < Test::Unit::TestCase
+class TestWorld < Minitest::Test
   
   def test_world
     testers = []

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: redshift
 version: !ruby/object:Gem::Version
-  version: 1.3.26
+  version: 1.3.27
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
-dependencies: []
+date: 2013-06-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cgen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tkar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: prng-isaac
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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.
@@ -18,11 +60,11 @@ executables: []
 extensions:
 - ext/redshift/buffer/extconf.rb
 - ext/redshift/dvector/extconf.rb
-- ext/redshift/util/isaac/extconf.rb
 extra_rdoc_files:
 - README.md
 - RELEASE-NOTES
 files:
+- Rakefile
 - README.md
 - RELEASE-NOTES
 - bench/bench
@@ -87,18 +129,14 @@ files:
 - examples/simulink/README
 - ext/redshift/dvector/dvector.c
 - ext/redshift/buffer/buffer.c
-- ext/redshift/util/isaac/isaac.c
-- ext/redshift/util/isaac/rand.c
 - ext/redshift/dvector-float/dvector-float.c
 - ext/redshift/dvector/dvector.h
 - ext/redshift/buffer/buffer.h
-- ext/redshift/util/isaac/rand.h
 - ext/redshift/dvector-float/dvector-float.h
 - ext/redshift/dvector/dvector.rb
 - ext/redshift/dvector/extconf.rb
 - ext/redshift/buffer/dir.rb
 - ext/redshift/buffer/extconf.rb
-- ext/redshift/util/isaac/extconf.rb
 - ext/redshift/dvector-float/dvector-float.rb
 - ext/redshift/dvector-float/extconf.rb
 - lib/redshift/state.rb
@@ -185,6 +223,8 @@ rdoc_options:
 - CGenerator
 - --main
 - README.md
+- --output
+- rdoc
 require_paths:
 - lib
 - ext
@@ -205,3 +245,4 @@ signing_key:
 specification_version: 4
 summary: Simulation of hybrid automata
 test_files: []
+has_rdoc: 

data/ext/redshift/util/isaac/extconf.rb

@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile 'isaac'

data/ext/redshift/util/isaac/isaac.c

@@ -1,129 +0,0 @@
-#include "ruby.h"
-#include "rand.h"
-
-#ifndef min
-# define min(a,b) (((a)<(b)) ? (a) : (b))
-#endif /* min */
-
-static VALUE
-ISAAC_s_allocate(VALUE klass)
-{
-    randctx *ctx;
-
-    return Data_Make_Struct(klass, randctx, NULL, NULL, ctx);
-}
-
-/*
- * Seed the generator with an array of up to ISAAC::RANDSIZ integers in the
- * range 0..2**32-1. More entries are ignored. Missing entries are treated
- * as 0. Returns +nil+.
- */
-static VALUE
-ISAAC_srand(VALUE self, VALUE ary)
-{
-    int i;
-    randctx *ctx;
-
-    Check_Type(ary, T_ARRAY);
-    
-    Data_Get_Struct(self, randctx, ctx);
-    
-    MEMZERO(ctx, randctx, 1);
-    for (i=min(RANDSIZ, RARRAY_LEN(ary))-1; i>=0; i--) {
-        ctx->randrsl[i] = NUM2UINT(RARRAY_PTR(ary)[i]);
-    }
-    rs_isaac_init(ctx, 1);
-
-    return Qnil;
-}
-
-/*
- * Return a random integer in the range 0..2**32-1.
- */
-static VALUE
-ISAAC_rand32(VALUE self)
-{
-    randctx *ctx;
-
-    Data_Get_Struct(self, randctx, ctx);
-
-    if (!ctx->randcnt--) {
-        rs_isaac_rand(ctx);
-        ctx->randcnt=RANDSIZ-1;
-    }
-    
-    return UINT2NUM(ctx->randrsl[ctx->randcnt]);
-}
-
-/*
- * Return a random float in the range 0..1.
- */
-static VALUE
-ISAAC_rand(VALUE self)
-{
-    randctx *ctx;
-
-    Data_Get_Struct(self, randctx, ctx);
-
-    if (!ctx->randcnt--) {
-        rs_isaac_rand(ctx);
-        ctx->randcnt=RANDSIZ-1;
-    }
-    
-    return rb_float_new(ctx->randrsl[ctx->randcnt] / 4294967295.0);
-}
-
-/* :nodoc: */
-static VALUE
-ISAAC_marshal_dump(VALUE self)
-{
-    randctx *ctx;
-    int i;
-    int ary_size = sizeof(randctx)/sizeof(ub4);
-    VALUE ary;
-
-    Data_Get_Struct(self, randctx, ctx);
-    
-    ary = rb_ary_new2(ary_size);
-    for (i = 0; i < ary_size; i++) {
-        rb_ary_push(ary, UINT2NUM(((ub4 *)ctx)[i]));
-    }
-    
-    return ary;
-}
-
-/* :nodoc: */
-static VALUE
-ISAAC_marshal_load(VALUE self, VALUE ary)
-{
-    randctx *ctx;
-    int i;
-    int ary_size = sizeof(randctx)/sizeof(ub4);
-
-    Data_Get_Struct(self, randctx, ctx);
-
-    if (RARRAY_LEN(ary) != ary_size)
-        rb_raise(rb_eArgError, "bad length in loaded ISAAC data");
-
-    for (i = 0; i < ary_size; i++) {
-        ((ub4 *)ctx)[i] = NUM2UINT(RARRAY_PTR(ary)[i]);
-    }
-    
-    return self;
-}
-
-void
-Init_isaac()
-{
-    VALUE ISAAC;
-
-    ISAAC = rb_define_class("ISAAC", rb_cObject);
-    rb_define_alloc_func(ISAAC, ISAAC_s_allocate);
-    rb_define_method(ISAAC, "srand", ISAAC_srand, 1);
-    rb_define_method(ISAAC, "rand32", ISAAC_rand32, 0);
-    rb_define_method(ISAAC, "rand", ISAAC_rand, 0);
-    rb_define_method(ISAAC, "marshal_dump", ISAAC_marshal_dump, 0);
-    rb_define_method(ISAAC, "marshal_load", ISAAC_marshal_load, 1);
-    
-    rb_const_set(ISAAC, rb_intern("RANDSIZ"), UINT2NUM(RANDSIZ));
-}

data/ext/redshift/util/isaac/rand.c

@@ -1,140 +0,0 @@
-/*
-------------------------------------------------------------------------------
-rand.c: By Bob Jenkins.  My random number generator, ISAAC.  Public Domain.
-MODIFIED:
-  960327: Creation (addition of randinit, really)
-  970719: use context, not global variables, for internal state
-  980324: added main (ifdef'ed out), also rearranged randinit()
-  010626: Note that this is public domain
-  
-ADAPTED Aug2004 for use in Ruby by Joel VanderWerf
-ADAPTED Jan2010 for 64 bit systems (same algorithm and results as 32 bit)
-ADAPTED Jun2010 for use within the redshift project
-------------------------------------------------------------------------------
-*/
-#ifndef RAND
-#include "rand.h"
-#endif
-
-
-#define ind(mm,x)  ((mm)[(x>>2)&(RANDSIZ-1)])
-#define rngstep(mix,a,b,mm,m,m2,r,x) \
-{ \
-  x = *m;  \
-  a = ((a^(mix)) + *(m2++)); \
-  *(m++) = y = (ind(mm,x) + a + b); \
-  *(r++) = b = (ind(mm,y>>RANDSIZL) + x); \
-}
-
-void rs_isaac_rand(ctx)
-randctx *ctx;
-{
-   register ub4 a,b,x,y,*m,*mm,*m2,*r,*mend;
-   mm=ctx->randmem; r=ctx->randrsl;
-   a = ctx->randa; b = (ctx->randb + (++ctx->randc));
-   for (m = mm, mend = m2 = m+(RANDSIZ/2); m<mend; )
-   {
-      rngstep( a<<13, a, b, mm, m, m2, r, x);
-      rngstep( a>>6 , a, b, mm, m, m2, r, x);
-      rngstep( a<<2 , a, b, mm, m, m2, r, x);
-      rngstep( a>>16, a, b, mm, m, m2, r, x);
-   }
-   for (m2 = mm; m2<mend; )
-   {
-      rngstep( a<<13, a, b, mm, m, m2, r, x);
-      rngstep( a>>6 , a, b, mm, m, m2, r, x);
-      rngstep( a<<2 , a, b, mm, m, m2, r, x);
-      rngstep( a>>16, a, b, mm, m, m2, r, x);
-   }
-   ctx->randb = b; ctx->randa = a;
-}
-
-
-#define mix(a,b,c,d,e,f,g,h) \
-{ \
-   a^=b<<11; d+=a; b+=c; \
-   b^=c>>2;  e+=b; c+=d; \
-   c^=d<<8;  f+=c; d+=e; \
-   d^=e>>16; g+=d; e+=f; \
-   e^=f<<10; h+=e; f+=g; \
-   f^=g>>4;  a+=f; g+=h; \
-   g^=h<<8;  b+=g; h+=a; \
-   h^=a>>9;  c+=h; a+=b; \
-}
-
-/* if (flag==TRUE), then use the contents of randrsl[] to initialize mm[]. */
-void rs_isaac_init(ctx, flag)
-randctx *ctx;
-int     flag;
-{
-   int i;
-   ub4 a,b,c,d,e,f,g,h;
-   ub4 *m,*r;
-   ctx->randa = ctx->randb = ctx->randc = 0;
-   m=ctx->randmem;
-   r=ctx->randrsl;
-   a=b=c=d=e=f=g=h=0x9e3779b9;  /* the golden ratio */
-
-   for (i=0; i<4; ++i)          /* scramble it */
-   {
-     mix(a,b,c,d,e,f,g,h);
-   }
-
-   if (flag) 
-   {
-     /* initialize using the contents of r[] as the seed */
-     for (i=0; i<RANDSIZ; i+=8)
-     {
-       a+=r[i  ]; b+=r[i+1]; c+=r[i+2]; d+=r[i+3];
-       e+=r[i+4]; f+=r[i+5]; g+=r[i+6]; h+=r[i+7];
-       mix(a,b,c,d,e,f,g,h);
-       m[i  ]=a; m[i+1]=b; m[i+2]=c; m[i+3]=d;
-       m[i+4]=e; m[i+5]=f; m[i+6]=g; m[i+7]=h;
-     }
-     /* do a second pass to make all of the seed affect all of m */
-     for (i=0; i<RANDSIZ; i+=8)
-     {
-       a+=m[i  ]; b+=m[i+1]; c+=m[i+2]; d+=m[i+3];
-       e+=m[i+4]; f+=m[i+5]; g+=m[i+6]; h+=m[i+7];
-       mix(a,b,c,d,e,f,g,h);
-       m[i  ]=a; m[i+1]=b; m[i+2]=c; m[i+3]=d;
-       m[i+4]=e; m[i+5]=f; m[i+6]=g; m[i+7]=h;
-     }
-   }
-   else
-   {
-     /* fill in mm[] with messy stuff */
-     for (i=0; i<RANDSIZ; i+=8)
-     {
-       mix(a,b,c,d,e,f,g,h);
-       m[i  ]=a; m[i+1]=b; m[i+2]=c; m[i+3]=d;
-       m[i+4]=e; m[i+5]=f; m[i+6]=g; m[i+7]=h;
-     }
-   }
-
-   rs_isaac_rand(ctx);            /* fill in the first set of results */
-   ctx->randcnt=RANDSIZ;  /* prepare to use the first set of results */
-}
-
-
-#ifdef NEVER
-#include <stdio.h>
-
-int main()
-{
-  ub4 i,j;
-  randctx ctx;
-  ctx.randa=ctx.randb=ctx.randc=(ub4)0;
-  for (i=0; i<RANDSIZ; ++i) ctx.randrsl[i]=(ub4)0;
-  rs_isaac_init(&ctx, 1);
-  for (i=0; i<2; ++i)
-  {
-    rs_isaac_rand(&ctx);
-    for (j=0; j<RANDSIZ; ++j)
-    {
-      printf("%.8lx",(long unsigned int)ctx.randrsl[j]);
-      if ((j&7)==7) printf("\n");
-    }
-  }
-}
-#endif

data/ext/redshift/util/isaac/rand.h

@@ -1,61 +0,0 @@
-/*
-------------------------------------------------------------------------------
-rand.h: definitions for a random number generator
-By Bob Jenkins, 1996, Public Domain
-MODIFIED:
-  960327: Creation (addition of randinit, really)
-  970719: use context, not global variables, for internal state
-  980324: renamed seed to flag
-  980605: recommend RANDSIZL=4 for noncryptography.
-  010626: note this is public domain
-
-ADAPTED Aug2004 for use in Ruby by Joel VanderWerf
-ADAPTED Jan2010 for 64 bit systems (same algorithm and results as 32 bit)
-ADAPTED Jun2010 for use within the redshift project
-------------------------------------------------------------------------------
-*/
-
-#include <stdint.h>
-
-typedef uint32_t ub4;
-
-#ifndef RAND
-#define RAND
-#define RANDSIZL   (8)  /* I recommend 8 for crypto, 4 for simulations */
-#define RANDSIZ    (1<<RANDSIZL)
-
-/* context of random number generator */
-struct randctx
-{
-  ub4 randcnt;
-  ub4 randrsl[RANDSIZ];
-  ub4 randmem[RANDSIZ];
-  ub4 randa;
-  ub4 randb;
-  ub4 randc;
-};
-typedef  struct randctx  randctx;
-
-/*
-------------------------------------------------------------------------------
- If (flag==TRUE), then use the contents of randrsl[0..RANDSIZ-1] as the seed.
-------------------------------------------------------------------------------
-*/
-void rs_isaac_init(randctx *r, int flag);
-
-void rs_isaac_rand(randctx *r);
-
-
-/*
-------------------------------------------------------------------------------
- Call rand(/o_ randctx *r _o/) to retrieve a single 32-bit random value
-------------------------------------------------------------------------------
-*/
-#define rand(r) \
-   (!(r)->randcnt-- ? \
-     (rs_isaac_rand(r), (r)->randcnt=RANDSIZ-1, (r)->randrsl[(r)->randcnt]) : \
-     (r)->randrsl[(r)->randcnt])
-
-#endif  /* RAND */
-
-