rubyonacid 0.3.1 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/examples/ascii.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'rubyonacid/factories/all'
 
 #This method takes any Factory and uses it to determine the length of lines to print.
@@ -16,32 +18,32 @@ end
 make_lines RubyOnAcid::RandomFactory.new
 
 #Random walk factories increase or decrease the prior return value within a given amount.
-make_lines RubyOnAcid::RandomWalkFactory.new(0.1)
+make_lines RubyOnAcid::RandomWalkFactory.new(:interval => 0.1)
 
 #Loop factories loop from 0 to 1 (or 1 to 0 if the increment value is negative).
-make_lines RubyOnAcid::LoopFactory.new(0.2)
-make_lines RubyOnAcid::LoopFactory.new(-0.2)
+make_lines RubyOnAcid::LoopFactory.new(:interval => 0.2)
+make_lines RubyOnAcid::LoopFactory.new(:interval => -0.2)
 
 #Constant factories always return the same value,
-make_lines RubyOnAcid::ConstantFactory.new(0.5)
+make_lines RubyOnAcid::ConstantFactory.new(:value => 0.5)
 
 #This flash factory returns 0 twice, then 1 twice, then 0 twice, etc.
-make_lines RubyOnAcid::FlashFactory.new(2)
+make_lines RubyOnAcid::FlashFactory.new(:interval => 2)
 
 #Sine factories produce a "wave" pattern.
-make_lines RubyOnAcid::SineFactory.new(0.3)
+make_lines RubyOnAcid::SineFactory.new(:interval => 0.3)
 
 #A RepeatFactory wraps another factory, queries it, and repeats the same value a certain number of times.
-factory_to_repeat = RubyOnAcid::LoopFactory.new(0.3)
-make_lines RubyOnAcid::RepeatFactory.new(factory_to_repeat, 2)
+factory_to_repeat = RubyOnAcid::LoopFactory.new(:interval => 0.3)
+make_lines RubyOnAcid::RepeatFactory.new(:source_factories => [factory_to_repeat], :repeat_count => 2)
 
 #A CombinationFactory combines the values of two or more other factories.
 factories_to_combine = [
-  RubyOnAcid::SineFactory.new(0.1),
-  RubyOnAcid::SineFactory.new(-0.2)
+  RubyOnAcid::SineFactory.new(:interval => 0.1),
+  RubyOnAcid::SineFactory.new(:interval => -0.2)
 ]
 make_lines RubyOnAcid::CombinationFactory.new(:source_factories => factories_to_combine)
 
 #A RoundingFactory rounds values from a source factory to a multiple of a given number.
-factory_to_round = RubyOnAcid::LoopFactory.new(0.1)
-make_lines RubyOnAcid::RoundingFactory.new(factory_to_round, 0.25)
+factory_to_round = RubyOnAcid::LoopFactory.new(:interval => 0.1)
+make_lines RubyOnAcid::RoundingFactory.new(:source_factories => [factory_to_round], :nearest => 0.25)

data/examples/midi.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'rubygems'
 require 'rubyonacid/factories/example'
 
@@ -5,7 +7,7 @@ require 'rubyonacid/factories/example'
 factory = RubyOnAcid::ExampleFactory.new
     
 #This factory randomly resets the meta factory.
-@resetter = RubyOnAcid::SkipFactory.new(0.999)
+@resetter = RubyOnAcid::SkipFactory.new(:odds => 0.999)
 
 begin
   require 'midiator'
@@ -13,6 +15,8 @@ rescue LoadError
   raise "It appears that MIDIator is not installed. 'sudo gem install midiator' to install it."
 end
 
+Thread.abort_on_exception = true
+
 midi = MIDIator::Interface.new
 midi.autodetect_driver
 

data/examples/raw_audio.rb

@@ -1,19 +1,20 @@
+#!/usr/bin/env ruby
+
 puts "This demo writes raw 8-bit PCM data to a file.  Ctrl-C to stop.  Import the file to Audacity (or a similar audio editing program) to hear the results."
 
-require 'rubygems'
 require 'rubyonacid/factories/example'
 
 #This factory chooses notes, play durations, etc.
 factory = RubyOnAcid::ExampleFactory.new
     
 #This factory randomly resets the meta factory.
-@resetter = RubyOnAcid::SkipFactory.new(0.999)
+@resetter = RubyOnAcid::SkipFactory.new(:odds => 0.99999)
 
 File.open("raw_audio.dat", "w") do |file|
   loop do
     channel_count = factory.get(:channel_count, :max => 3).to_i
     channel_count.times do |i|
-      file.putc factory.get(i, :max => 255).to_i
+      file.putc factory.get(i, :min => 100, :max => 175).to_i
     end
     if @resetter.boolean(:reset)
       factory.reset_assignments

data/examples/rinda_agent.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'rubygems'
 begin
   require 'wx'
@@ -13,12 +15,12 @@ class MyApp < Wx::App
 
   def on_init
     
-    @f = RubyOnAcid::RindaFactory.new(ARGV[0] || "druby://127.0.0.1:7632")
+    @f = RubyOnAcid::RindaFactory.new(:uri => ARGV[0] || "druby://127.0.0.1:7632")
     @f.default_factory = RubyOnAcid::ExampleFactory.new
     @f.start_service
     
     #A skip factory, in charge of randomly resetting the meta factory.
