gecoder-with-gecode 0.8.3 → 0.9.0

data/specs/enum_wrapper.rb

@@ -5,6 +5,7 @@ describe Gecode::Model, ' (enum wrapping)' do
     @model = Gecode::Model.new
     @bool = @model.bool_var
     @int = @model.int_var(1..2)
+    @set = @model.set_var([], 1..2)
   end
 
   it 'should only allow enumerables to be wrapped' do
@@ -19,6 +20,13 @@ describe Gecode::Model, ' (enum wrapping)' do
       @model.wrap_enum(enum) 
     end.should_not raise_error
   end
+
+  it 'should allow enumerables of bool operands to be wrapped' do
+    lambda do
+      enum = [@bool & @bool]
+      @model.wrap_enum(enum) 
+    end.should_not raise_error
+  end
   
   it 'should allow enumerables of int variables to be wrapped' do
     lambda do
@@ -26,6 +34,28 @@ describe Gecode::Model, ' (enum wrapping)' do
       @model.wrap_enum(enum) 
     end.should_not raise_error
   end
+
+  it 'should allow enumerables of int operands to be wrapped' do
+    lambda do
+      enum = [@int + @int]
+      @model.wrap_enum(enum) 
+    end.should_not raise_error
+  end
+
+  it 'should allow enumerables of set variables to be wrapped' do
+    lambda do
+      enum = [@set]
+      @model.wrap_enum(enum) 
+    end.should_not raise_error
+  end
+
+  it 'should allow enumerables of set operands to be wrapped' do
+    lambda do
+      enum = [@set.union(@set)]
+      @model.wrap_enum(enum) 
+    end.should_not raise_error
+  end
+  
   
   it 'should allow enumerables of fixnums to be wrapped' do
     lambda do
@@ -76,7 +106,7 @@ describe Gecode::IntEnumMethods do
   
   it 'should convert to an int var array' do
     @model.allow_space_access do
-      @int_enum.to_int_var_array.should be_kind_of(Gecode::Raw::IntVarArray)
+      @int_enum.bind_array.should be_kind_of(Gecode::Raw::IntVarArray)
     end
   end
   
@@ -84,6 +114,11 @@ describe Gecode::IntEnumMethods do
     @int_enum.domain_range.should == (0..1)
     (@int_enum << @model.int_var(-4..4)).domain_range.should == (-4..4)
   end
+
+  it 'should define #to_int_enum' do
+    @int_enum.to_int_enum.should be_kind_of(
+      Gecode::IntEnum::IntEnumOperand)
+  end
 end
 
 describe Gecode::BoolEnumMethods do
@@ -94,9 +129,14 @@ describe Gecode::BoolEnumMethods do
   
   it 'should convert to a bool var array' do
     @model.allow_space_access do
-      @bool_enum.to_bool_var_array.should be_kind_of(Gecode::Raw::BoolVarArray)
+      @bool_enum.bind_array.should be_kind_of(Gecode::Raw::BoolVarArray)
     end
   end
+  
+  it 'should define #to_bool_enum' do
+    @bool_enum.to_bool_enum.should be_kind_of(
+      Gecode::BoolEnum::BoolEnumOperand)
+  end
 end
 
 describe Gecode::SetEnumMethods do
@@ -107,7 +147,7 @@ describe Gecode::SetEnumMethods do
   
   it 'should convert to a set var array' do
     @model.allow_space_access do
-      @set_enum.to_set_var_array.should be_kind_of(Gecode::Raw::SetVarArray)
+      @set_enum.bind_array.should be_kind_of(Gecode::Raw::SetVarArray)
     end
   end
   
@@ -115,6 +155,11 @@ describe Gecode::SetEnumMethods do
     @set_enum.upper_bound_range.should == (0..1)
     (@set_enum << @model.set_var([], -4..4)).upper_bound_range.should == (-4..4)
   end
+  
+  it 'should define #to_set_enum' do
+    @set_enum.to_set_enum.should be_kind_of(
+      Gecode::SetEnum::SetEnumOperand)
+  end
 end
 
 describe Gecode::FixnumEnumMethods do
@@ -126,4 +171,9 @@ describe Gecode::FixnumEnumMethods do
   it 'should compute the smallest domain range' do
     @enum.domain_range.should == (7..4711)
   end
+  
+  it 'should define #to_fixnum_enum' do
+    @enum.to_fixnum_enum.should be_kind_of(
+      Gecode::FixnumEnum::FixnumEnumOperand)
+  end
 end

data/specs/int_var.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/constraints/property_helper'
 
 describe 'non-empty int variable', :shared => true do
   it 'should have min equal to the lower domain bound' do
