redshift 1.3.27 → 1.3.28

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f9ca8372d265e9b730e14c976f1765a906181e2b
4
- data.tar.gz: d7b22f9a9286357acad7ab342ad5ff8d446ad3bf
3
+ metadata.gz: 36de30bee612231a2007d9738da0e725e53117b8
4
+ data.tar.gz: 0438a71cdd5dd1e88a2d31c195c53f1dddc4ddfb
5
5
  SHA512:
6
- metadata.gz: 3150e6a90aea209e06408c12c8c4b5ae400d94737289a294e16c439c26c20dc72defba138b4a3cdc9b2eb21aee7046de82bd2bd281bc0049ea412265f3f58be0
7
- data.tar.gz: 88b2d5634395f0423f6464398206ad235749b472f6e3a1c0396bcfc3d2a48892fde88adcddf5d7a2a681264accd3d2426ecea486f57064d5d6411ebd82c89118
6
+ metadata.gz: abf507a063549f1d2674c1fee1a651c7acfcfcfda8c4e2c8cad3854473d09640980a1818303642a8ffa6de6da75df6f2c2b92262b42d5fe3ecef1c63fbe522a8
7
+ data.tar.gz: c5679b5e664ada659737673002455a494eeba2ad8975e95e935ce686e0a582e5a7f286e4639ba1f2a592533cf809dd5ae3611e7eac35c62cd144a333d957cbbe
data/RELEASE-NOTES CHANGED
@@ -1,3 +1,10 @@
1
+ redshift 1.3.28
2
+
3
+ - update .gitignore
4
+ - fixes for ruby 2.1
5
+ - modernize rakefile: release tasks
6
+ - use -march=native in formula benchmark
7
+
1
8
  redshift 1.3.27
2
9
 
3
10
  - cleanup
data/Rakefile CHANGED
@@ -1,10 +1,25 @@
1
1
  require 'rake'
2
2
 
3
+ PRJ = "redshift"
4
+
3
5
  def cur_ruby
4
6
  require 'rbconfig'
5
7
  @cur_ruby ||= RbConfig::CONFIG["RUBY_INSTALL_NAME"]
6
8
  end
7
9
 
10
+ def version
11
+ @version ||= begin
12
+ require 'redshift/redshift'
13
+ warn "RedShift::VERSION not a string" unless
14
+ RedShift::VERSION.kind_of? String
15
+ RedShift::VERSION
16
+ end
17
+ end
18
+
19
+ def tag
20
+ @tag ||= "#{PRJ}-#{version}"
21
+ end
22
+
8
23
  desc "Run unit tests"
9
24
  task :test do |t|
10
25
  sh "cd test && RUBYLIB=../lib:../ext:$RUBYLIB ./test.rb"
@@ -24,3 +39,43 @@ task :build_ext do
24
39
  end
25
40
  end
26
41
 
42
+ desc "Commit, tag, and push repo; build and push gem"
43
+ task :release => "release:is_new_version" do
44
+ require 'tempfile'
45
+
46
+ sh "gem build #{PRJ}.gemspec"
47
+
48
+ file = Tempfile.new "template"
49
+ begin
50
+ file.puts "release #{version}"
51
+ file.close
52
+ sh "git commit --allow-empty -a -v -t #{file.path}"
53
+ ensure
54
+ file.close unless file.closed?
55
+ file.unlink
56
+ end
57
+
58
+ sh "git tag #{tag}"
59
+ sh "git push"
60
+ sh "git push --tags"
61
+
62
+ sh "gem push #{tag}.gem"
63
+ end
64
+
65
+ namespace :release do
66
+ desc "Diff to latest release"
67
+ task :diff do
68
+ latest = `git describe --abbrev=0 --tags --match '#{PRJ}-*'`.chomp
69
+ sh "git diff #{latest}"
70
+ end
71
+
72
+ desc "Log to latest release"
73
+ task :log do
74
+ latest = `git describe --abbrev=0 --tags --match '#{PRJ}-*'`.chomp
75
+ sh "git log #{latest}.."
76
+ end
77
+
78
+ task :is_new_version do
79
+ abort "#{tag} exists; update version!" unless `git tag -l #{tag}`.empty?
80
+ end
81
+ end
data/bench/formula.rb CHANGED
@@ -6,11 +6,10 @@
6
6
  # with
