redshift 1.3.27 → 1.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9ca8372d265e9b730e14c976f1765a906181e2b
-  data.tar.gz: d7b22f9a9286357acad7ab342ad5ff8d446ad3bf
+  metadata.gz: 36de30bee612231a2007d9738da0e725e53117b8
+  data.tar.gz: 0438a71cdd5dd1e88a2d31c195c53f1dddc4ddfb
 SHA512:
-  metadata.gz: 3150e6a90aea209e06408c12c8c4b5ae400d94737289a294e16c439c26c20dc72defba138b4a3cdc9b2eb21aee7046de82bd2bd281bc0049ea412265f3f58be0
-  data.tar.gz: 88b2d5634395f0423f6464398206ad235749b472f6e3a1c0396bcfc3d2a48892fde88adcddf5d7a2a681264accd3d2426ecea486f57064d5d6411ebd82c89118
+  metadata.gz: abf507a063549f1d2674c1fee1a651c7acfcfcfda8c4e2c8cad3854473d09640980a1818303642a8ffa6de6da75df6f2c2b92262b42d5fe3ecef1c63fbe522a8
+  data.tar.gz: c5679b5e664ada659737673002455a494eeba2ad8975e95e935ce686e0a582e5a7f286e4639ba1f2a592533cf809dd5ae3611e7eac35c62cd144a333d957cbbe

data/RELEASE-NOTES

@@ -1,3 +1,10 @@
+redshift 1.3.28
+
+- update .gitignore
+- fixes for ruby 2.1
+- modernize rakefile: release tasks
+- use -march=native in formula benchmark
+
 redshift 1.3.27
 
 - cleanup

data/Rakefile

@@ -1,10 +1,25 @@
 require 'rake'
 
+PRJ = "redshift"
+
 def cur_ruby
   require 'rbconfig'
   @cur_ruby ||= RbConfig::CONFIG["RUBY_INSTALL_NAME"]
 end
 
+def version
+  @version ||= begin
+    require 'redshift/redshift'
+    warn "RedShift::VERSION not a string" unless
+      RedShift::VERSION.kind_of? String
+    RedShift::VERSION
+  end
+end
+
+def tag
+  @tag ||= "#{PRJ}-#{version}"
+end
+
 desc "Run unit tests"
 task :test do |t|
   sh "cd test && RUBYLIB=../lib:../ext:$RUBYLIB ./test.rb"
@@ -24,3 +39,43 @@ task :build_ext do
   end
 end
 
+desc "Commit, tag, and push repo; build and push gem"
+task :release => "release:is_new_version" do
+  require 'tempfile'
+  
+  sh "gem build #{PRJ}.gemspec"
+
+  file = Tempfile.new "template"
+  begin
+    file.puts "release #{version}"
+    file.close
+    sh "git commit --allow-empty -a -v -t #{file.path}"
+  ensure
+    file.close unless file.closed?
+    file.unlink
+  end
+
+  sh "git tag #{tag}"
+  sh "git push"
+  sh "git push --tags"
+  
+  sh "gem push #{tag}.gem"
+end
+
+namespace :release do
+  desc "Diff to latest release"
+  task :diff do
+    latest = `git describe --abbrev=0 --tags --match '#{PRJ}-*'`.chomp
+    sh "git diff #{latest}"
+  end
+
+  desc "Log to latest release"
+  task :log do
+    latest = `git describe --abbrev=0 --tags --match '#{PRJ}-*'`.chomp
+    sh "git log #{latest}.."
+  end
+
+  task :is_new_version do
+    abort "#{tag} exists; update version!" unless `git tag -l #{tag}`.empty?
+  end
+end

data/bench/formula.rb

@@ -6,11 +6,10 @@
 # with
 #   CFLAGS   = -fPIC -O2 -march=i686 -msse2 -mfpmath=sse
 
+$CFLAGS="-fPIC -O2 -march=native"
 case RUBY_PLATFORM
 when /x86_64/
-  $CFLAGS="-fPIC -O2 -march=k8 -msse2 -mfpmath=sse"
-else
-  $CFLAGS="-fPIC -O2 -march=i686 -msse2 -mfpmath=sse"
+  $CFLAGS << " -msse2 -mfpmath=sse"
 end
 
 require 'redshift'

data/ext/redshift/dvector-float/dvector-float.c

@@ -125,7 +125,8 @@ static VALUE dvf_method_hash(VALUE self)
 
     h = dvf->len;
     for (i=0; i < dvf->len; i++) {
-        int hash, j;
+        int hash;
+        unsigned int j;
         char *c;
         float f;
         

data/lib/redshift/redshift.rb

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

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

@@ -1207,7 +1207,7 @@ module RedShift
         int         flags;
       }.tabto(0)
 