@@ -35,18 +36,22 @@ describe 'non-empty int variable', :shared => true do
   it 'should have a zero degree' do
     @var.degree.should be_zero
   end
+
+  it 'should return the correct domain through #domain' do
+    @var.domain.to_a.should == @domain.to_a
+  end
+
+  it_should_behave_like 'int var operand'
 end
 
-describe Gecode::FreeIntVar, ' (with range domain of size > 1)' do
+describe Gecode::IntVar, ' (with range domain of size > 1)' do
   before do
     @range = -4..3
     @domain = @range.to_a
-    model = Gecode::Model.new
-    @var = model.int_var(@range)
+    @model = Gecode::Model.new
+    @operand = @var = @model.int_var(@range)
   end
   
-  it_should_behave_like 'non-empty int variable'
-  
   it 'should not be assigned' do
     @var.should_not be_assigned
   end
@@ -58,28 +63,28 @@ describe Gecode::FreeIntVar, ' (with range domain of size > 1)' do
   it 'should raise error when trying to access assigned value' do
     lambda{ @var.value }.should raise_error(RuntimeError)
   end
+
+  it_should_behave_like 'non-empty int variable'
 end
 
-describe Gecode::FreeIntVar, ' (defined with three-dot range)' do
+describe Gecode::IntVar, ' (defined with three-dot range)' do
   before do
     @range = -4...3
     @domain = @range.to_a
-    model = Gecode::Model.new
-    @var = model.int_var(@range)
+    @model = Gecode::Model.new
+    @operand = @var = @model.int_var(@range)
   end
   
   it_should_behave_like 'non-empty int variable'
 end
 
-describe Gecode::FreeIntVar, ' (with non-range domain of size > 1)' do
+describe Gecode::IntVar, ' (with non-range domain of size > 1)' do
   before do
     @domain = [-3, -2, -1, 1]
-    model = Gecode::Model.new
-    @var = model.int_var(@domain)
+    @model = Gecode::Model.new
+    @operand = @var = @model.int_var(@domain)
   end
 
-  it_should_behave_like 'non-empty int variable'
-  
   it 'should not be assigned' do
     @var.should_not be_assigned
   end
@@ -91,17 +96,17 @@ describe Gecode::FreeIntVar, ' (with non-range domain of size > 1)' do
   it 'should not contain the domain\'s holes' do
     @var.should_not include(0)
   end
+  
+  it_should_behave_like 'non-empty int variable'
 end
 
-describe Gecode::FreeIntVar, ' (with a domain of size 1)' do
+describe Gecode::IntVar, ' (with a domain of size 1)' do
   before do
     @domain = [1]
-    model = Gecode::Model.new
-    @var = model.int_var(*@domain)
+    @model = Gecode::Model.new
+    @operand = @var = @model.int_var(*@domain)
   end
   
-  it_should_behave_like 'non-empty int variable'
-  
   it 'should be assigned' do
     @var.should be_assigned
   end
@@ -109,13 +114,15 @@ describe Gecode::FreeIntVar, ' (with a domain of size 1)' do
   it 'should be a range domain' do
     @var.should be_range
   end
+  
+  it_should_behave_like 'non-empty int variable'
 end
 
-describe Gecode::FreeIntVar, ' (assigned)' do
+describe Gecode::IntVar, ' (assigned)' do
   before do
     @domain = 1
-    model = Gecode::Model.new
-    @var = model.int_var(*@domain)
+    @model = Gecode::Model.new
+    @operand = @var = @model.int_var(*@domain)
   end
 
   it 'should be assigned' do
@@ -125,13 +132,19 @@ describe Gecode::FreeIntVar, ' (assigned)' do
   it 'should give the assigned number when inspecting' do
     @var.inspect.should include(" #{@domain[0]}>")
   end
+
+  it 'should return the correct domain through #domain' do
+    @var.domain.to_a.should == [@domain]
+  end
+
+  it_should_behave_like 'int var operand'
 end
 
-describe Gecode::FreeIntVar, ' (not assigned)' do
+describe Gecode::IntVar, ' (not assigned)' do
   before do
     @domain = 1..2
-    model = Gecode::Model.new
-    @var = model.int_var(@domain)
+    @model = Gecode::Model.new
+    @operand = @var = @model.int_var(@domain)
   end
 
   it 'should not be assigned' do
@@ -141,4 +154,10 @@ describe Gecode::FreeIntVar, ' (not assigned)' do
   it 'should give the domain range when inspecting' do
     @var.inspect.should include(" #{@domain.first}..#{@domain.last}>")
   end
