nudge 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/instructions/conversion/float_from_proportion.rb

@@ -0,0 +1,25 @@
+# pops the top +:proportion+ item;
+# pushes a new +:float+ item with the same value
+#
+# *needs:* 1 +:proportion+
+#
+# *pushes:* 1 +:float+
+#
+
+class FloatFromProportionInstruction < Instruction
+  def preconditions?
+    needs :proportion, 1
+  end
+  
+  def setup
+    @arg = @context.pop_value(:proportion)
+  end
+  
+  def derive
+    @result = ValuePoint.new("float", @arg)
+  end
+  
+  def cleanup
+    pushes :float, @result
+  end
+end

data/lib/instructions/conversion/proportion_from_float.rb

@@ -0,0 +1,26 @@
+# pops the top +:float+ item;
+# pushes a new +:proportion+ item,
+# with value obtained by taking the float modulo 1.0
+#
+# *needs:* 1 +:float+
+#
+# *pushes:* 1 +:proportion+
+#
+
+class ProportionFromFloatInstruction < Instruction
+  def preconditions?
+    needs :float, 1
+  end
+  
+  def setup
+    @arg = @context.pop_value(:float)
+  end
+  
+  def derive
+    @result = ValuePoint.new("proportion", @arg % 1.0)
+  end
+  
+  def cleanup
+    pushes :proportion, @result
+  end
+end

data/lib/instructions/float/float_divide.rb

@@ -3,7 +3,7 @@
 #
 # note: the top item is the denominator, the second item is the numerator
 #
-# note: will push an +:error+ ValuePoint instead of an +:int+ if the numerator is 0.0
+# note: will push an +:error+ ValuePoint instead of a +:float+ if the numerator is 0.0
 #
 # *needs:* 2 +:float+
 #

data/lib/instructions/proportion/proportion_bounded_add.rb

@@ -0,0 +1,23 @@
+# pops the top 2 items of the +:proportion+ stack;
+# pushes a ValuePoint with their sum (or 1.0, whichever is smaller) onto the +:proportion+ stack
+#
+# *needs:* 2 +:proportion+
+#
+# *pushes:* 1 +:proportion+
+#
+
+class ProportionBoundedAddInstruction < Instruction
+  def preconditions?
+    needs :proportion, 2
+  end
+  def setup
+    @arg1 = @context.pop_value(:proportion)
+    @arg2 = @context.pop_value(:proportion)
+  end
+  def derive
+    @result = ValuePoint.new("proportion", [@arg1 + @arg2, 1.0].min)
+  end
+  def cleanup
+    pushes :proportion, @result
+  end
+end

data/lib/instructions/proportion/proportion_bounded_divide.rb

@@ -0,0 +1,32 @@
+# pops the top 2 items of the +:proportion+ stack;
+# pushes a ValuePoint with their quotient onto the +:proportion+ stack, bounded by [0.0,1.0]
+#
+# note: the top item is the denominator, the second item is the numerator
+#
+# note: will push an +:error+ ValuePoint instead of the expected result if the numerator is 0.0
+#
+# *needs:* 2 +:proportion+
+#
+# *pushes:* 1 +:proportion+
+#
+
+class ProportionBoundedDivideInstruction < Instruction
+  def preconditions?
+    needs :proportion, 2
+  end
+  def setup
+    @arg2 = @context.pop_value(:proportion)
+    @arg1 = @context.pop_value(:proportion)
+  end
+  def derive
+    if @arg2 != 0.0
+      quotient = [@arg1/@arg2, 1.0].min
+      @result = ValuePoint.new("proportion", quotient)
+    else
+      raise NaNResultError, "#{self.class} cannot divide by 0.0"
+    end
+  end
+  def cleanup
+    pushes :proportion, @result
+  end
+end

data/lib/instructions/proportion/proportion_bounded_subtract.rb