7
7
  # CFLAGS = -fPIC -O2 -march=i686 -msse2 -mfpmath=sse
8
8
 
9
+ $CFLAGS="-fPIC -O2 -march=native"
9
10
  case RUBY_PLATFORM
10
11
  when /x86_64/
11
- $CFLAGS="-fPIC -O2 -march=k8 -msse2 -mfpmath=sse"
12
- else
13
- $CFLAGS="-fPIC -O2 -march=i686 -msse2 -mfpmath=sse"
12
+ $CFLAGS << " -msse2 -mfpmath=sse"
14
13
  end
15
14
 
16
15
  require 'redshift'
@@ -125,7 +125,8 @@ static VALUE dvf_method_hash(VALUE self)
125
125
 
126
126
  h = dvf->len;
127
127
  for (i=0; i < dvf->len; i++) {
128
- int hash, j;
128
+ int hash;
129
+ unsigned int j;
129
130
  char *c;
130
131
  float f;
131
132
 
@@ -70,7 +70,7 @@ end
70
70
  module RedShift
71
71
  include Math
72
72
 
73
- VERSION = '1.3.27'
73
+ VERSION = '1.3.28'
74
74
 
75
75
  Infinity = Math::Infinity
76
76
 
@@ -1207,7 +1207,7 @@ module RedShift
1207
1207
  int flags;
1208
1208
  }.tabto(0)
1209
1209
 
1210
- include("dvector/dvector.h")
1210
+ library.include("dvector/dvector.h")
1211
1211
 