-    @resetter = RubyOnAcid::SkipFactory.new(0.999)
+    @resetter = RubyOnAcid::SkipFactory.new(:odds => 0.999)
     
     #Set up window.
     frame = Wx::Frame.new(nil, :size => [WIDTH, HEIGHT])

data/examples/svg.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'rubygems'
 require 'rubyonacid/factories/example'
 

data/examples/tk.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'rubyonacid/factories/example'
 require 'tk'
 
@@ -5,7 +7,7 @@ require 'tk'
 f = RubyOnAcid::ExampleFactory.new
 
 #A skip factory, in charge of randomly resetting the meta factory.
-resetter = RubyOnAcid::SkipFactory.new(0.999)
+resetter = RubyOnAcid::SkipFactory.new(:odds => 0.999)
 
 #The window to draw to.
 canvas = TkCanvas.new(:width => 400, :height => 400)
@@ -15,6 +17,7 @@ canvas.pack
 lines = []
 
 #Create a thread to update the window while it's displayed.
+Thread.abort_on_exception = true
 Thread.new do
   loop do
     
@@ -34,7 +37,7 @@ Thread.new do
       f.get(:y1, :max => 400),
       f.get(:x2, :max => 400),
       f.get(:y2, :max => 400),
-      :width => f.get(:width, :min => 5, :max => 30),
+      :width => f.get(:width, :min => 5, :max => 400),
       :fill => color
     )
     
@@ -43,8 +46,8 @@ Thread.new do
     f.reset_assignments if resetter.boolean(:reset)
     
     #Delete the oldest line if we have accumulated too many.
-    lines.shift.delete if lines.length > 1000
-    
+    lines.shift.delete if lines.length > 200
+
   end
 end
 

data/lib/rubyonacid/factories/all.rb

@@ -3,8 +3,10 @@ require 'rubyonacid/factories/constant'
 require 'rubyonacid/factories/flash'
 require 'rubyonacid/factories/increment'
 require 'rubyonacid/factories/input'
+require 'rubyonacid/factories/lissajous'
 require 'rubyonacid/factories/loop'
 require 'rubyonacid/factories/meta'
+require 'rubyonacid/factories/proximity'
 require 'rubyonacid/factories/random'
 require 'rubyonacid/factories/random_walk'
 require 'rubyonacid/factories/repeat'

data/lib/rubyonacid/factories/attraction.rb

@@ -2,39 +2,31 @@ require 'rubyonacid/factory'
 
 module RubyOnAcid
 
+#A Factory that "pulls" source factory values toward an attractor factory's value.
 class AttractionFactory < Factory
   
-  SQUARE_ROOT_OF_TWO = Math.sqrt(2.0)
-  
-  #Factory to get values from.
-  attr_accessor :source_factory
-  
   #Values from source_factory will be "pulled" toward values from this factory.
   attr_accessor :attractor_factory
   
-  def initialize(source_factory = nil, attractor_factory = nil)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :attractor_factory => nil
+  def initialize(options = {})
     super
-    @source_factory = source_factory
-    @attractor_factory = attractor_factory
+    @source_factory = options[:source_factory]
+    @attractor_factory = options[:attractor_factory]
   end
   
-  #Get a value from the source_factory and a value from the attractor_factory.
-  #The source_factory value will be adjusted to be closer to the attractor_factory value.
+  #Get a value from the source_factories and a value from the attractor_factory.
+  #The source_factories average will be adjusted to be closer to the attractor_factory value.
   #The closer the values are, the greater the adjustment.
   def get_unit(key)
-    # force = delta * @magnetism / (distance * Jemini::Math::SQUARE_ROOT_OF_TWO)
-    value = @source_factory.get_unit(key)
+    value = super
     attractor_value = @attractor_factory.get_unit(key)
-    distance = value - attractor_value
-    return_value = value - (0.1 / (distance * SQUARE_ROOT_OF_TWO))
-    if value > attractor_value and return_value < attractor_value
-      return_value = attractor_value
-    elsif value < attractor_value and return_value > attractor_value
-      return_value = attractor_value
-    end
-    return_value
+    distance = attractor_value - value
+    value += distance / 2.0
+    value
   end
 
 end
 
-end
+end

data/lib/rubyonacid/factories/combination.rb

@@ -2,6 +2,7 @@ require 'rubyonacid/factory'
 
 module RubyOnAcid
 
+#Combines values from source factories together in the prescribed manner.
 class CombinationFactory < Factory
   
   #Causes get_unit value of all source_factories to be added together.
@@ -17,16 +18,16 @@ class CombinationFactory < Factory
   #Causes get_unit values above 1 to wrap to 0 and values below 0 to wrap to 1.
   WRAP = :wrap
   
-  #An array of factories to be queried by get_unit. 
-  attr_accessor :source_factories
-  #The operation get_unit will perform.
+  #The operation get_unit will perform to combine source factory values.
   attr_accessor :operation
   #The method get_unit will use to constrain values between 0 and 1.
   attr_accessor :constrain_mode
   
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :operation => ADD
+  #  :constrain_mode => WRAP
   def initialize(options = {})
     super
-    @source_factories = options[:source_factories] || []
     @operation = options[:operation] || ADD
     @constrain_mode = options[:constrain_mode] || WRAP
   end