@@ -0,0 +1,25 @@
+# pops the top 2 items of the +:proportion+ stack;
+# pushes a ValuePoint with their difference (or 0.0, whichever is bigger) onto the +:proportion+ stack
+#
+# *note:* the first item popped is the number to be subtracted from the other
+#
+# *needs:* 2 +:proportion+
+#
+# *pushes:* 1 +:proportion+
+#
+
+class ProportionBoundedSubtractInstruction < Instruction
+  def preconditions?
+    needs :proportion, 2
+  end
+  def setup
+    @arg2 = @context.pop_value(:proportion)
+    @arg1 = @context.pop_value(:proportion)
+  end
+  def derive
+    @result = ValuePoint.new("proportion", [@arg1 - @arg2, 0.0].max)
+  end
+  def cleanup
+    pushes :proportion, @result
+  end
+end

data/lib/instructions/proportion/proportion_max.rb

@@ -0,0 +1,23 @@
+# pops the top 2 items of the +:proportion+ stack;
+# pushes a new ValuePoint onto the +:proportion+ stack with the largest of the two values
+#
+# *needs:* 2 +:proportion+
+#
+# *pushes:* 1 +:proportion+
+#
+
+class ProportionMaxInstruction < Instruction
+  def preconditions?
+    needs :proportion, 2
+  end
+  def setup
+    @arg2 = @context.pop_value(:proportion)
+    @arg1 = @context.pop_value(:proportion)
+  end
+  def derive
+    @result = ValuePoint.new("proportion", [@arg1, @arg2].max)
+  end
+  def cleanup
+    pushes :proportion, @result
+  end
+end

data/lib/instructions/proportion/proportion_min.rb

@@ -0,0 +1,23 @@
+# pops the top 2 items of the +:proportion+ stack;
+# pushes a new ValuePoint onto the +:proportion+ stack with the smallest of the two values
+#
+# *needs:* 2 +:proportion+
+#
+# *pushes:* 1 +:proportion+
+#
+
+class ProportionMinInstruction < Instruction
+  def preconditions?
+    needs :proportion, 2
+  end
+  def setup
+    @arg2 = @context.pop_value(:proportion)
+    @arg1 = @context.pop_value(:proportion)
+  end
+  def derive
+    @result = ValuePoint.new("proportion", [@arg1, @arg2].min)
+  end
+  def cleanup
+    pushes :proportion, @result
+  end
+end

data/lib/instructions/proportion/proportion_multiply.rb

@@ -0,0 +1,23 @@
+# pops the top 2 items of the +:proportion+ stack;
+# pushes a ValuePoint with their product onto the +:proportion+ stack
+#
+# *needs:* 2 +:proportion+
+#
+# *pushes:* 1 +:proportion+
+#
+
+class ProportionMultiplyInstruction < Instruction
+  def preconditions?
+    needs :proportion, 2
+  end
+  def setup
+    @arg2 = @context.pop_value(:proportion)
+    @arg1 = @context.pop_value(:proportion)
+  end
+  def derive
+    @result = ValuePoint.new("proportion", @arg1 * @arg2)
+  end
+  def cleanup
+    pushes :proportion, @result
+  end
+end

data/lib/interpreter/types/proportion_type.rb

@@ -0,0 +1,39 @@
+module NudgeType
+  
+  class ProportionType
+    extend TypeBehaviors
+    @default_lowest = 0.0
+    @default_highest = 1.0
+
+    def self.default_lowest
+      @default_lowest
+    end
+
+    def self.default_highest
+      @default_highest
+    end
+
+    def self.random_value(params = {})
+      bottom = params[:proportion_lower_bound] || @default_lowest
+      top = params[:proportion_upper_bound] || @default_highest
+      raise ArgumentError, "ProportionType#{random_value} bounds must be in range [0.0,1.0]" unless
+        (0.0..1.0).include?(bottom) && (0.0..1.0).include?(top)
+      raise ArgumentError, "ProportionType#{random_value} bounds are inverted" unless
+        bottom <= top
+      range = top - bottom
+      (rand*range) + bottom
+    end
+    
+    def self.from_s(string_value)
+      (string_value.to_f != 1.0) ? (string_value.to_f % 1.0) : 1.0
+    end
+    
+    def self.recognizes?(a_thing)
+      !a_thing.kind_of?(String) && !a_thing.nil? && a_thing.respond_to?(:to_f)
+    end
+    
+    def self.any_value(options ={})
+      self.random_value(options)
+    end
+  end
+end

data/lib/nudge.rb