-end
+
+  it 'should return the correct domain through #domain' do
+    @var.domain.to_a.should == @domain.to_a
+  end
+
+  it_should_behave_like 'int var operand'
+end

data/specs/model.rb

@@ -265,4 +265,61 @@ describe Gecode::Model, ' (space access restriction)' do
       end
     end.should_not raise_error(RuntimeError)
   end
-end
+end
+
+describe Gecode::Model, ' (accessible variable creation)' do
+  before do
+    @model = Class.new(Gecode::Model).new
+  end
+
+  it 'should allow creation of named variable using #foo_is_a' do
+    var = @model.int_var(17)
+    lambda{ @model.foo }.should raise_error(NoMethodError)
+    @model.instance_eval{ foo_is_a var }
+    lambda{ @model.foo }.should_not raise_error
+    @model.foo.should == var
+  end
+
+  it 'should allow creation of named variable using #foo_is_an' do
+    var = @model.int_var(17)
+    lambda{ @model.foo }.should raise_error(NoMethodError)
+    @model.instance_eval{ foo_is_an var }
+    lambda{ @model.foo }.should_not raise_error
+    @model.foo.should == var
+  end
+
+  it 'should only allow one argument to be given to #foo_is_a' do
+    lambda do
+      @model.instance_eval{ foo_is_a }
+    end.should raise_error(ArgumentError)
+    lambda do
+      @model.instance_eval{ foo_is_a bool_var, bool_var }
+    end.should raise_error(ArgumentError)
+  end
+
+  it 'should only define the variable in the current instance' do
+    klass = Class.new Gecode::Model
+    model_a = klass.new
+    model_b = klass.new
+
+    model_a.instance_eval{ bar_is_a bool_var }
+    lambda{ model_a.bar }.should_not raise_error
+    lambda{ model_b.bar }.should raise_error(NoMethodError)
+  end
+
+  it 'should raise error if a method would be overwritten' do
+    var = @model.int_var(17)
+    lambda{ @model.class }.should_not raise_error
+    lambda do
+      @model.instance_eval{ class_is_an var } 
+    end.should raise_error(ArgumentError)
+  end
+
+  it 'should raise error if an instance variable would be overwritten' do
+    @model.instance_eval{ @foo = 17 }
+    var = @model.int_var(17)
+    lambda do
+      @model.instance_eval{ foo_is_a var } 
+    end.should raise_error(ArgumentError)
+  end
+end

data/specs/model_sugar.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Gecode, ' (Model sugar)' do
+  it 'should provide #solve as sugar for constructing a model and running solve!' do
+    Gecode.solve do
+      numbers_is_an int_var_array(2, 0..5)
+      x, y = numbers
+      (x * y).must == 25
+      branch_on numbers
+    end.numbers.values.should == [5,5]
+  end
+
+  it 'should provide #maximize as sugar for constructing a model and running maximize!' do
+    Gecode.maximize :z do
+      z_is_an int_var
+      x, y = vars = int_var_array(2, 0..5)
+      (x*2 - y).must == z
+      branch_on vars
+    end.z.value.should equal(10)
+  end
+
+  it 'should provide #minimize as sugar for constructing a model and running minimize!' do
+    Gecode.minimize :z do
+      z_is_an int_var
+      x, y = vars = int_var_array(2, 0..5)
+      (x*2 - y).must == z
+      branch_on vars
+    end.z.value.should equal(-5)
+  end
+end

data/specs/search.rb

@@ -201,16 +201,35 @@ describe Gecode::Model, ' (without solution)' do
   end
   
   it 'should return nil when calling #solution' do
-    @model.var.must < 0
     @model.solution{ |s| 'test' }.should be_nil
   end
+
+  it 'should not yield anything to #each_solution' do 
+    @model.each_solution{ |s| violated }
+  end
   
-  it 'should return nil when calling #solve!' do
-    @model.solve!.should be_nil
+  it 'should raise NoSolutionError when calling #solve!' do
+    lambda do 
+      @model.solve!
+    end.should raise_error(Gecode::NoSolutionError)
   end
   
-  it 'should return nil when calling #optimize!' do
-    @model.optimize!{}.should be_nil
+  it 'should raise NoSolutionError when calling #optimize!' do
+    lambda do 
+      @model.optimize!{}
+    end.should raise_error(Gecode::NoSolutionError)
+  end
+
+  it 'should raise NoSolutionError when calling #minimize!' do
+    lambda do 
+      @model.optimize!{}
+    end.should raise_error(Gecode::NoSolutionError)
+  end
+
+  it 'should raise NoSolutionError when calling #maximize!' do
+    lambda do 
+      @model.maximize!(:var)
+    end.should raise_error(Gecode::NoSolutionError)
   end
 end
 