data/lib/rubyonacid/factories/constant.rb

@@ -12,9 +12,11 @@ class ConstantFactory < Factory
     @value = value
   end
   
-  def initialize(value = 0.5)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :value => 0.0
+  def initialize(options = {})
     super
-    @value = value
+    @value = options[:value] || 0.0
   end
   
   #Returns assigned value.

data/lib/rubyonacid/factories/example.rb

@@ -7,11 +7,12 @@ module RubyOnAcid
 class ExampleFactory < MetaFactory
 
   
-  def initialize
+  #Takes a hash with all keys supported by Factory.
+  def initialize(options = {})
     super
-    @factory_pool = create_factories
+    self.source_factories = create_factories
   end
-
+  
 
   private
 
@@ -20,49 +21,59 @@ class ExampleFactory < MetaFactory
       
       random_factory = RubyOnAcid::RandomFactory.new
 
-      source_factories = []
+      factories = []
       
       5.times do
         factory = RubyOnAcid::LoopFactory.new
         factory.interval = random_factory.get(:increment, :min => -0.1, :max => 0.1)
-        source_factories << factory
+        factories << factory
       end
       3.times do
         factory = RubyOnAcid::ConstantFactory.new
         factory.value = random_factory.get(:constant)
-        source_factories << factory
+        factories << factory
       end