@@ -11,6 +11,7 @@ require 'cli/runner'
 
 require 'interpreter/interpreter'
 require 'interpreter/types/pushTypes'
+require 'interpreter/types/proportion_type'
 require 'interpreter/types/codeType'
 require 'interpreter/stack'
 require 'interpreter/programPoints'
@@ -23,6 +24,8 @@ Dir.glob(File.dirname(__FILE__) + '/instructions/exec/*') {|file| require file}
 Dir.glob(File.dirname(__FILE__) + '/instructions/int/*') {|file| require file}
 Dir.glob(File.dirname(__FILE__) + '/instructions/float/*') {|file| require file}
 Dir.glob(File.dirname(__FILE__) + '/instructions/name/*') {|file| require file}
+Dir.glob(File.dirname(__FILE__) + '/instructions/proportion/*') {|file| require file}
+
 
 Dir.glob(File.dirname(__FILE__) + '/instructions/conversion/*') {|file| require file}
 

data/spec/instructions/float/float_from_proportion_spec.rb

@@ -0,0 +1,37 @@
+#encoding: utf-8
+require File.join(File.dirname(__FILE__), "../../spec_helper")
+include Nudge
+
+describe FloatFromProportionInstruction do
+  
+  it_should_behave_like "every Nudge Instruction"
+  
+  before(:each) do
+    @context = Interpreter.new
+    @i1 = FloatFromProportionInstruction.new(@context)
+    @context.clear_stacks
+  end
+  
+  it "should check that there are enough parameters" do
+    @context.push(:proportion, 0.4)
+    @i1.preconditions?.should == true
+  end
+  
+  it "should raise an error if the preconditions aren't met" do
+    @context.clear_stacks # there are no params at all
+    lambda{@i1.preconditions?}.should raise_error(Instruction::NotEnoughStackItems)
+  end
+  
+  it "should successfully run #go only if all preconditions are met" do
+    @context.push(:proportion, 0.2)
+    @i1.should_receive(:cleanup)
+    @i1.go
+  end
+  
+  it "should create and push the new (expected) value to the right place" do
+    @context.push(:proportion, "0.123")
+    @i1.go
+    @context.depth(:float).should == 1
+    @context.peek_value(:float).should be_close(0.123,0.000001)
+  end
+end

data/spec/instructions/proportion/proportion_bounded_add_spec.rb

@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), "../../spec_helper")
+include Nudge
+
+describe ProportionBoundedAddInstruction do
+  
+  it_should_behave_like "every Nudge Instruction"
+  
+  before(:each) do
+    @context = Interpreter.new
+    @i1 = ProportionBoundedAddInstruction.new(@context)
+  end
+  
+  
+  describe "\#go" do
+    before(:each) do
+      @context = Interpreter.new
+      @i1 = ProportionBoundedAddInstruction.new(@context)
+      @context.clear_stacks
+      @p1 = ValuePoint.new("proportion", 0.2)
+    end
+
+    describe "\#preconditions?" do
+      it "should check that there are enough parameters" do
+        lambda{@i1.preconditions?}.should raise_error
+        10.times {@context.stacks[:proportion].push(@p1)}
+        @i1.preconditions?.should == true
+      end
+    end
+    
+    describe "\#derive" do
+      it "should pop all the arguments" do
+        2.times {@context.stacks[:proportion].push(@p1)}
+        @i1.stub!(:cleanup) # and do nothing
+        @i1.go
+        @context.stacks[:proportion].depth.should == 0
+      end
+    end
+    
+    describe "\#cleanup" do
+      describe "should push the result" do
+        {[0.1, 0.2] => 0.3, [0.5, 0.5] => 1.0, [0.8, 0.9] => 1.0}.each do |inputs, expected|
+          params = inputs.inspect
+          it "should produce #{expected} given #{params}" do
+          inputs.each {|i| @context.stacks[:proportion].push(ValuePoint.new("proportion", i))}
+          @i1.go
+          @context.stacks[:proportion].peek.value.should be_close(expected,0.000001)
+        end
+        end
+      end
+    end
+  end
+end

data/spec/instructions/proportion/proportion_bounded_divide_spec.rb