-      include("dvector/dvector.h")
+      library.include("dvector/dvector.h")
 
       body %{
         var_count = shadow->var_count;

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

@@ -173,7 +173,7 @@ module RedShift; class Flow
     raise(NameError, "No such link, #{link}") unless link_type
     strict = (link_strictness == :strict)
     
-    flow_fn.include link_type.shadow_library_include_file
+    flow_fn.file.include link_type.shadow_library_include_file
     
     link_cname = "link_#{link}"
     get_var_cname = "get_#{link}__#{var}"

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

@@ -73,7 +73,7 @@ module RedShift; class DelayFlow
             flow.translate(self, "delay", cl, 0, delay_by)
           end
         
-        include World.shadow_library_include_file
+        source_file.include World.shadow_library_include_file
 
         # Note: cases 1,2 must proceed to allow alg deps to be computed,
         # since their values are used later.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redshift
 version: !ruby/object:Gem::Version
-  version: 1.3.27
+  version: 1.3.28
 platform: ruby
 authors:
 - Joel VanderWerf
@@ -14,42 +14,42 @@ dependencies:
   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
@@ -64,183 +64,183 @@ extra_rdoc_files:
 - README.md
 - RELEASE-NOTES
 files:
-- Rakefile
 - README.md
 - RELEASE-NOTES
-- bench/bench
-- bench/diff-bench
-- bench/run
-- bench/formula.rb
-- bench/euler.rb
+- Rakefile
 - bench/alg-state.rb
+- bench/algebraic.rb
+- bench/bench
 - bench/bench.rb
+- bench/connect.rb
+- bench/continuous.rb
+- bench/diff-bench
 - bench/discrete.rb
+- bench/euler.rb
+- bench/formula.rb
 - bench/half-strict.rb
-- bench/strictness.rb
 - bench/inertness.rb
-- bench/algebraic.rb
-- bench/simple.rb
-- bench/queues.rb
-- bench/connect.rb
 - bench/linked-flows.rb
-- bench/continuous.rb
-- examples/derivative.rb
-- examples/pid.rb
-- examples/reset-with-event-val.rb
-- examples/step-discrete-profiler.rb
-- examples/lotka-volterra.rb
-- examples/external-lib.rb
-- examples/delay.rb
-- examples/ports.rb
-- examples/constants.rb
-- examples/euler.rb
-- examples/orbit.rb
-- examples/sync.rb
+- bench/queues.rb
+- bench/run
+- bench/simple.rb
+- bench/strictness.rb
 - examples/ball-tkar.rb
-- examples/queue2.rb
-- examples/sync-queue.rb
-- examples/sync-deadlock.rb
-- examples/guard-debugger.rb
-- examples/thermostat.rb
-- examples/zeno.rb
-- examples/shell.rb
-- examples/set-dest.rb
-- examples/scheduler.rb
-- examples/sync-retry.rb
-- examples/step-discrete-hook.rb
-- examples/connect.rb
+- examples/ball.rb
 - examples/collide.rb
-- examples/subsystem.rb
 - examples/connect-parallel.rb
+- examples/connect.rb
+- examples/constants.rb
+- examples/delay.rb
+- examples/derivative.rb
+- examples/euler.rb
+- examples/external-lib.rb
+- examples/guard-debugger.rb
+- examples/lotka-volterra.rb
 - examples/modular-component-def.rb
-- examples/ball.rb
+- examples/orbit.rb
+- examples/pid.rb
+- examples/ports.rb
 - examples/queue.rb
-- examples/robots/lib/tracker.rb
-- examples/robots/lib/missile.rb
-- examples/robots/lib/robot.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/base.rb
+- examples/robots/lib/robot.rb
 - examples/robots/lib/shell-world.rb
+- examples/robots/lib/tracker.rb
 - examples/robots/robots.rb
-- examples/robots/README
+- examples/scheduler.rb
+- examples/set-dest.rb
+- examples/shell.rb
+- examples/simulink/README
 - examples/simulink/delay.mdl
 - examples/simulink/derivative.mdl
-- examples/simulink/README
-- ext/redshift/dvector/dvector.c
+- examples/step-discrete-hook.rb
+- examples/step-discrete-profiler.rb
+- examples/subsystem.rb
+- examples/sync-deadlock.rb
+- examples/sync-queue.rb
+- examples/sync-retry.rb
+- examples/sync.rb
+- examples/thermostat.rb
+- examples/zeno.rb
 - ext/redshift/buffer/buffer.c
-- ext/redshift/dvector-float/dvector-float.c
-- ext/redshift/dvector/dvector.h
 - ext/redshift/buffer/buffer.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/dvector-float/dvector-float.c
+- ext/redshift/dvector-float/dvector-float.h
 - ext/redshift/dvector-float/dvector-float.rb
 - ext/redshift/dvector-float/extconf.rb
+- ext/redshift/dvector/dvector.c
+- ext/redshift/dvector/dvector.h
+- ext/redshift/dvector/dvector.rb
+- ext/redshift/dvector/extconf.rb
+- lib/redshift.rb
+- lib/redshift/component.rb
+- lib/redshift/meta.rb
+- lib/redshift/mixins/shell.rb
+- lib/redshift/mixins/zeno-debugger.rb
+- lib/redshift/port.rb
+- lib/redshift/queue.rb
+- lib/redshift/redshift.rb
 - lib/redshift/state.rb
+- lib/redshift/syntax.rb
 - lib/redshift/target/c.rb
-- lib/redshift/target/spec.rb
-- lib/redshift/target/c/flow/derivative.rb
+- lib/redshift/target/c/component-gen.rb
+- lib/redshift/target/c/flow-gen.rb
+- lib/redshift/target/c/flow/algebraic.rb
+- lib/redshift/target/c/flow/buffer.rb
 - lib/redshift/target/c/flow/delay.rb
+- lib/redshift/target/c/flow/derivative.rb
 - lib/redshift/target/c/flow/euler.rb
 - lib/redshift/target/c/flow/expr.rb
-- lib/redshift/target/c/flow/algebraic.rb
-- lib/redshift/target/c/flow/buffer.rb
 - lib/redshift/target/c/flow/rk4.rb
-- lib/redshift/target/c/flow-gen.rb
-- lib/redshift/target/c/world-gen.rb
-- lib/redshift/target/c/component-gen.rb
 - lib/redshift/target/c/library.rb
-- lib/redshift/meta.rb
-- lib/redshift/util/superhash.rb
+- lib/redshift/target/c/world-gen.rb
+- lib/redshift/target/spec.rb
+- lib/redshift/util/accessible-index.rb
 - lib/redshift/util/argos.rb
-- lib/redshift/util/random.rb
+- lib/redshift/util/histogram.rb
 - lib/redshift/util/irb-shell.rb
-- lib/redshift/util/tkar-driver.rb
-- lib/redshift/util/accessible-index.rb
-- lib/redshift/util/modular.rb
-- lib/redshift/util/tracer/trace.rb
-- lib/redshift/util/tracer/var.rb
 - lib/redshift/util/isaac.rb
+- lib/redshift/util/modular.rb
 - lib/redshift/util/object-diff.rb
-- lib/redshift/util/tracer.rb
-- lib/redshift/util/histogram.rb
 - lib/redshift/util/plot.rb
-- lib/redshift/port.rb
-- lib/redshift/redshift.rb
-- lib/redshift/component.rb
-- lib/redshift/mixins/shell.rb
-- lib/redshift/mixins/zeno-debugger.rb
-- lib/redshift/syntax.rb
+- lib/redshift/util/random.rb
+- lib/redshift/util/superhash.rb
+- lib/redshift/util/tkar-driver.rb
+- lib/redshift/util/tracer.rb
+- lib/redshift/util/tracer/trace.rb
+- lib/redshift/util/tracer/var.rb
 - lib/redshift/world.rb
-- lib/redshift/queue.rb
-- lib/redshift.rb
-- 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_dvector-float.rb
-- test/test_dvector.rb
-- test/test_reset.rb
-- test/test_inherit_flow.rb
 - test/test.rb
+- test/test_buffer.rb
 - test/test_connect.rb
-- test/test_inherit_state.rb
-- test/test_flow_trans.rb
+- test/test_connect_parallel.rb
+- test/test_connect_strict.rb
+- test/test_constant.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_discrete_isolated.rb
+- test/test_dvector-float.rb
+- test/test_dvector.rb
+- test/test_exit.rb
+- test/test_flow.rb
+- test/test_flow_link.rb
 - test/test_flow_sub.rb
+- test/test_flow_trans.rb
+- test/test_inherit.rb
+- test/test_inherit_event.rb
+- test/test_inherit_flow.rb
+- test/test_inherit_link.rb
 - test/test_inherit_setup.rb
+- test/test_inherit_state.rb
+- test/test_inherit_transition.rb
 - test/test_numerics.rb
+- test/test_queue.rb
+- test/test_queue_alone.rb
+- test/test_reset.rb
+- test/test_setup.rb
 - test/test_strict_continuity.rb
-- test/test_constant.rb
-- test/test_inherit_event.rb
+- test/test_strict_reset_error.rb
+- test/test_strictness_error.rb
+- test/test_sync.rb
+- test/test_world.rb
 homepage: http://rubyforge.org/projects/redshift
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --quiet
-- --line-numbers
-- --inline-source
-- --title
+- "--quiet"
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - CGenerator
-- --main
+- "--main"
 - README.md
-- --output
+- "--output"
 - rdoc
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redshift
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Simulation of hybrid automata