redshift 1.3.15 → 1.3.16

data/RELEASE-NOTES

@@ -1,3 +1,7 @@
+redshift 1.3.16
+
+- added util dir and modified requires to use libs from there
+
 redshift 1.3.15
 
 - added dependency on cgen

data/bench/diff-bench

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'yaml'
-require 'argos'
-require 'object-diff'
+require 'redshift/util/argos'
+require 'redshift/util/object-diff'
 
 defaults = {
   "d"   => 0.01

data/bench/run

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'my-profile.rb'
+require 'my-profile.rb' ### TODO: depend only on ruby-prof
 
 class Object
   def rbprofile prof_flag = true

data/bench/strictness.rb

@@ -1,4 +1,4 @@
-require 'my-profile'
+require 'ruby-prof'
 
 $strict = ARGV.delete("-s")
 
@@ -76,7 +76,7 @@ end
 times = Process.times
 t0 = Time.now
 pt0 = times.utime #+ times.stime
-profile false do
+RubyProf.profile do
   w.run 1000
 end
 times = Process.times

data/examples/ball.rb

@@ -112,7 +112,7 @@ while w.size > 0 do
 end
 
 if ARGV.delete('-p')
-  require 'sci/plot'
+  require 'redshift/util/plot'
   include Plot::PlotUtils
 
   gnuplot do |plot|

data/examples/collide.rb

@@ -57,7 +57,7 @@ w.evolve 1.2 do
   gather.call
 end
 
-require 'sci/plot'
+require 'redshift/util/plot'
 include Plot::PlotUtils
 
 gnuplot do |plot|

data/examples/delay.rb

@@ -64,7 +64,7 @@ if false
   p c.delay_u_delay
 end
 
-require 'sci/plot'
+require 'redshift/util/plot'
 include Plot::PlotUtils
 
 gnuplot do |plot|

data/examples/derivative.rb

@@ -59,7 +59,7 @@ world.evolve 10 do
   gather.call
 end
 
-require 'sci/plot'
+require 'redshift/util/plot'
 include Plot::PlotUtils
 
 gnuplot do |plot|

data/examples/euler.rb

@@ -31,7 +31,7 @@ world.evolve 10 do
   gather.call
 end
 
-require 'sci/plot'
+require 'redshift/util/plot'
 include Plot::PlotUtils
 
 gnuplot do |plot|

data/examples/lotka-volterra.rb

@@ -20,7 +20,7 @@ world.evolve 100 do |w|
   data << [w.clock, pop.foxes, pop.rabbits]
 end
 
-require 'sci/plot'
+require 'redshift/util/plot'
 include Plot::PlotUtils
 
 gnuplot do |plot|

data/examples/pid.rb

@@ -71,7 +71,7 @@ world.evolve 1000 do
   gather.call
 end
 
-require 'sci/plot'
+require 'redshift/util/plot'
 include Plot::PlotUtils
 
 gnuplot do |plot|

data/examples/subsystem.rb

@@ -95,7 +95,7 @@ world.evolve 20 do
   gather.call
 end
 
-require 'sci/plot'
+require 'redshift/util/plot'
 include Plot::PlotUtils
 
 gnuplot do |plot|

data/examples/thermostat.rb

@@ -41,7 +41,7 @@ world.evolve 30 do |w|
   temp_history << point
 end
 
-require 'sci/plot'
+require 'redshift/util/plot'
 include Plot::PlotUtils
 
 gnuplot do |plot|

data/lib/redshift/component.rb

@@ -1,6 +1,6 @@
 require 'singleton'
-require 'superhash'
-require 'accessible-index'
+require 'redshift/util/superhash'
+require 'redshift/util/accessible-index'
 require 'redshift/state'
 require 'redshift/meta'
 require 'redshift/port'

data/lib/redshift/redshift.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2006, Joel VanderWerf
+# Copyright (C) 2001-2010, Joel VanderWerf
 # Distributed under the Ruby license. See www.ruby-lang.org.
 
 # Read all environment variables related to RedShift and store in globals
@@ -33,7 +33,7 @@ end
 module RedShift
   include Math
   
-  VERSION = '1.3.15'
+  VERSION = '1.3.16'
 
   Infinity = Math::Infinity
 

data/lib/redshift/util/argos.rb

@@ -0,0 +1,214 @@
+# A slim command-line parser that does one thing well: turn an array of
+# strings, such as ARGV, into a hash of recognized options and their
+# arguments, leaving unrecognized strings in the original array.
+#
+# Argos was Odysseus' faithful dog, who was good at recognizing ;)
+#
+# Synopsis:
+#
+#    require 'argos'
+#
+#    optdef = {
+#      "v"   => true,
+#      "n"   => proc {|arg| Integer(arg)}
+#    }
+#
+#    argv = %w{-v -n10 filename}
+#    opts = Argos.parse_options(argv, optdef)
+#    p opts    # ==> {"v"=>true, "n"=>10}
+#    p argv    # ==> ["filename"]
+#
+# Features:
+#
+# - Operates on ARGV or any given array of strings.
+#
+# - Output is a hash of {option => value, ...}.
+#
+# - You can merge this hash on top of a hash of defaults if you want.
+#
+# - Supports both long ("--foo") and short ("-f") options.
+#
+# - A long option with an argument is --foo=bar or --foo bar.
+#
+# - A short option with an argument is -fbar or -f bar.
+#
+# - The options -x and --x are synonymous.
+#
+# - Short options with no args can be combined as -xyz in place of -x -y -z.
+#
+# - If -z takes an argument, then -xyz foo is same as -x -y -z foo.
+#
+# - The string "--" terminates option parsing, leaving the rest untouched.
+#
+# - The string "-" is not considered an option.
+#
+# - ARGV (or other given array) is modified: it has all parsed options
+#   and arguments removed, so you can use ARGF to treat the rest as input files.
+#
+# - Unrecognized arguments are left in the argument array. You can catch them
+#   with grep(/^-./), in case you want to pass them on to another program or
+#   warn the user.
+#
+# - Argument validation and conversion are in terms of an option definition
+#   hash, which specifies which options are allowed, the number of arguments
+#   for each (0 or 1), and how to generate the value from the argument, if any.
+#
+# - Repetition of args ("-v -v", or "-vv") can be handled by closures. See
+#   the example below.
+#
+# - Everything is ducky. For example, handlers only need an #arity method
+#   and a #[] method to be recognized as callable. Otherwise they are treated
+#   as static objects.
+#
+# Limitations:
+#
+# - A particular option takes either 0 args or 1 arg. There are no optional
+#   arguments, in the sense of both "-x" and "-x3" being accepted.
+#
+# - Options lose their ordering in the output hash (but they are parsed in
+#   order and you can keep track using state in the handler closures).
+#
+# - There is no usage/help output.
+#
+# Copyright (C) 2006-2009 Joel VanderWerf, mailto:vjoel@users.sourceforge.net.
+#
+# License is the Ruby license. See http://www.ruby-lang.org.
+#
+module Argos
+  module_function
+
+  # Raised (a) when an option that takes an argument occurs at the end of the
+  # argv list, with no argument following it, or (b) when a handler barfs.
+  class OptionError < ArgumentError; end
+  
+  # Called when an option that takes an argument occurs at the end of the
+  # argv list, with no argument following it.
+  def argument_missing opt
+    raise OptionError, "#{opt}: no argument provided."
+  end
+  
+  def handle opt, handler, *args # :nodoc
+    args.empty? ?  handler[] : handler[args[0]]
+  rescue => ex
+    raise OptionError, "#{opt}: #{ex}"
+  end
+
+  # Returns the hash of parsed options and argument values. The +argv+ array
+  # is modified: every recognized option and argument is deleted.
+  #
+  # The +optdef+ hash defines the options and their arguments.
+  #
+  # Each key is an option name (without "-" chars).
+  #
+  # The value for a key in +optdef+
+  # is used to generate the value for the same key in the options hash
+  # returned by this method.
+  #
+  # If the value has an #arity method and arity > 0, the value is considered to
+  # be a handler; it is called with the argument string to return the value
+  # associated with the option in the hash returned by the method.
+  #
+  # If the arity <= 0, the value is considered to be a handler for an option
+  # without arguments; it is called with no arguments to return the value of
+  # the option.
+  #
+  # If there is no arity method, the object itself is used as the value of
+  # the option.
+  #
+  # Only one kind of input will cause an exception (not counting exceptions
+  # raised by handler code or by bugs):
+  #
+  # - An option is found at the end of the list, and it requires an argument.
+  #   This results in a call to #argument_missing, which by default raises
+  #   OptionError.
+  #
+  def parse_options argv, optdef
+    orig = argv.dup; argv.clear
+    opts = {}
+
+    loop do
+      case (argstr=orig.shift)
+      when nil, "--"
+        argv.concat orig
+        break
+
+      when /^(--)([^=]+)=(.*)/, /^(-)([^-])(.+)/
+        short = ($1 == "-"); opt = $2; arg = $3
+        unless optdef.key?(opt)
+          argv << argstr
+          next
+        end
+        handler = optdef[opt]
+        arity = (handler.arity rescue nil)
+        opts[opt] =
+          case arity
+          when nil;   orig.unshift("-#{arg}") if short; handler
+          when 0,-1;  orig.unshift("-#{arg}") if short; handle(opt, handler)
+          else        handle(opt, handler, arg)
+          end
+
+      when /^--(.+)/, /^-(.)$/
+        opt = $1
+        unless optdef.key?(opt)
+          argv << argstr
+          next
+        end
+        handler = optdef[opt]
+        arity = (handler.arity rescue nil)
+        opts[opt] =
+          case arity
+          when nil;   handler
+          when 0,-1;  handle(opt, handler)
+          else        handle(opt, handler, orig.shift || argument_missing(opt))
+          end
+
+      else
+        argv << argstr
+      end
+    end
+
+    opts
+  end
+end
+
+if __FILE__ == $0
+
+  v = 0
+  defaults = {
+    "v"     => v,
+    "port"  => 4000,
+    "host"  => "localhost"
+  }
+
+  optdef = {
+    "x"     => true,
+    "y"     => "y",
+    "z"     => 3,
+    "v"     => proc {v+=1}, # no argument, but call the proc to get the value
+    "port"  => proc {|arg| Integer(arg)},
+    "n"     => proc {|arg| Integer(arg)},
+    "t"     => proc {|arg| Float(arg)},
+    "cmd"   => proc {|arg| arg.split(",")}
+  }
+
+  ARGV.replace %w{
+    -xyzn5 somefile --port 5000 -t -1.23 -vv -v --unrecognized-option
+    --cmd=ls,-l otherfile -- --port
+  }
+  
+  begin
+    cli_opts = Argos.parse_options(ARGV, optdef)
+  rescue Argos::OptionError => ex
+    $stderr.puts ex.message
+    exit
+  end
+  
+  opts = defaults.merge cli_opts
+
+  p opts
+  p ARGV
+  unless ARGV.empty?
+    puts "Some arg-looking strings were not handled:", *ARGV.grep(/^-./)
+  end
+  
+end

data/lib/redshift/util/histogram.rb

@@ -0,0 +1,155 @@
+class Histogram
+  # Number of bins.
+  attr_reader :bincount
+  
+  # Size of each bin.
+  attr_reader :binsize
+  
+  # Count of data points given.
+  attr_reader :count
+  
+  # max, as given in opts, or max of data.
+  attr_reader :max
+
+  # min, as given in opts, or min of data.
+  attr_reader :min
+  
+  # Unless false, normalize by this factor (or 1).
+  attr_reader :norm
+  
+  # If "stats" option is present, calculate statistics in these attrs.
+  attr_reader :mean, :stdev
+  
+  # An array of pairs of the form [bin, count]. Suitable for plotting. Bins are
+  # inclusive of lower endpoint. Highest bin is inclusive of both endpoints.
+  attr_reader :bins
+  
+  # Options as originally given.
+  attr_reader :opts
+
+  # Construct a Histogram based on +ary+ with the +opts+:
+  #
+  #   "bincount"  :: number of bins (default is 10)
+  #
+  #   "min" ::       min value (otherwise, based on data)
+  #
+  #   "max" ::       max value (otherwise, based on data)
+  #
+  #   "normalize" :: divide each bin by the total count, unless false
+  #                 if numeric, scale the result by the value
+  #                 (default is false)
+  #
+  #   "stats" ::    calculate statistics for the data set (min/stdev)
+  #                 (default is false)
+  #
+  def initialize(ary, opts={})
+    @opts = opts
+    @bins = []
+
+    ary = ary.map {|x| x.to_f}
+    @count = ary.size
+    
+    @bincount = opts["bincount"]
+    @binsize  = opts["binsize"]
+    @min      = opts["min"] || ary.min
+    @max      = opts["max"] || ary.max
+    @norm     = opts["normalize"] || false
+    @stats    = opts["stats"] || false
+
+    if @bincount and @binsize
+      raise ArgumentError, "Cannot specify both bincount and binsize"
+    elsif @bincount
+      @binsize = (@max-@min)/@bincount
+    elsif @binsize
+      @bincount = (@max-@min)/@binsize
+    else
+      @bincount = 10
+      @binsize = (@max-@min)/@bincount
+    end
+    
+    raise ArgumentError, "Cannot have binsize==0" if @binsize == 0
+    
+    @counts = Array.new(@bincount+1, 0)
+
+    ary.each do |x|
+      @counts[((x-min)/@binsize).round] += 1
+    end
+
+    return if ary.empty?
+    
+    if @stats
+      n = ary.size.to_f
+      @mean = ary.inject {|sum, x| sum + x} / n
+      var = ary.inject(0) {|sum,x| sum+(x-@mean)**2} / (n-1)
+      @stdev = Math::sqrt(var)
+    end
+    
+    scale = (norm && @count != 0) ? norm/@count.to_f : 1
+    @counts.each_with_index do |bin, i|
+      @bins << [min + i*@binsize, bin*scale]
+    end
+  end
+  
+  def inspect
+    attrs = %w{ bincount binsize count min max norm }
+    attrs.concat %w{ mean stdev } if @stats
+    s = attrs.map {|a| "#{a}=#{send(a)}"}.join(", ")
+    "#<#{self.class}: #{s}>"
+  end
+end
+
+if __FILE__ == $0
+  require 'redshift/util/argos'
+  
+  defaults = {
+    "v"             => 0
+  }
+  
+  v=0
+  optdef = {
+    "bincount"      => proc {|arg| Integer(arg)},
+    "binsize"       => proc {|arg| Integer(arg)},
+    "min"           => proc {|arg| Float(arg)},
+    "max"           => proc {|arg| Float(arg)},
+    "normalize"     => proc {|arg| Integer(arg) rescue 1},
+    
+    "v"             => proc {v+=1},
+    "plot"          => true,
+    "o"             => proc {|arg| arg}
+  }
+  
+  begin
+    opts = defaults.merge(Argos.parse_options(ARGV, optdef))
+  rescue Argos::OptionError => ex
+    $stderr.puts ex.message
+    exit
+  end
+  
+  opts["stats"] = true if opts["v"] > 0
+
+  histo = Histogram.new(ARGF, opts)
+  
+  out = histo.bins.map {|d| d.join("\t")}
+  puts out
+  
+  if opts["v"] > 0
+    $stderr.puts histo.inspect
+  end
+  
+  if opts["plot"]
+    require 'sci/plot'
+    extend Plot::PlotUtils
+    
+    gnuplot do |plot|
+      outfile = opts["o"]
+      if outfile
+        ext = File.extname(outfile)[/[^.]+$/]
+        plot.command "set term #{ext}"
+        plot.command "set output #{outfile.inspect}"
+      end
+      plot.add histo.bins, %{w histeps title 'histogram'}
+    end
+    
+    sleep 1 if /mswin32|mingw32/ =~ RUBY_PLATFORM
+  end
+end