@@ -0,0 +1,59 @@
+require File.join(File.dirname(__FILE__), "../../spec_helper")
+include Nudge
+
+
+describe ProportionBoundedDivideInstruction do
+  
+  it_should_behave_like "every Nudge Instruction"
+  
+  before(:each) do
+    @context = Interpreter.new
+    @i1 = ProportionBoundedDivideInstruction.new(@context)
+  end
+  
+  describe "\#go" do
+    before(:each) do
+      @i1 = ProportionBoundedDivideInstruction.new(@context)
+      @context.clear_stacks
+      @p1 = ValuePoint.new("proportion", 0.3)
+    end
+
+    describe "\#preconditions?" do
+      it "should check that there are enough parameters" do
+        lambda{@i1.preconditions?}.should raise_error
+        10.times {@context.stacks[:proportion].push(@p1)}
+        @i1.preconditions?.should == true
+      end
+    end
+    
+    describe "\#derive" do
+      it "should pop all the arguments" do
+        2.times {@context.stacks[:proportion].push(@p1)}
+        @i1.stub!(:cleanup) # and do nothing
+        @i1.go
+        @context.stacks[:proportion].depth.should == 0
+      end
+      
+      it "should push an error if it tries to divide by zero" do
+        @context.clear_stacks
+        @context.stacks[:proportion].push(ValuePoint.new("proportion", 0.9))
+        @context.stacks[:proportion].push(ValuePoint.new("proportion", 0.0))
+        @i1.go
+        @context.stacks[:error].depth.should == 1
+      end
+    end
+    
+    describe "\#cleanup" do
+      describe "should push the result" do
+        {[0.3, 0.11] => 1.0, [0.3,0.8] => 0.375}.each do |inputs, expected|
+          params = inputs.inspect
+          it "should produce #{expected} given #{params}" do
+          inputs.each {|i| @context.stacks[:proportion].push(ValuePoint.new("proportion", i))}
+          @i1.go
+          @context.stacks[:proportion].peek.value.should be_close(expected,0.000001)
+        end
+        end
+      end
+    end
+  end
+end

data/spec/instructions/proportion/proportion_bounded_subtract_spec.rb

@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), "../../spec_helper")
+include Nudge
+
+describe ProportionBoundedSubtractInstruction do
+  
+  it_should_behave_like "every Nudge Instruction"
+  
+  before(:each) do
+    @context = Interpreter.new
+    @i1 = ProportionBoundedSubtractInstruction.new(@context)
+  end
+  
+  
+  describe "\#go" do
+    before(:each) do
+      @context = Interpreter.new
+      @i1 = ProportionBoundedSubtractInstruction.new(@context)
+      @context.clear_stacks
+      @p1 = ValuePoint.new("proportion", 0.2)
+    end
+
+    describe "\#preconditions?" do
+      it "should check that there are enough parameters" do
+        lambda{@i1.preconditions?}.should raise_error
+        10.times {@context.stacks[:proportion].push(@p1)}
+        @i1.preconditions?.should == true
+      end
+    end
+    
+    describe "\#derive" do
+      it "should pop all the arguments" do
+        2.times {@context.stacks[:proportion].push(@p1)}
+        @i1.stub!(:cleanup) # and do nothing
+        @i1.go
+        @context.stacks[:proportion].depth.should == 0
+      end
+    end
+    
+    describe "\#cleanup" do
+      describe "should push the result" do
+        {[0.1, 0.2] => 0.0, [0.5, 0.5] => 0.0, [0.3, 0.05] => 0.25}.each do |inputs, expected|
+          params = inputs.inspect
+          it "should produce #{expected} given #{params}" do
+          inputs.each {|i| @context.stacks[:proportion].push(ValuePoint.new("proportion", i))}
+          @i1.go
+          @context.stacks[:proportion].peek.value.should be_close(expected,0.000001)
+        end
+        end
+      end
+    end
+  end
+end

data/spec/instructions/proportion/proportion_from_float_spec.rb