data/specs/selected_set.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Gecode::SelectedSet::SelectedSetOperand do
+  before do
+    @model = Gecode::Model.new
+    set_enum = @model.set_var_array(5, [], 0..9)
+    set = @model.set_var([], 0..4)
+    @operand = Gecode::SelectedSet::SelectedSetOperand.new(
+      set_enum, set)
+  end
+
+  it 'should implement #model' do
+    @operand.model.should be_kind_of(Gecode::Model)
+  end
+
+  it 'should implement #to_selected_set' do
+    enum, set = @operand.to_selected_set
+    enum.should be_respond_to(:to_set_enum)
+    set.should be_respond_to(:to_set_var)
+    @model.solve!
+    set_var = set.to_set_var
+    ((set_var.lower_bound == []) && 
+     (set_var.upper_bound == Gecode::Model::LARGEST_SET_BOUND)).should_not(
+      be_true)
+    enum.each do |element|
+      set_var = element.to_set_var
+      ((set_var.lower_bound == []) && 
+       (set_var.upper_bound == Gecode::Model::LARGEST_SET_BOUND)).should_not(
+        be_true)
+    end
+  end
+
+  it 'should implement #must' do
+    receiver = @operand.must
+    receiver.should be_kind_of(
+      Gecode::SelectedSet::SelectedSetConstraintReceiver)
+  end
+end
+

data/specs/set_elements.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Gecode::SelectedSet::SelectedSetOperand do
+  before do
+    @model = Gecode::Model.new
+    @set = @model.set_var([], 0..4)
+    @operand = Gecode::SetElements::SetElementsOperand.new(@set)
+  end
+
+  it 'should implement #model' do
+    @operand.model.should be_kind_of(Gecode::Model)
+  end
+
+  it 'should implement #to_set_elements' do
+    set = @operand.to_set_elements
+    set.should be_respond_to(:to_set_var)
+    @model.solve!
+    set_var = set.to_set_var
+    ((set_var.lower_bound == []) && 
+     (set_var.upper_bound == Gecode::Model::LARGEST_SET_BOUND)).should_not(
+      be_true)
+  end
+
+  it 'should implement #must' do
+    receiver = @operand.must
+    receiver.should be_kind_of(
+      Gecode::SetElements::SetElementsConstraintReceiver)
+  end
+
+  it 'should be produces by SetOperand#elements' do
+    @set.elements.should be_respond_to(:to_set_elements)
+  end
+end
+

data/specs/set_var.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/constraints/property_helper'
 
-describe Gecode::FreeSetVar, '(not assigned)' do
+describe Gecode::SetVar, '(not assigned)' do
   before do
-    model = Gecode::Model.new
-    @var = model.set_var(1..3, 0..4)
+    @model = Gecode::Model.new
+    @operand = @var = @model.set_var(1..3, 0..4)
   end
   
   it 'should not be assigned' do
@@ -14,6 +14,11 @@ describe Gecode::FreeSetVar, '(not assigned)' do
     @var.inspect.should include('lub-range')
     @var.inspect.should include('glb-range')
   end
+
+  it 'should allow inspection even when the bounds are too large to display' do
+    var = @model.set_var
+    var.inspect.should include('too large')
+  end
   
   it 'should report the correct bounds' do
     @var.lower_bound.sort.to_a.should == (1..3).to_a
@@ -42,13 +47,15 @@ describe Gecode::FreeSetVar, '(not assigned)' do
       lower_bound.each{}
     end.should_not raise_error
   end
+
+  it_should_behave_like 'set var operand'
 end
 
-describe Gecode::FreeSetVar, '(assigned)' do
+describe Gecode::SetVar, '(assigned)' do
   before do
-    model = Gecode::Model.new
-    @var = model.set_var(1, 1)
-    model.solve!
+    @model = Gecode::Model.new
+    @operand = @var = @model.set_var(1, 1)
+    @model.solve!
   end
   
   it 'should be assigned' do
@@ -65,4 +72,11 @@ describe Gecode::FreeSetVar, '(assigned)' do
     @var.lower_bound.to_a.should == [1]
     @var.value.to_a.should == [1]
   end
+
+  it 'should allow inspection even when the bounds are too large to display' do
+    var = @model.set_var(0..10**4, 0..10**4)
+    var.inspect.should include('too large')
+  end
+
+  it_should_behave_like 'set var operand'
 end