1212
1212
  body %{
1213
1213
  var_count = shadow->var_count;
@@ -173,7 +173,7 @@ module RedShift; class Flow
173
173
  raise(NameError, "No such link, #{link}") unless link_type
174
174
  strict = (link_strictness == :strict)
175
175
 
176
- flow_fn.include link_type.shadow_library_include_file
176
+ flow_fn.file.include link_type.shadow_library_include_file
177
177
 
178
178
  link_cname = "link_#{link}"
179
179
  get_var_cname = "get_#{link}__#{var}"
@@ -73,7 +73,7 @@ module RedShift; class DelayFlow
73
73
  flow.translate(self, "delay", cl, 0, delay_by)
74
74
  end
75
75
 
76
- include World.shadow_library_include_file
76
+ source_file.include World.shadow_library_include_file
77
77
 
78
78
  # Note: cases 1,2 must proceed to allow alg deps to be computed,
79
79
  # since their values are used later.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redshift
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.27
4
+ version: 1.3.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joel VanderWerf
@@ -14,42 +14,42 @@ dependencies:
14
14
  name: cgen
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: tkar
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: prng-isaac
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  description: A framework for simulation of networks of hybrid automata, similar to
@@ -64,183 +64,183 @@ extra_rdoc_files:
64
64
  - README.md
65
65
  - RELEASE-NOTES
66
66
  files:
67
- - Rakefile
68
67
  - README.md
69
68
  - RELEASE-NOTES
70
- - bench/bench
71
- - bench/diff-bench
72
- - bench/run
73
- - bench/formula.rb
74
- - bench/euler.rb
69
+ - Rakefile
75
70
  - bench/alg-state.rb
71
+ - bench/algebraic.rb
72
+ - bench/bench
76
73
  - bench/bench.rb
74
+ - bench/connect.rb
75
+ - bench/continuous.rb
76
+ - bench/diff-bench
77
77
  - bench/discrete.rb
78
+ - bench/euler.rb
79
+ - bench/formula.rb
78
80
  - bench/half-strict.rb
79
- - bench/strictness.rb
80
81
  - bench/inertness.rb
81
- - bench/algebraic.rb
82
- - bench/simple.rb
83
- - bench/queues.rb
84
- - bench/connect.rb
85
82
  - bench/linked-flows.rb
86
- - bench/continuous.rb
87
- - examples/derivative.rb
88
- - examples/pid.rb
89
- - examples/reset-with-event-val.rb
90
- - examples/step-discrete-profiler.rb
91
- - examples/lotka-volterra.rb
92
- - examples/external-lib.rb
93
- - examples/delay.rb
94
- - examples/ports.rb
95
- - examples/constants.rb
96
- - examples/euler.rb
97
- - examples/orbit.rb
98
- - examples/sync.rb
83
+ - bench/queues.rb
84
+ - bench/run
85
+ - bench/simple.rb
86
+ - bench/strictness.rb
99
87
  - examples/ball-tkar.rb
100
- - examples/queue2.rb
101
- - examples/sync-queue.rb
102
- - examples/sync-deadlock.rb
103
- - examples/guard-debugger.rb
104
- - examples/thermostat.rb
105
- - examples/zeno.rb
106
- - examples/shell.rb
107
- - examples/set-dest.rb
108
- - examples/scheduler.rb
109
- - examples/sync-retry.rb
110
- - examples/step-discrete-hook.rb
111
- - examples/connect.rb
88
+ - examples/ball.rb
112
89
  - examples/collide.rb
113
- - examples/subsystem.rb
114
90
  - examples/connect-parallel.rb
91
+ - examples/connect.rb
92
+ - examples/constants.rb
93
+ - examples/delay.rb
94
+ - examples/derivative.rb
95
+ - examples/euler.rb
96
+ - examples/external-lib.rb
97
+ - examples/guard-debugger.rb
98
+ - examples/lotka-volterra.rb
115
99
  - examples/modular-component-def.rb
116
- - examples/ball.rb
100
+ - examples/orbit.rb
101
+ - examples/pid.rb
102
+ - examples/ports.rb
117
103
  - examples/queue.rb
118
- - examples/robots/lib/tracker.rb
119
- - examples/robots/lib/missile.rb
120
- - examples/robots/lib/robot.rb
104
+ - examples/queue2.rb
105
+ - examples/reset-with-event-val.rb
106
+ - examples/robots/README
107
+ - examples/robots/lib/base.rb
121
108
  - examples/robots/lib/explosion.rb
109
+ - examples/robots/lib/missile.rb
122
110
  - examples/robots/lib/radar.rb
123
- - examples/robots/lib/base.rb
111
+ - examples/robots/lib/robot.rb
124
112
  - examples/robots/lib/shell-world.rb
113
+ - examples/robots/lib/tracker.rb
125
114
  - examples/robots/robots.rb
126
- - examples/robots/README
115
+ - examples/scheduler.rb
116
+ - examples/set-dest.rb
117
+ - examples/shell.rb
118
+ - examples/simulink/README
127
119
  - examples/simulink/delay.mdl
128
120
  - examples/simulink/derivative.mdl
129
- - examples/simulink/README
130
- - ext/redshift/dvector/dvector.c
121
+ - examples/step-discrete-hook.rb
122
+ - examples/step-discrete-profiler.rb
123
+ - examples/subsystem.rb
124
+ - examples/sync-deadlock.rb
125
+ - examples/sync-queue.rb
126
+ - examples/sync-retry.rb
127
+ - examples/sync.rb
128
+ - examples/thermostat.rb
129
+ - examples/zeno.rb
131
130
  - ext/redshift/buffer/buffer.c
132
- - ext/redshift/dvector-float/dvector-float.c
133
- - ext/redshift/dvector/dvector.h
134
131
  - ext/redshift/buffer/buffer.h
135
- - ext/redshift/dvector-float/dvector-float.h
136
- - ext/redshift/dvector/dvector.rb
137
- - ext/redshift/dvector/extconf.rb
138
132
  - ext/redshift/buffer/dir.rb
139
133
  - ext/redshift/buffer/extconf.rb
134
+ - ext/redshift/dvector-float/dvector-float.c
135
+ - ext/redshift/dvector-float/dvector-float.h
140
136
  - ext/redshift/dvector-float/dvector-float.rb
141
137
  - ext/redshift/dvector-float/extconf.rb
138
+ - ext/redshift/dvector/dvector.c
139
+ - ext/redshift/dvector/dvector.h
140
+ - ext/redshift/dvector/dvector.rb
141
+ - ext/redshift/dvector/extconf.rb
142
+ - lib/redshift.rb
143
+ - lib/redshift/component.rb
144
+ - lib/redshift/meta.rb
145
+ - lib/redshift/mixins/shell.rb
146
+ - lib/redshift/mixins/zeno-debugger.rb
147
+ - lib/redshift/port.rb
148
+ - lib/redshift/queue.rb
149
+ - lib/redshift/redshift.rb
142
150
  - lib/redshift/state.rb
151
+ - lib/redshift/syntax.rb
143
152
  - lib/redshift/target/c.rb
144
- - lib/redshift/target/spec.rb
145
- - lib/redshift/target/c/flow/derivative.rb
153
+ - lib/redshift/target/c/component-gen.rb
154
+ - lib/redshift/target/c/flow-gen.rb
155
+ - lib/redshift/target/c/flow/algebraic.rb
156
+ - lib/redshift/target/c/flow/buffer.rb
146
157
  - lib/redshift/target/c/flow/delay.rb
158
+ - lib/redshift/target/c/flow/derivative.rb
147
159
  - lib/redshift/target/c/flow/euler.rb
148
160
  - lib/redshift/target/c/flow/expr.rb
149
- - lib/redshift/target/c/flow/algebraic.rb
150
- - lib/redshift/target/c/flow/buffer.rb
151
161
  - lib/redshift/target/c/flow/rk4.rb
152
- - lib/redshift/target/c/flow-gen.rb
153
- - lib/redshift/target/c/world-gen.rb
154
- - lib/redshift/target/c/component-gen.rb
155
162
  - lib/redshift/target/c/library.rb
156
- - lib/redshift/meta.rb
157
- - lib/redshift/util/superhash.rb
163
+ - lib/redshift/target/c/world-gen.rb
164
+ - lib/redshift/target/spec.rb
165
+ - lib/redshift/util/accessible-index.rb
158
166
  - lib/redshift/util/argos.rb
159
- - lib/redshift/util/random.rb
167
+ - lib/redshift/util/histogram.rb
160
168
  - lib/redshift/util/irb-shell.rb
161
- - lib/redshift/util/tkar-driver.rb
162
- - lib/redshift/util/accessible-index.rb
163
- - lib/redshift/util/modular.rb
164
- - lib/redshift/util/tracer/trace.rb
165
- - lib/redshift/util/tracer/var.rb
166
169
  - lib/redshift/util/isaac.rb
170
+ - lib/redshift/util/modular.rb
167
171
  - lib/redshift/util/object-diff.rb
168
- - lib/redshift/util/tracer.rb
169
- - lib/redshift/util/histogram.rb
170
172
  - lib/redshift/util/plot.rb
171
- - lib/redshift/port.rb
172
- - lib/redshift/redshift.rb
173
- - lib/redshift/component.rb
174
- - lib/redshift/mixins/shell.rb
175
- - lib/redshift/mixins/zeno-debugger.rb
176
- - lib/redshift/syntax.rb
173
+ - lib/redshift/util/random.rb
174
+ - lib/redshift/util/superhash.rb
175
+ - lib/redshift/util/tkar-driver.rb
176
+ - lib/redshift/util/tracer.rb
177
+ - lib/redshift/util/tracer/trace.rb
178
+ - lib/redshift/util/tracer/var.rb
177
179
  - lib/redshift/world.rb
178
- - lib/redshift/queue.rb
179
- - lib/redshift.rb
180
- - test/test_setup.rb
181
- - test/test_inherit_link.rb
182
- - test/test_discrete_isolated.rb
183
- - test/test_connect_strict.rb
184
- - test/test_buffer.rb
185
- - test/test_world.rb
186
- - test/test_flow_link.rb
187
- - test/test_dvector-float.rb
188
- - test/test_dvector.rb
189
- - test/test_reset.rb
190
- - test/test_inherit_flow.rb
191
180
  - test/test.rb
181
+ - test/test_buffer.rb
192
182
  - test/test_connect.rb
193
- - test/test_inherit_state.rb
194
- - test/test_flow_trans.rb
183
+ - test/test_connect_parallel.rb
184
+ - test/test_connect_strict.rb
185
+ - test/test_constant.rb
195
186
  - test/test_delay.rb
196
- - test/test_strict_reset_error.rb
197
- - test/test_flow.rb
198
187
  - test/test_derivative.rb
199
- - test/test_inherit.rb
200
- - test/test_inherit_transition.rb
201
- - test/test_connect_parallel.rb
202
- - test/test_queue_alone.rb
203
- - test/test_exit.rb
204
188
  - test/test_discrete.rb
205
- - test/test_strictness_error.rb
206
- - test/test_sync.rb
207
- - test/test_queue.rb
189
+ - test/test_discrete_isolated.rb
190
+ - test/test_dvector-float.rb
191
+ - test/test_dvector.rb
192
+ - test/test_exit.rb
193
+ - test/test_flow.rb
194
+ - test/test_flow_link.rb
208
195
  - test/test_flow_sub.rb
196
+ - test/test_flow_trans.rb
197
+ - test/test_inherit.rb
198
+ - test/test_inherit_event.rb
199
+ - test/test_inherit_flow.rb
200
+ - test/test_inherit_link.rb
209
201
  - test/test_inherit_setup.rb
202
+ - test/test_inherit_state.rb
203
+ - test/test_inherit_transition.rb
210
204
  - test/test_numerics.rb
205
+ - test/test_queue.rb
206
+ - test/test_queue_alone.rb
207
+ - test/test_reset.rb
208
+ - test/test_setup.rb
211
209
  - test/test_strict_continuity.rb
212
- - test/test_constant.rb
213
- - test/test_inherit_event.rb
210
+ - test/test_strict_reset_error.rb
211
+ - test/test_strictness_error.rb
212
+ - test/test_sync.rb
213
+ - test/test_world.rb
214
214
  homepage: http://rubyforge.org/projects/redshift
215
215
  licenses: []
216
216
  metadata: {}
217
217
  post_install_message:
218
218
  rdoc_options:
219
- - --quiet
220
- - --line-numbers
221
- - --inline-source
222
- - --title
219
+ - "--quiet"
220
+ - "--line-numbers"
221
+ - "--inline-source"
222
+ - "--title"
223
223
  - CGenerator
224
- - --main
224
+ - "--main"
225
225
  - README.md
226
- - --output
226
+ - "--output"
227
227
  - rdoc
228
228
  require_paths:
229
229
  - lib
230
230
  - ext
231
231
  required_ruby_version: !ruby/object:Gem::Requirement
232
232
  requirements:
233
- - - '>='
233
+ - - ">="
234
234
  - !ruby/object:Gem::Version
235
235
  version: '0'
236
236
  required_rubygems_version: !ruby/object:Gem::Requirement
237
237
  requirements:
238
- - - '>='
238
+ - - ">="
239
239
  - !ruby/object:Gem::Version
240
240
  version: '0'
241
241
  requirements: []
242
242
  rubyforge_project: redshift
243
- rubygems_version: 2.0.3
243
+ rubygems_version: 2.2.0
244
244
  signing_key:
245
245
  specification_version: 4
246
246
  summary: Simulation of hybrid automata