@@ -0,0 +1,48 @@
+#encoding: utf-8
+require File.join(File.dirname(__FILE__), "../../spec_helper")
+include Nudge
+
+describe ProportionFromFloatInstruction do
+  
+  it_should_behave_like "every Nudge Instruction"
+  
+  before(:each) do
+    @context = Interpreter.new
+    @i1 = ProportionFromFloatInstruction.new(@context)
+    @context.clear_stacks
+  end
+  
+  it "should check that there are enough parameters" do
+    @context.push(:float, "0.234")
+    @i1.preconditions?.should == true
+  end
+  
+  it "should raise an error if the preconditions aren't met" do
+    @context.clear_stacks # there are no params at all
+    lambda{@i1.preconditions?}.should raise_error(Instruction::NotEnoughStackItems)
+  end
+  
+  it "should successfully run #go only if all preconditions are met" do
+    @context.push(:float, "0.22")
+    @i1.should_receive(:cleanup)
+    @i1.go
+  end
+  
+  it "should create and push the new (expected) value to the right place" do
+    @context.push(:float, "0.1")
+    @i1.go
+    @context.depth(:proportion).should == 1
+    @context.peek_value(:proportion).should == 0.1
+  end
+  
+  it "should return a number in [0.0, 1.0]" do
+    @context.push(:float, "11.11")
+    @i1.go
+    @context.depth(:proportion).should == 1
+    @context.peek_value(:proportion).should be_close(0.11, 0.000001)
+    
+    @context.push(:float, "-2.7")
+    @i1.go
+    @context.peek_value(:proportion).should be_close(0.3, 0.000001)
+  end
+end

data/spec/instructions/proportion/proportion_max_spec.rb

@@ -0,0 +1,51 @@
+require File.join(File.dirname(__FILE__), "../../spec_helper")
+include Nudge
+
+describe ProportionMaxInstruction do
+  
+  it_should_behave_like "every Nudge Instruction"
+  
+  before(:each) do
+    @context = Interpreter.new
+    @i1 = ProportionMaxInstruction.new(@context)
+  end
+  
+  describe "\#go" do
+    before(:each) do
+      @context = Interpreter.new
+      @i1 = ProportionMaxInstruction.new(@context)
+      @context.clear_stacks
+      @p1 = ValuePoint.new("proportion", 0.2)
+    end
+
+    describe "\#preconditions?" do
+      it "should check that there are enough parameters" do
+        lambda{@i1.preconditions?}.should raise_error
+        10.times {@context.stacks[:proportion].push(@p1)}
+        @i1.preconditions?.should == true
+      end
+    end
+    
+    describe "\#derive" do
+      it "should pop all the arguments" do
+        2.times {@context.stacks[:proportion].push(@p1)}
+        @i1.stub!(:cleanup) # and do nothing
+        @i1.go
+        @context.stacks[:proportion].depth.should == 0
+      end
+    end
+    
+    describe "\#cleanup" do
+      describe "should push the result" do
+        {[0.1, 0.2] => 0.2, [0.9, 0.5] => 0.9, [1.0, 1.0] => 1.0}.each do |inputs, expected|
+          params = inputs.inspect
+          it "should produce #{expected} given #{params}" do
+          inputs.each {|i| @context.stacks[:proportion].push(ValuePoint.new("proportion", i))}
+          @i1.go
+          @context.stacks[:proportion].peek.value.should be_close(expected,0.000001)
+        end
+        end
+      end
+    end
+  end
+end

data/spec/instructions/proportion/proportion_min_spec.rb