-      source_factories << RubyOnAcid::FlashFactory.new(
-        random_factory.get(:interval, :max => 100)
+      factories << RubyOnAcid::FlashFactory.new(
+        :interval => random_factory.get(:interval, :max => 100)
       )
-      source_factories << RubyOnAcid::RandomWalkFactory.new(
-        random_factory.get(:interval, :max => 0.1)
+      2.times do
+        factories << RubyOnAcid::LissajousFactory.new(
+          :interval => random_factory.get(:interval, :max => 10.0),
+          :scale => random_factory.get(:scale, :min => 0.1, :max => 2.0)
+        )
+      end
+      factories << RubyOnAcid::RandomWalkFactory.new(
+        :interval => random_factory.get(:interval, :max => 0.1)
       )
       4.times do
         factory = RubyOnAcid::SineFactory.new
         factory.interval = random_factory.get(:increment, :min => -0.1, :max => 0.1)
-        source_factories << factory
+        factories << factory
       end
       2.times do
         factory = RubyOnAcid::RepeatFactory.new
         factory.repeat_count = random_factory.get(:interval, :min => 2, :max => 100)
-        factory.source_factory = random_element(source_factories)
-        source_factories << factory
+        factory.source_factories << random_element(factories)
+        factories << factory
       end
       2.times do
-        source_factories << RubyOnAcid::RoundingFactory.new(
-          random_element(source_factories),
-          random_factory.get(:interval, :min => 0.1, :max => 0.5)
+        factories << RubyOnAcid::RoundingFactory.new(
+          :source_factories => [random_element(factories)],
+          :nearest => random_factory.get(:interval, :min => 0.1, :max => 0.5)
         )
       end
       combination_factory = RubyOnAcid::CombinationFactory.new
       2.times do
-        combination_factory.source_factories << random_element(source_factories)
+        combination_factory.source_factories << random_element(factories)
       end
-      source_factories << combination_factory
-      
-      source_factories
-
+      factories << combination_factory
+      proximity_factory = RubyOnAcid::ProximityFactory.new
+      2.times do
+        proximity_factory.source_factories << random_element(factories)
+      end
+      factories << proximity_factory
+    
+      factories
     end
     
     def random_element(array)

data/lib/rubyonacid/factories/flash.rb

@@ -8,11 +8,13 @@ class FlashFactory < Factory
   #The number of times to return a value before switching.
   attr_accessor :interval
   
-  def initialize(interval = 3)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :interval => 3
+  def initialize(options = {})
     super
     @counters = {}
     @values = {}
-    @interval = interval
+    @interval = options[:interval] || 3
   end
   
   #If key is over threshold, flip to other value and reset counter.

data/lib/rubyonacid/factories/increment.rb

@@ -13,11 +13,13 @@ class IncrementFactory < Factory
     @counters.each_key{|k| @counters[k] = @start_value}
   end
   
-  def initialize(interval = 0.001)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :interval => 0.001
+  def initialize(options = {})
     super
     @start_value = 0.0
     @counters = {}
-    @interval = interval
+    @interval = options[:interval] || 0.001
   end
   
   #Increment counter for given key and return it. Constrain between 0 and 1.

data/lib/rubyonacid/factories/input.rb

@@ -5,9 +5,7 @@ module RubyOnAcid
 #Allows values to be assigned from an external source.
 class InputFactory < Factory
 
-  #A factory to pull values from in the event no values are stored for a given key.
-  attr_accessor :default_factory
-  
+  #Takes a hash with all keys supported by Factory.
   def initialize
     super
     @input_values = {}
@@ -18,12 +16,13 @@ class InputFactory < Factory
   
   #Retrieves the next stored value for the given key.
   #The key that values are pulled from will not necessarily be the same as that passed to put() - value queue keys are assigned to get_unit() keys at random.
+  #Retrieve average from source factories if no queued values are available, or zero if no source factories are assigned.
   def get_unit(key)
     current_key = assigned_key(key)
     if @input_values[current_key] and @input_values[current_key].length > 0
-      return scale(current_key, @input_values[current_key].shift) || default_value(key)
+      return scale(current_key, @input_values[current_key].shift) || super(current_key) || 0.0
     else
-      return default_value(key)
+      return super(current_key) || 0.0
     end
   end
 
@@ -53,10 +52,6 @@ class InputFactory < Factory
   
   private
   
-    def default_value(key)
-      @default_factory ? @default_factory.get_unit(key) : 0.0
-    end
-  
     def assigned_key(key)
       return @key_assignments[key] if @key_assignments[key]
       key_pool = @input_values.keys - @key_assignments.values

data/lib/rubyonacid/factories/lissajous.rb

@@ -0,0 +1,58 @@
+require 'rubyonacid/factory'
+
+module RubyOnAcid
+
+#Produces a Lissajous curve over pairs of keys.
+class LissajousFactory < Factory
+  
+  #Value to scale Y values by.  Affects the number of loops in a curve.
+  attr_accessor :scale
+
+  #Counters used to calculate sine/cosine values will be incremented by this amount with each query.
+  attr_accessor :interval
+  
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :scale => 0.2
+  #  :interval => 0.1
+  def initialize(options = {})
+    super
+    @scale = options[:scale] || 0.2
+    @interval = options[:interval] || 0.1
+    @counters = {}
+    @x_y_assignments = {}
+    @next_key_assignment = :x
+  end
+  
+  #Assigns the given key to receive either X or Y values from the Lissajous curve, if it isn't already assigned.
+  #Then returns the appropriate value for the key.
+  def get_unit(key)
+    unless @x_y_assignments[key]
+      @x_y_assignments[key] = @next_key_assignment
+      if @next_key_assignment == :x
+        @next_key_assignment = :y
+      else
+        @next_key_assignment = :x
+      end
+    end
+    @counters[key] ||= 0
+    @counters[key] += @interval
+    if @x_y_assignments[key] == :x
+      return calculate_x(@counters[key])
+    else
+      return calculate_y(@counters[key])
+    end
+  end
+  
+  private
+  
+    def calculate_x(value)
+      (Math.sin(value) + 1) / 2
+    end
+    
+    def calculate_y(value)
+      (Math.cos(value * scale) + 1) / 2
+    end
+  
+end
+
+end

data/lib/rubyonacid/factories/loop.rb

@@ -12,10 +12,12 @@ class LoopFactory < Factory
     @interval = value
   end
   
-  def initialize(interval = 0.01)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :interval => 0.01
+  def initialize(options = {})
     super
     @counters = {}
-    @interval = interval
+    self.interval = options[:interval] || 0.01
   end
   
   #Increment counter for key, looping it around to opposite side if it exits boundary.

data/lib/rubyonacid/factories/meta.rb

@@ -2,15 +2,12 @@ require 'rubyonacid/factory'
 
 module RubyOnAcid
 
-#The MetaFactory assigns factories to requested value types.
+#The MetaFactory assigns its source factories to requested value types.
 class MetaFactory < Factory
   
-  #An array of Factory objects to assign to keys.
-  attr_accessor :factory_pool
-  
-  def initialize(factory_pool = [])
+  #Takes a hash with all keys supported by Factory.
+  def initialize(options = {})
     super
-    @factory_pool = factory_pool
     @assigned_factories = {}
   end
   
@@ -20,9 +17,9 @@ class MetaFactory < Factory
   end
   
   #Returns the value of get_unit from the Factory assigned to the given key.
-  #When a key is needed that a Factory is not already assigned to, one will be assigned at random from the factory_pool.
+  #When a key is needed that a Factory is not already assigned to, one will be assigned at random from the pool of source factories.
   def get_unit(key)
-    @assigned_factories[key] ||= @factory_pool[rand(@factory_pool.length)]
+    @assigned_factories[key] ||= source_factories[rand(source_factories.length)]
     @assigned_factories[key].get_unit(key)
   end
   

data/lib/rubyonacid/factories/proximity.rb

@@ -0,0 +1,26 @@
+require 'rubyonacid/factory'
+
+module RubyOnAcid
+
+#Scales values from source factories according to how close they are to a target value.
+class ProximityFactory < Factory
+  
+  #The target value.
+  attr_accessor :target
+  
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :target => rand()
+  def initialize(options = {})
+    super
+    @target = options[:target] || rand
+  end
+
+  #Return values approach 1.0 as the values from the source factories approach the target value.
+  #Values approach zero as the source factory values approach a distance of 1.0 from the target value.
+  def get_unit(key)
+    1.0 - (super - @target).abs
+  end
+  
+end
+
+end

data/lib/rubyonacid/factories/random_walk.rb

@@ -2,20 +2,22 @@ require 'rubyonacid/factory'
 
 module RubyOnAcid
 
-#Increments from the minimum value, stopping at the maximum, or decrements from the maximum value, stopping at the minimum.
+#Each subsequent call subtracts or adds a random amount to a given key's value.
 class RandomWalkFactory < Factory
 
   #The maximum amount to change counters by.
   attr_accessor :interval
   
-  def initialize(interval = 0.001)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :interval => 0.001
+  def initialize(options = {})
     super
     @start_value = 0.0
     @values = {}
-    @interval = interval
+    @interval = options[:interval] || 0.001
   end
   
-  #Increment counter for given key and return it. Constrain between 0 and 1.
+  #Add a random amount ranging between interval and -1 * interval to the given key's value and return the new value.
   def get_unit(key)
     @values[key] ||= rand
     @values[key] += (rand * (2 * @interval)) - @interval

data/lib/rubyonacid/factories/repeat.rb

@@ -5,27 +5,26 @@ module RubyOnAcid
 #Gets values from a source factory and returns the same value the given number of times before getting a fresh value.
 class RepeatFactory < Factory
   
-  #Factory to get values from.
-  attr_accessor :source_factory
   #The number of times to repeat a value for a given key.
   attr_accessor :repeat_count
   
-  def initialize(source_factory = nil, repeat_count = 2)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :repeat_count => 2
+  def initialize(options = {})
     super
-    @source_factory = source_factory
-    @repeat_count = repeat_count
+    @repeat_count = options[:repeat_count] || 2
     @repeat_counts = {}
     @values = {}
   end
   
-  #Returns the value of get_unit on the source factory the assigned number of times.
+  #Returns the value of get_unit from the source factories the assigned number of times.
   def get_unit(key)
     @repeat_counts[key] ||= 0
     if @repeat_counts[key] >= @repeat_count
       @values[key] = nil 
       @repeat_counts[key] = 0
     end
-    @values[key] ||= @source_factory.get_unit(key)
+    @values[key] ||= super
     @repeat_counts[key] += 1
     @values[key]
   end

data/lib/rubyonacid/factories/rinda.rb

@@ -9,16 +9,16 @@ class RindaFactory < Factory
   #Time in seconds to wait for a value before giving up and returning a default value for the given key.
   #Default is 0, which will return immediately.
   attr_accessor :timeout
-  #A factory to pull requests from if retrieval of values via Rinda times out.
-  attr_accessor :default_factory
   #The URI to connect to.  Default is "druby://127.0.0.1:7632" (7632 == RNDA).
   attr_accessor :uri
   
-  def initialize(uri = "druby://127.0.0.1:7632", timeout = 0)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :uri => "druby://127.0.0.1:7632"
+  #  :timeout => 0
+  def initialize(options = {})
     super
-    @uri = uri
-    @timeout = timeout
-    @default_factory = nil
+    @uri = options[:uri] || "druby://127.0.0.1:7632"
+    @timeout = options[:timeout] || 0
     @prior_values = {}
   end
   
@@ -35,10 +35,10 @@ class RindaFactory < Factory
       key, value = @space.take([key, Float], @timeout)
       @prior_values[key] = value
     rescue Rinda::RequestExpiredError => exception
-      if @default_factory
-        value = @default_factory.get_unit(key)
-      else
+      if source_factories.empty?
         value = @prior_values[key]
+      else
+        value = super
       end
     end
     value

data/lib/rubyonacid/factories/rounding.rb

@@ -5,19 +5,19 @@ module RubyOnAcid
 #Rounds values from a source factory, useful for clustering values into groups.
 class RoundingFactory < Factory
   
-  #Factory to get values from.
-  attr_accessor :source_factory
   #Source values will be rounded to the nearest multiple of this value.
   attr_accessor :nearest
   
-  def initialize(source_factory = nil, nearest = 0.1)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :nearest => 0.1
+  def initialize(options = {})
     super
-    @source_factory = source_factory
-    @nearest = nearest
+    @nearest = options[:nearest] || 0.1
   end
   
+  #Get values from source factories and round result to assigned nearest multiple. 
   def get_unit(key)
-    round_to(@source_factory.get_unit(key), @nearest)
+    round_to(super, @nearest)
   end
 
   private
@@ -27,7 +27,8 @@ class RoundingFactory < Factory
       if modulus / multiple_of < 0.5
         return multiple_of * quotient
       else
-        return multiple_of * (quotient + 1)
+        value = multiple_of * (quotient + 1)
+        return value > 1.0 ? 1.0 : value
       end
     end  
 

data/lib/rubyonacid/factories/sine.rb

@@ -8,10 +8,12 @@ class SineFactory < Factory
   #Counters used to calculate sine values will be incremented by this amount with each query.
   attr_accessor :interval
   
-  def initialize(interval = 0.1)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :interval => 0.1
+  def initialize(options = {})
     super
     @counters = {}
-    @interval = interval
+    @interval = options[:interval] || 0.1
   end
   
   #Increment counter for key and get its sine, then scale it between 0 and 1.

data/lib/rubyonacid/factories/skip.rb

@@ -8,9 +8,11 @@ class SkipFactory < Factory
   #The percentage odds that the factory will return 0 instead of 1.
   attr_accessor :odds
   
-  def initialize(odds = 0.1)
+  #Takes a hash with all keys supported by Factory, plus these keys and defaults:
+  #  :odds => 0.1
+  def initialize(options = {})
     super
-    @odds = odds
+    @odds = options[:odds] || 0.1
   end
   
   #If a random number between 0 and 1 is less than the assigned odds value, will return 0 (a "skip").

data/lib/rubyonacid/factory.rb

@@ -4,9 +4,22 @@ module RubyOnAcid
 #Should not normally be instantiated directly.
 class Factory
 
-  def initialize(*args)
+  #An array of factories to be queried by get_unit and have their return values averaged.
+  attr_accessor :source_factories
+
+  #Takes a hash with these keys and defaults:
+  #  :source_factories => []
+  def initialize(options = {})
     @minimums = {}
     @maximums = {}
+    @source_factories = options[:source_factories] || []
+  end
+  
+  #Calls #get_unit(key) on each source factory and averages results.
+  def get_unit(key)
+    return nil if source_factories.empty?
+    values = source_factories.map{|factory| factory.get_unit(key)}
+    average = values.inject(0.0){|sum, value| sum += value} / source_factories.size
   end
 
   #Calls get_unit with key to get value between 0.0 and 1.0, then converts that value to be between given minimum and maximum.
@@ -35,7 +48,6 @@ class Factory
     all_choices[index]
   end
   
-  
 end
 
 end

data/spec/factories/attraction_spec.rb

@@ -13,7 +13,7 @@ describe AttractionFactory do
   describe "general behavior" do
   
     before :each do
-      @it.source_factory = mock('Factory', :get_unit => 0.2)
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
       @it.attractor_factory = mock('Factory', :get_unit => 0.3)
     end
   
@@ -24,13 +24,14 @@ describe AttractionFactory do
   describe "#get_unit" do
       
     it "retrieves values from source factory and attracts them toward values from the attractor factory" do
-      @it.source_factory = mock('Factory', :get_unit => 0.0)
+      @it.source_factories << mock('Factory', :get_unit => 0.0)
       @it.attractor_factory = mock('Factory', :get_unit => 1.0)
       @it.get_unit(:x).should > 0.0
     end
   
     it "exerts greater attraction if values are closer" do
-      @it.source_factory = mock('Factory', :get_unit => 0.0)
+      pending
+      @it.source_factories << mock('Factory', :get_unit => 0.0)
       @it.attractor_factory = mock('Factory')
       @it.attractor_factory.should_receive(:get_unit).and_return(1.0)
       distant_value = @it.get_unit(:x)
@@ -40,7 +41,7 @@ describe AttractionFactory do
     end
     
     it "reduces source value if attractor's value is lower" do
-      @it.source_factory = mock('Factory', :get_unit => 0.9)
+      @it.source_factories << mock('Factory', :get_unit => 0.9)
       @it.attractor_factory = mock('Factory', :get_unit => 0.1)
       @it.get_unit(:x).should < 0.9
     end

data/spec/factories/input_spec.rb

@@ -11,12 +11,11 @@ describe InputFactory do
   end
 
   describe "general behavior" do
-
+  
     before :each do
-      @it.put(:foo, 0.0)
-      @it.put(:foo, 1.0)
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
     end
-
+  
     it_should_behave_like "a factory"
     
   end

data/spec/factories/lissajous_spec.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require "shared_factory_specs"
+require 'rubyonacid/factories/lissajous'
+
+include RubyOnAcid
+
+describe LissajousFactory do
+  
+  
+  before :each do
+    @it = LissajousFactory.new
+  end
+  
+  describe "general behavior" do
+  
+    before :each do
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+    end
+  
+    it_should_behave_like "a factory"
+    
+  end
+  
+  describe "#get_unit" do
+    
+    it "Returns x/y coordinates" do
+      @it.interval = 0.5
+      @it.get_unit(:x).should be_close(0.739, MARGIN)
+      @it.get_unit(:y).should be_close(0.990, MARGIN)
+      @it.get_unit(:x).should be_close(0.921, MARGIN)
+      @it.get_unit(:y).should be_close(0.990, MARGIN)
+      @it.get_unit(:x).should be_close(0.998, MARGIN)
+      @it.get_unit(:y).should be_close(0.978, MARGIN)
+    end
+    
+    it "returns x for the first assigned key, y for the second, x again for the third, etc." do
+      @it.interval = 0.5
+      @it.get_unit(:x).should be_close(0.739, MARGIN)
+      @it.get_unit(:y).should be_close(0.997, MARGIN)
+      @it.get_unit(:z).should be_close(0.739, MARGIN)
+      @it.get_unit(:x).should be_close(0.921, MARGIN)
+    end
+    
+  end  
+
+end

data/spec/factories/meta_spec.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 require 'rubyonacid/factories/meta'
+require "shared_factory_specs"
 
 include RubyOnAcid
 
@@ -8,10 +9,23 @@ describe MetaFactory do
   before :each do
     @it = MetaFactory.new
   end
+
+
+  describe "general behavior" do
+  
+    before :each do
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+      @it.source_factories << mock('Factory', :get_unit => 0.1)
+    end
+  
+    it_should_behave_like "a factory"
+    
+  end
+  
   
   it "takes a list of factories, then randomly and permanently assigns a factory to each requested key" do
-    @it.factory_pool << mock('FactoryZero', :get_unit => 0.0)
-    @it.factory_pool << mock('FactoryOne', :get_unit => 1.0)
+    @it.source_factories << mock('FactoryZero', :get_unit => 0.0)
+    @it.source_factories << mock('FactoryOne', :get_unit => 1.0)
     ('a'..'z').each do |key|
       @it.get_unit(key.to_sym).should == @it.get_unit(key.to_sym)
     end

data/spec/factories/proximity_spec.rb

@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'rubyonacid/factories/proximity'
+require "shared_factory_specs"
+
+include RubyOnAcid
+
+describe ProximityFactory do
+  
+  before :each do
+    @it = ProximityFactory.new
+  end
+
+  describe "general behavior" do
+  
+    before :each do
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+    end
+  
+    it_should_behave_like "a factory"
+    
+  end
+  
+  describe "#get_unit" do
+    it "requests value from the source factory and scales it based on its proximity to the target value" do
+      source_factory = mock('Factory')
+      @it.source_factories << source_factory
+      @it.target = 0.5
+      source_factory.should_receive(:get_unit).with(:x).and_return(0.5)
+      near_value = @it.get_unit(:x)
+      source_factory.should_receive(:get_unit).with(:x).and_return(0.7)
+      far_value = @it.get_unit(:x)
+      near_value.should > far_value
+    end
+    
+    it "should return 1.0 if source value matches target exactly" do
+      source_factory = mock('Factory')
+      @it.source_factories << source_factory
+      @it.target = 0.5
+      source_factory.should_receive(:get_unit).with(:x).and_return(0.5)
+      @it.get_unit(:x).should be_close(1.0, MARGIN)
+    end
+    
+    it "should approach zero as distance approaches 1.0" do
+      source_factory = mock('Factory')
+      @it.source_factories << source_factory
+      @it.target = 1.0
+      source_factory.should_receive(:get_unit).with(:x).and_return(0.0)
+      @it.get_unit(:x).should be_close(0.0, MARGIN)
+    end
+  end
+  
+end

data/spec/factories/random_walk_spec.rb

@@ -24,4 +24,6 @@ describe RandomWalkFactory do
     values[2].should be_close(values[1], 0.01)
   end
   
+  it "adds random amount within given interval to source factories result if source factories are assigned"
+  
 end

data/spec/factories/repeat_spec.rb

@@ -1,10 +1,21 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 require 'rubyonacid/factories/repeat'
+require "shared_factory_specs"
 
 include RubyOnAcid
 
 describe RepeatFactory do
   
+  describe "general behavior" do
+  
+    before :each do
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+    end
+  
+    it_should_behave_like "a factory"
+    
+  end
+  
   before :each do
     @it = RepeatFactory.new
   end
@@ -12,7 +23,7 @@ describe RepeatFactory do
   it "Requests a value from the source factory and repeats it a given number of times" do
     source_factory = mock('Factory')
     source_factory.should_receive(:get_unit).exactly(3).times.and_return(0.0, 1.0, 0.5)
-    @it.source_factory = source_factory
+    @it.source_factories << source_factory
     @it.repeat_count = 2
     @it.get_unit(:x).should == 0.0
     @it.get_unit(:x).should == 0.0
@@ -24,7 +35,7 @@ describe RepeatFactory do
   it "Tracks repeats on a per-key basis" do
     source_factory = mock('Factory')
     source_factory.should_receive(:get_unit).exactly(4).times.and_return(0.0, 1.0, 0.5, 0.75)
-    @it.source_factory = source_factory
+    @it.source_factories << source_factory
     @it.repeat_count = 2
     @it.get_unit(:x).should == 0.0
     @it.get_unit(:y).should == 1.0

data/spec/factories/rinda_spec.rb

@@ -39,7 +39,7 @@ describe RindaFactory do
     @it.start_service
     default_factory = mock('Factory')
     default_factory.stub!(:get_unit).and_return(0.74)
-    @it.default_factory = default_factory
+    @it.source_factories << default_factory
     @it.get_unit(:a).should == 0.74
   end
   

data/spec/factories/rounding_spec.rb

@@ -13,7 +13,7 @@ describe RoundingFactory do
   describe "general behavior" do
   
     before :each do
-      @it.source_factory = mock('Factory', :get_unit => 0.2)
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
     end
   
     it_should_behave_like "a factory"
@@ -22,7 +22,7 @@ describe RoundingFactory do
   
   it "Requests a value from the source factory and rounds it to a multiple of the requested number" do
     source_factory = mock('Factory')
-    @it.source_factory = source_factory
+    @it.source_factories << source_factory
     @it.nearest = 0.3
     source_factory.should_receive(:get_unit).and_return(0.7)
     @it.get_unit(:x).should be_close(0.6, MARGIN)
@@ -35,32 +35,34 @@ describe RoundingFactory do
   end
   
   it "can round to multiples of 0.2" do
-    @it.source_factory = mock('Factory')
+    source_factory = mock('Factory')
+    @it.source_factories << source_factory
     @it.nearest = 0.2
-    @it.source_factory.should_receive(:get_unit).and_return(0.0)
+    source_factory.should_receive(:get_unit).and_return(0.0)
     @it.get_unit(:x).should be_close(0.0, MARGIN)
-    @it.source_factory.should_receive(:get_unit).and_return(0.11)
+    source_factory.should_receive(:get_unit).and_return(0.11)
     @it.get_unit(:x).should be_close(0.2, MARGIN)
-    @it.source_factory.should_receive(:get_unit).and_return(0.2)
+    source_factory.should_receive(:get_unit).and_return(0.2)
     @it.get_unit(:x).should be_close(0.2, MARGIN)
-    @it.source_factory.should_receive(:get_unit).and_return(0.31)
+    source_factory.should_receive(:get_unit).and_return(0.31)
     @it.get_unit(:x).should be_close(0.4, MARGIN)
-    @it.source_factory.should_receive(:get_unit).and_return(0.4)
+    source_factory.should_receive(:get_unit).and_return(0.4)
     @it.get_unit(:x).should be_close(0.4, MARGIN)
   end
   
   it "can round to multiples of 1.0" do
-    @it.source_factory = mock('Factory')
+    source_factory = mock('Factory')
+    @it.source_factories << source_factory
     @it.nearest = 1.0
-    @it.source_factory.should_receive(:get_unit).and_return(0.0)
+    source_factory.should_receive(:get_unit).and_return(0.0)
     @it.get_unit(:x).should be_close(0.0, MARGIN)
-    @it.source_factory.should_receive(:get_unit).and_return(0.4)
+    source_factory.should_receive(:get_unit).and_return(0.4)
     @it.get_unit(:x).should be_close(0.0, MARGIN)
-    @it.source_factory.should_receive(:get_unit).and_return(0.51)
+    source_factory.should_receive(:get_unit).and_return(0.51)
     @it.get_unit(:x).should be_close(1.0, MARGIN)
-    @it.source_factory.should_receive(:get_unit).and_return(0.9)
+    source_factory.should_receive(:get_unit).and_return(0.9)
     @it.get_unit(:x).should be_close(1.0, MARGIN)
-    @it.source_factory.should_receive(:get_unit).and_return(1.0)
+    source_factory.should_receive(:get_unit).and_return(1.0)
     @it.get_unit(:x).should be_close(1.0, MARGIN)
   end
   

data/spec/factory_spec.rb

@@ -7,7 +7,7 @@ include RubyOnAcid
 describe Factory do
   
   before :each do
-    @it = ConstantFactory.new
+    @it = Factory.new
   end
   
   describe "#choose" do
@@ -56,4 +56,24 @@ describe Factory do
     
   end
   
+  
+  describe "#source_factories" do
+    
+    it "calls #get_unit on each and averages results" do
+      factory1 = mock('Factory')
+      @it.source_factories << factory1
+      factory2 = mock('Factory')
+      @it.source_factories << factory2
+      factory3 = mock('Factory')
+      @it.source_factories << factory3
+      factory1.should_receive(:get_unit).and_return(0.1)
+      factory2.should_receive(:get_unit).and_return(0.2)
+      factory3.should_receive(:get_unit).and_return(0.3)
+      result = @it.get_unit(:x)
+      result.should be_close(0.2, MARGIN)
+    end
+    
+  end
+  
+  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jay McGavren
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 -07:00
+date: 2010-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,8 +63,10 @@ files:
 - lib/rubyonacid/factories/flash.rb
 - lib/rubyonacid/factories/increment.rb
 - lib/rubyonacid/factories/input.rb
+- lib/rubyonacid/factories/lissajous.rb
 - lib/rubyonacid/factories/loop.rb
 - lib/rubyonacid/factories/meta.rb
+- lib/rubyonacid/factories/proximity.rb
 - lib/rubyonacid/factories/random.rb
 - lib/rubyonacid/factories/random_walk.rb
 - lib/rubyonacid/factories/repeat.rb
@@ -79,8 +81,10 @@ files:
 - spec/factories/flash_spec.rb
 - spec/factories/increment_spec.rb
 - spec/factories/input_spec.rb
+- spec/factories/lissajous_spec.rb
 - spec/factories/loop_spec.rb
 - spec/factories/meta_spec.rb
+- spec/factories/proximity_spec.rb
 - spec/factories/random_spec.rb
 - spec/factories/random_walk_spec.rb
 - spec/factories/repeat_spec.rb
@@ -128,8 +132,10 @@ test_files:
 - spec/factories/flash_spec.rb
 - spec/factories/increment_spec.rb
 - spec/factories/input_spec.rb
+- spec/factories/lissajous_spec.rb
 - spec/factories/loop_spec.rb
 - spec/factories/meta_spec.rb
+- spec/factories/proximity_spec.rb
 - spec/factories/random_spec.rb
 - spec/factories/random_walk_spec.rb
 - spec/factories/repeat_spec.rb
@@ -141,7 +147,6 @@ test_files:
 - spec/shared_factory_specs.rb
 - spec/spec_helper.rb
 - examples/ascii.rb
-- examples/ascii2.rb
 - examples/midi.rb
 - examples/raw_audio.rb
 - examples/rinda_agent.rb

data/examples/ascii2.rb

@@ -1,23 +0,0 @@
-require 'rubyonacid/factories/all'
-
-#This method takes any Factory and uses it to determine the length of lines to print.
-def make_lines(factory)
-  #Show what factory we're working with.
-  puts factory.class.name
-  1000.times do
-    #Get the length of the line.
-    #The :max option scales the returned length to be between 0 and 79.
-    line_length = factory.get(:length, :max => 79)
-    puts "|" * line_length
-  end
-end
-
-#A CombinationFactory combines the values of two or more other factories.
-factories_to_combine = [
-  RubyOnAcid::SineFactory.new(0.2),
-  RubyOnAcid::SineFactory.new(-0.5)
-]
-make_lines RubyOnAcid::CombinationFactory.new(
-  :source_factories => factories_to_combine,
-  :constrain_mode => RubyOnAcid::CombinationFactory::CONSTRAIN
-)