@@ -0,0 +1,51 @@
+require File.join(File.dirname(__FILE__), "../../spec_helper")
+include Nudge
+
+describe ProportionMinInstruction do
+  
+  it_should_behave_like "every Nudge Instruction"
+  
+  before(:each) do
+    @context = Interpreter.new
+    @i1 = ProportionMinInstruction.new(@context)
+  end
+  
+  describe "\#go" do
+    before(:each) do
+      @context = Interpreter.new
+      @i1 = ProportionMinInstruction.new(@context)
+      @context.clear_stacks
+      @p1 = ValuePoint.new("proportion", 0.2)
+    end
+
+    describe "\#preconditions?" do
+      it "should check that there are enough parameters" do
+        lambda{@i1.preconditions?}.should raise_error
+        10.times {@context.stacks[:proportion].push(@p1)}
+        @i1.preconditions?.should == true
+      end
+    end
+    
+    describe "\#derive" do
+      it "should pop all the arguments" do
+        2.times {@context.stacks[:proportion].push(@p1)}
+        @i1.stub!(:cleanup) # and do nothing
+        @i1.go
+        @context.stacks[:proportion].depth.should == 0
+      end
+    end
+    
+    describe "\#cleanup" do
+      describe "should push the result" do
+        {[0.1, 0.2] => 0.1, [0.9, 0.5] => 0.5, [1.0, 1.0] => 1.0}.each do |inputs, expected|
+          params = inputs.inspect
+          it "should produce #{expected} given #{params}" do
+          inputs.each {|i| @context.stacks[:proportion].push(ValuePoint.new("proportion", i))}
+          @i1.go
+          @context.stacks[:proportion].peek.value.should be_close(expected,0.000001)
+        end
+        end
+      end
+    end
+  end
+end

data/spec/instructions/proportion/proportion_multiply_spec.rb

@@ -0,0 +1,51 @@
+require File.join(File.dirname(__FILE__), "../../spec_helper")
+include Nudge
+
+describe ProportionMultiplyInstruction do
+  
+  it_should_behave_like "every Nudge Instruction"
+  
+  before(:each) do
+    @context = Interpreter.new
+    @i1 = ProportionMultiplyInstruction.new(@context)
+  end
+  
+  describe "\#go" do
+    before(:each) do
+      @context = Interpreter.new
+      @i1 = ProportionMultiplyInstruction.new(@context)
+      @context.clear_stacks
+      @p1 = ValuePoint.new("proportion", 0.2)
+    end
+
+    describe "\#preconditions?" do
+      it "should check that there are enough parameters" do
+        lambda{@i1.preconditions?}.should raise_error
+        10.times {@context.stacks[:proportion].push(@p1)}
+        @i1.preconditions?.should == true
+      end
+    end
+    
+    describe "\#derive" do
+      it "should pop all the arguments" do
+        2.times {@context.stacks[:proportion].push(@p1)}
+        @i1.stub!(:cleanup) # and do nothing
+        @i1.go
+        @context.stacks[:proportion].depth.should == 0
+      end
+    end
+    
+    describe "\#cleanup" do
+      describe "should push the result" do
+        {[0.1, 0.2] => 0.02, [0.5, 0.5] => 0.25, [1.0, 0.0] => 0.0}.each do |inputs, expected|
+          params = inputs.inspect
+          it "should produce #{expected} given #{params}" do
+          inputs.each {|i| @context.stacks[:proportion].push(ValuePoint.new("proportion", i))}
+          @i1.go
+          @context.stacks[:proportion].peek.value.should be_close(expected,0.000001)
+        end
+        end
+      end
+    end
+  end
+end

data/spec/interpreter/proportion_type_spec.rb

@@ -0,0 +1,99 @@
+#encoding: utf-8
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+
+describe "ProportionType" do
+  
+  describe "class attributes" do
+    it "should have :default_lowest set to 0.0" do
+      ProportionType.default_lowest.should == 0.0
+    end
+    
+    it "should have :default_highest set to 1.0" do
+      ProportionType.default_highest.should == 1.0
+    end
+  end
+  
+  describe "self.random_value" do
+    it "should respond to random_value" do
+      ProportionType.should respond_to(:random_value)
+    end
+    
+    it "should call the random number generator" do
+      ProportionType.should_receive(:rand).and_return(0.6)
+      ProportionType.random_value
+    end
+    
+    it "should use the :proportion_lower_bound option to set the lower end of the range" do
+      ProportionType.should_receive(:rand).and_return(0.0)
+      ProportionType.random_value(proportion_lower_bound:0.7).should == 0.7
+    end
+    
+    it "should use the :proportion_upper_bound option to set the upper end of the range" do
+      ProportionType.should_receive(:rand).and_return(1.0)
+      ProportionType.random_value(proportion_upper_bound:0.6).should == 0.6
+    end
+    
+    it "should raise an error if either bound is outside [0.0,1.0]" do
+      lambda{ProportionType.random_value(proportion_upper_bound:71.2)}.should raise_error(ArgumentError)
+      lambda{ProportionType.random_value(proportion_upper_bound:-12.0)}.should raise_error(ArgumentError)
+      lambda{ProportionType.random_value(proportion_lower_bound:71.2)}.should raise_error(ArgumentError)
+      lambda{ProportionType.random_value(proportion_lower_bound:-12.0)}.should raise_error(ArgumentError)
+      
+      lambda{ProportionType.random_value(proportion_lower_bound:0.0)}.should_not raise_error(ArgumentError)
+      lambda{ProportionType.random_value(proportion_lower_bound:1.0)}.should_not raise_error(ArgumentError)
+      
+    end
+    
+    it "should raise an error if the bounds are inverted" do
+      lambda{ProportionType.random_value(proportion_lower_bound:1.0,
+        proportion_upper_bound:0.0)}.should raise_error(ArgumentError)
+    end
+  end
+  
+  describe "self.from_s" do
+    it "should use to_f" do
+      a = "0.9"
+      a.should_receive(:to_f).at_least(1).times.and_return(0.9)
+      ProportionType.from_s(a)
+    end
+    
+    it "should return a value modulo 1.0" do
+      ProportionType.from_s("11.0").should == 0.0
+      ProportionType.from_s("-1.1").should be_close(0.9, 0.00000001)
+      ProportionType.from_s("1.1").should be_close(0.1, 0.00000001)
+      ProportionType.from_s("-0.0").should be_close(0.0, 0.00000001)
+      
+      ProportionType.from_s("1.0").should == 1.0
+    end
+  end
+  
+  describe "self.recognizes?" do
+    it "should be true for floatlike things" do
+      ProportionType.recognizes?(0.1).should == true
+      ProportionType.recognizes?(1.0).should == true
+      ProportionType.recognizes?(-111.99).should == true
+    end
+    
+    it "should be true for Numerics that respond to to_f" do
+      ProportionType.recognizes?(12).should == true
+      ProportionType.recognizes?(-12).should == true
+    end
+    
+    it "should be false for strings" do
+      ProportionType.recognizes?("0.1").should == false
+    end
+    
+    it "should be false for nil" do
+      ProportionType.recognizes?(nil).should == false
+    end
+  end
+  
+  describe "self.any_value" do
+    it "should pass everything along to random_value" do
+      args = {foo:12, bar:13, baz:17}
+      ProportionType.should_receive(:random_value).with(args)
+      ProportionType.any_value(args)
+    end
+  end
+  
+end

data/spec/interpreter/types_spec.rb

@@ -1,6 +1,5 @@
 #encoding: utf-8
 require File.join(File.dirname(__FILE__), "/../spec_helper")
-include Nudge
 
 describe "Type list" do
   it "should have an #all_types [getter] method to return a list of every defined type" do

data/spec/spec_helper.rb

@@ -45,7 +45,7 @@ Spec::Runner.configure do |config|
       @i1.should respond_to(:derive)
     end   
   
-    it "should respond to \#celanup" do
+    it "should respond to \#cleanup" do
       @i1.should respond_to(:cleanup)
     end   
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Bill Tozier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-08 00:00:00 -04:00
+date: 2010-05-12 00:00:00 -04:00
 default_executable: nudge
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,8 +114,10 @@ files:
 - lib/instructions/conversion/code_from_name.rb
 - lib/instructions/conversion/float_from_bool.rb
 - lib/instructions/conversion/float_from_int.rb
+- lib/instructions/conversion/float_from_proportion.rb
 - lib/instructions/conversion/int_from_bool.rb
 - lib/instructions/conversion/int_from_float.rb
+- lib/instructions/conversion/proportion_from_float.rb
 - lib/instructions/exec/exec_define.rb
 - lib/instructions/exec/exec_depth.rb
 - lib/instructions/exec/exec_do_count.rb
@@ -203,12 +205,19 @@ files:
 - lib/instructions/name/name_unbind.rb
 - lib/instructions/name/name_yank.rb
 - lib/instructions/name/name_yankdup.rb
+- lib/instructions/proportion/proportion_bounded_add.rb
+- lib/instructions/proportion/proportion_bounded_divide.rb
+- lib/instructions/proportion/proportion_bounded_subtract.rb
+- lib/instructions/proportion/proportion_max.rb
+- lib/instructions/proportion/proportion_min.rb
+- lib/instructions/proportion/proportion_multiply.rb
 - lib/interpreter/interpreter.rb
 - lib/interpreter/nudge_program.rb
 - lib/interpreter/parse.tab.rb
 - lib/interpreter/programPoints.rb
 - lib/interpreter/stack.rb
 - lib/interpreter/types/codeType.rb
+- lib/interpreter/types/proportion_type.rb
 - lib/interpreter/types/pushTypes.rb
 - lib/nudge.rb
 - readme.md
@@ -309,6 +318,7 @@ files:
 - spec/instructions/float/float_flush_spec.rb
 - spec/instructions/float/float_from_bool_spec.rb
 - spec/instructions/float/float_from_int_spec.rb
+- spec/instructions/float/float_from_proportion_spec.rb
 - spec/instructions/float/float_greater_than_q_spec.rb
 - spec/instructions/float/float_if_spec.rb
 - spec/instructions/float/float_less_than_q_spec.rb
@@ -371,6 +381,13 @@ files:
 - spec/instructions/name/name_unbind_spec.rb
 - spec/instructions/name/name_yank_spec.rb
 - spec/instructions/name/name_yankdup_spec.rb
+- spec/instructions/proportion/proportion_bounded_add_spec.rb
+- spec/instructions/proportion/proportion_bounded_divide_spec.rb
+- spec/instructions/proportion/proportion_bounded_subtract_spec.rb
+- spec/instructions/proportion/proportion_from_float_spec.rb
+- spec/instructions/proportion/proportion_max_spec.rb
+- spec/instructions/proportion/proportion_min_spec.rb
+- spec/instructions/proportion/proportion_multiply_spec.rb
 - spec/interpreter/codeblock_point_spec.rb
 - spec/interpreter/codetype_spec.rb
 - spec/interpreter/instruction_spec.rb
@@ -378,6 +395,7 @@ files:
 - spec/interpreter/nil_point_spec.rb
 - spec/interpreter/nudge_program_class_methods_spec.rb
 - spec/interpreter/nudge_program_spec.rb
+- spec/interpreter/proportion_type_spec.rb
 - spec/interpreter/reference_point_spec.rb
 - spec/interpreter/stack_spec.rb
 - spec/interpreter/types_spec.rb
@@ -523,6 +541,7 @@ test_files:
 - spec/instructions/float/float_flush_spec.rb
 - spec/instructions/float/float_from_bool_spec.rb
 - spec/instructions/float/float_from_int_spec.rb
+- spec/instructions/float/float_from_proportion_spec.rb
 - spec/instructions/float/float_greater_than_q_spec.rb
 - spec/instructions/float/float_if_spec.rb
 - spec/instructions/float/float_less_than_q_spec.rb
@@ -585,6 +604,13 @@ test_files:
 - spec/instructions/name/name_unbind_spec.rb
 - spec/instructions/name/name_yank_spec.rb
 - spec/instructions/name/name_yankdup_spec.rb
+- spec/instructions/proportion/proportion_bounded_add_spec.rb
+- spec/instructions/proportion/proportion_bounded_divide_spec.rb
+- spec/instructions/proportion/proportion_bounded_subtract_spec.rb
+- spec/instructions/proportion/proportion_from_float_spec.rb
+- spec/instructions/proportion/proportion_max_spec.rb
+- spec/instructions/proportion/proportion_min_spec.rb
+- spec/instructions/proportion/proportion_multiply_spec.rb
 - spec/interpreter/codeblock_point_spec.rb
 - spec/interpreter/codetype_spec.rb
 - spec/interpreter/instruction_spec.rb
@@ -592,6 +618,7 @@ test_files:
 - spec/interpreter/nil_point_spec.rb
 - spec/interpreter/nudge_program_class_methods_spec.rb
 - spec/interpreter/nudge_program_spec.rb
+- spec/interpreter/proportion_type_spec.rb
 - spec/interpreter/reference_point_spec.rb
 - spec/interpreter/stack_spec.rb
 - spec/interpreter/types_spec.rb