gecoder-with-gecode 0.9.0-x86-mswin32-60 → 0.9.1-x86-mswin32-60

data/specs/constraints/set/channel.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/../constraint_helper'
 
-class SetChannelSampleProblem < Gecode::Model
+class SetChannelSampleProblem
+  include Gecode::Mixin
+
   attr :bool_enum
   attr :set
   

data/specs/constraints/set/domain.rb

@@ -79,8 +79,8 @@ Gecode::Util::SET_RELATION_TYPES.each_pair do |relation, type|
           (@set.value.to_a - @non_range).should be_empty
         when :complement
           val = @set.value
-          val.min.should == Gecode::Model::SET_MIN_INT
-          val.max.should == Gecode::Model::SET_MAX_INT
+          val.min.should == Gecode::Mixin::SET_MIN_INT
+          val.max.should == Gecode::Mixin::SET_MAX_INT
           @non_range.each do |element|
             @set.not_in_upper_bound?(element).should be_true
           end
@@ -100,8 +100,8 @@ Gecode::Util::SET_RELATION_TYPES.each_pair do |relation, type|
           (@set.value.to_a - @non_range).should_not be_empty
         when :complement
           val = @set.value
-          ((val.min != Gecode::Model::SET_MIN_INT) || 
-            (val.max != Gecode::Model::SET_MAX_INT) ||
+          ((val.min != Gecode::Mixin::SET_MIN_INT) || 
+            (val.max != Gecode::Mixin::SET_MAX_INT) ||
             @non_range.any?{ |element| @set.in_lower_bound?(element) }
           ).should be_true
         when :disjoint

data/specs/constraints/set/relation.rb

@@ -41,8 +41,8 @@ Gecode::Util::SET_RELATION_TYPES.each_pair do |relation, type|
           (@set.value.to_a - @set2.value.to_a).should be_empty
         when :complement
           val = @set.value
-          val.min.should == Gecode::Model::SET_MIN_INT
-          val.max.should == Gecode::Model::SET_MAX_INT
+          val.min.should == Gecode::Mixin::SET_MIN_INT
+          val.max.should == Gecode::Mixin::SET_MAX_INT
           @set2.value.each do |element|
             @set.not_in_upper_bound?(element).should be_true
           end
@@ -63,8 +63,8 @@ Gecode::Util::SET_RELATION_TYPES.each_pair do |relation, type|
           (@set.value.to_a - @set2.value.to_a).should_not be_empty
         when :complement
           val = @set.value
-          ((val.min != Gecode::Model::SET_MIN_INT) || 
-            (val.max != Gecode::Model::SET_MAX_INT) ||
+          ((val.min != Gecode::Mixin::SET_MIN_INT) || 
+            (val.max != Gecode::Mixin::SET_MAX_INT) ||
             @set.value.to_a.any?{ |element| @set.in_lower_bound?(element) }
           ).should be_true
         when :disjoint

data/specs/constraints/set_enum/channel.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/../constraint_helper'
 
-class ChannelSampleProblem < Gecode::Model
+class ChannelSampleProblem
+  include Gecode::Mixin
+
   attr :elements
   attr :positions
   attr :sets

data/specs/constraints/set_enum/distinct.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/../constraint_helper'
 
-class SetEnumDistinctSampleProblem < Gecode::Model
+class SetEnumDistinctSampleProblem
+  include Gecode::Mixin
+
   attr :vars
   attr :sets
   

data/specs/constraints/set_enum/{select.rb → element.rb}

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../property_helper'
 
-class SelectionSampleProblem < Gecode::Model
+class SetElementSampleProblem < Gecode::Model
   attr :sets
   attr :set
   attr :target
@@ -18,17 +18,17 @@ end
 
 # Requires everything that composite behaviour spec requires in addition to
 # @stub and @expect_constrain_equal .
-describe 'selection constraint', :shared => true do
+describe 'element constraint', :shared => true do
   it 'should not disturb normal array access' do
     @sets[0].should be_kind_of(Gecode::SetVar)
   end
 end
 
-describe Gecode::SetEnum::Select, ' (int operand)' do
+describe Gecode::SetEnum::Element, ' (int operand)' do
   include GecodeR::Specs::SetHelper
 
   before do
-    @model = SelectionSampleProblem.new
+    @model = SetElementSampleProblem.new
     @sets = @model.sets
     @target = @set = @model.target
     @index = @model.index
@@ -43,26 +43,30 @@ describe Gecode::SetEnum::Select, ' (int operand)' do
     @constraint_class = Gecode::BlockConstraint
   end
   
+  it 'should not disturb normal array access' do
+    @sets[0].respond_to?(:to_set_var).should be_true
+  end
+  
   it 'should constrain the specified element of an enum of sets' do
     @sets[@index].must_be.superset_of([5,7,9])
     @model.solve!
     @sets[@index.value].value.should include(5,7,9)
   end
 
-  it 'should translate into a select constraint' do
-    Gecode::Raw.should_receive(:selectSet)
+  it 'should translate into a element constraint' do
+    Gecode::Raw.should_receive(:element)
     @sets[@index].must_be.superset_of([5,7,9])
     @model.solve!
   end
   
-  it_should_behave_like 'selection constraint'
+  it_should_behave_like 'element constraint'
   it_should_behave_like(
     'property that produces set operand by short circuiting equality')
 end
 
-describe Gecode::SetEnum::Select, ' (set operand)' do
+describe Gecode::SetEnum::Element, ' (set operand)' do
   before do
-    @model = SelectionSampleProblem.new
+    @model = SetElementSampleProblem.new
     @sets = @model.sets
     @set = @model.set
   end

data/specs/enum_wrapper.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Gecode::Model, ' (enum wrapping)' do
+describe Gecode::Mixin, ' (enum wrapping)' do
   before do
     @model = Gecode::Model.new
     @bool = @model.bool_var

data/specs/mixin.rb

@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class MixinSampleProblem
+  include Gecode::Mixin
+
+  def initialize
+    x, y, z = vars_is_an int_var_array(3, 0..9)
+
+    (x + y).must == z
+    x.must == y - 3
+    vars.must_be.distinct
+
+    branch_on vars
+  end
+end
+
+class ClassWithMethodMissingLast
+  include Gecode::Mixin
+
+  def method_missing(*args)
+    return :foo
+  end
+end
+
+class ClassWithMethodMissingFirst
+  def method_missing(*args)
+    return :foo
+  end
+  
+  include Gecode::Mixin
+end
+
+describe Gecode::Mixin, ' (mixed into a class)' do
+  before do
+    @mix = Object.new
+    class <<@mix
+      include Gecode::Mixin
+    end
+
+    @model = Gecode::Model.new
+  end
+
+  it 'should respond to everything that Gecode::Model does' do
+    @model.public_methods.sort.each do |method|
+      @mix.respond_to?(method).should be_true
+    end
+  end
+
+  it 'should solve a sample problem' do
+    lambda do
+      MixinSampleProblem.new.solve!.vars.values
+    end.should_not raise_error
+  end
+
+  it 'should not mess with classes defining method missing' do
+    model = ClassWithMethodMissingFirst.new
+
+    # Should not completely overwrite #method_missing.
+    model.does_not_exist.should == :foo
+
+    # Should still allow *_is_a sugar .
+    bool_var = model.bool_var
+    bool_var.should_not == :foo
+    model.foo_is_a(bool_var).should == bool_var
+  end
+  
+  it 'should not mess with classes defining method missing (2)' do
+    model = ClassWithMethodMissingLast.new
+
+    # Should not completely overwrite #method_missing.
+    model.does_not_exist.should == :foo
+
+    # Should still allow *_is_a sugar .
+    bool_var = model.bool_var
+    bool_var.should_not == :foo
+    model.foo_is_a(bool_var).should == bool_var
+  end
+end

data/specs/model.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Gecode::Model, ' (integer creation)' do
+describe Gecode::Mixin, ' (integer creation)' do
   before do
     @model = Gecode::Model.new
   end
@@ -101,7 +101,7 @@ describe Gecode::Model, ' (integer creation)' do
   end
 end
 
-describe Gecode::Model, ' (bool creation)' do
+describe Gecode::Mixin, ' (bool creation)' do
   before do
     @model = Gecode::Model.new
   end
@@ -128,7 +128,7 @@ describe Gecode::Model, ' (bool creation)' do
   end
 end
 
-describe Gecode::Model, ' (set creation)' do
+describe Gecode::Mixin, ' (set creation)' do
   before do
     @model = Gecode::Model.new
     @glb_range = 0..3
@@ -249,7 +249,7 @@ describe Gecode::Model, ' (set creation)' do
   end
 end
 
-describe Gecode::Model, ' (space access restriction)' do
+describe Gecode::Mixin, ' (space access restriction)' do
   before do
     @model = Gecode::Model.new
   end
@@ -267,7 +267,7 @@ describe Gecode::Model, ' (space access restriction)' do
   end
 end
 
-describe Gecode::Model, ' (accessible variable creation)' do
+describe Gecode::Mixin, ' (accessible variable creation)' do
   before do
     @model = Class.new(Gecode::Model).new
   end

data/specs/search.rb

@@ -1,7 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper'
 require 'set'
 
-class SampleProblem < Gecode::Model
+class SampleProblem
+  include Gecode::Mixin
+
   attr :var
   attr :array
   attr :hash
@@ -19,7 +21,9 @@ class SampleProblem < Gecode::Model
   end
 end
 
-class SampleOptimizationProblem < Gecode::Model
+class SampleOptimizationProblem
+  include Gecode::Mixin
+
   attr :x
   attr :y
   attr :z
@@ -33,7 +37,9 @@ class SampleOptimizationProblem < Gecode::Model
   end
 end
 
-class SampleOptimizationProblem2 < Gecode::Model
+class SampleOptimizationProblem2
+  include Gecode::Mixin
+
   attr :money
   
   def initialize
@@ -53,7 +59,7 @@ class Array
   end
 end
 
-describe Gecode::Model, ' (with multiple solutions)' do
+describe Gecode::Mixin, ' (with multiple solutions)' do
   before do
     @domain = 0..3
     @solved_domain = [2]
@@ -103,7 +109,7 @@ describe Gecode::Model, ' (with multiple solutions)' do
   end
 end
 
-describe Gecode::Model, ' (after #solve!)' do
+describe Gecode::Mixin, ' (after #solve!)' do
   before do
     @domain = 0..3
     @solved_domain = [2]
@@ -159,7 +165,7 @@ describe 'reset model', :shared => true do
   end
 end
 
-describe Gecode::Model, ' (after #reset!)' do
+describe Gecode::Mixin, ' (after #reset!)' do
   before do
     @domain = 0..3
     @reset_domain = 2..3
@@ -171,7 +177,7 @@ describe Gecode::Model, ' (after #reset!)' do
   it_should_behave_like 'reset model'
 end
 
-describe Gecode::Model, ' (after #solution)' do
+describe Gecode::Mixin, ' (after #solution)' do
   before do
     @domain = 0..3
     @reset_domain = 2..3
@@ -182,7 +188,7 @@ describe Gecode::Model, ' (after #solution)' do
   it_should_behave_like 'reset model'
 end
 
-describe Gecode::Model, ' (after #each_solution)' do
+describe Gecode::Mixin, ' (after #each_solution)' do
   before do
     @domain = 0..3
     @reset_domain = 2..3
@@ -193,7 +199,7 @@ describe Gecode::Model, ' (after #each_solution)' do
   it_should_behave_like 'reset model'
 end
 
-describe Gecode::Model, ' (without solution)' do
+describe Gecode::Mixin, ' (without solution)' do
   before do
     @domain = 0..3
     @model = SampleProblem.new(@domain)
@@ -233,7 +239,7 @@ describe Gecode::Model, ' (without solution)' do
   end
 end
 
-describe Gecode::Model, ' (without constraints)' do
+describe Gecode::Mixin, ' (without constraints)' do
   before do
     @model = Gecode::Model.new
     @x = @model.int_var(0..1)
@@ -244,7 +250,7 @@ describe Gecode::Model, ' (without constraints)' do
   end
 end
 
-describe Gecode::Model, '(optimization search)' do
+describe Gecode::Mixin, '(optimization search)' do
   it 'should optimize the solution' do
     solution = SampleOptimizationProblem.new.optimize! do |model, best_so_far|
       model.z.must > best_so_far.z.value
@@ -266,7 +272,7 @@ describe Gecode::Model, '(optimization search)' do
   
   it 'should raise error if no constrain proc has been defined' do
     lambda do 
-      Gecode::Model.constrain(nil, nil) 
+      Gecode::Mixin.constrain(nil, nil) 
     end.should raise_error(NotImplementedError)
   end
   
@@ -344,7 +350,7 @@ describe 'single variable optimization', :shared => true do
   end
 end
 
-describe Gecode::Model, '(single variable minimization)' do
+describe Gecode::Mixin, '(single variable minimization)' do
   before do
     @method_name = 'minimize!'
     @variable_name = 'x'
@@ -363,7 +369,7 @@ describe Gecode::Model, '(single variable minimization)' do
   it_should_behave_like 'single variable optimization'
 end
 
-describe Gecode::Model, '(single variable maximization)' do
+describe Gecode::Mixin, '(single variable maximization)' do
   before do
     @method_name = 'maximize!'
     @variable_name = 'z'

data/specs/selected_set.rb

@@ -10,7 +10,7 @@ describe Gecode::SelectedSet::SelectedSetOperand do
   end
 
   it 'should implement #model' do
-    @operand.model.should be_kind_of(Gecode::Model)
+    @operand.model.should be_kind_of(Gecode::Mixin)
   end
 
   it 'should implement #to_selected_set' do
@@ -20,12 +20,12 @@ describe Gecode::SelectedSet::SelectedSetOperand do
     @model.solve!
     set_var = set.to_set_var
     ((set_var.lower_bound == []) && 
-     (set_var.upper_bound == Gecode::Model::LARGEST_SET_BOUND)).should_not(
+     (set_var.upper_bound == Gecode::Mixin::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(
+       (set_var.upper_bound == Gecode::Mixin::LARGEST_SET_BOUND)).should_not(
         be_true)
     end
   end

data/specs/set_elements.rb

@@ -8,7 +8,7 @@ describe Gecode::SelectedSet::SelectedSetOperand do
   end
 
   it 'should implement #model' do
-    @operand.model.should be_kind_of(Gecode::Model)
+    @operand.model.should be_kind_of(Gecode::Mixin)
   end
 
   it 'should implement #to_set_elements' do
@@ -17,7 +17,7 @@ describe Gecode::SelectedSet::SelectedSetOperand do
     @model.solve!
     set_var = set.to_set_var
     ((set_var.lower_bound == []) && 
-     (set_var.upper_bound == Gecode::Model::LARGEST_SET_BOUND)).should_not(
+     (set_var.upper_bound == Gecode::Mixin::LARGEST_SET_BOUND)).should_not(
       be_true)
   end
 

data/tasks/distribution.rake

@@ -8,6 +8,10 @@ PKG_FILE_NAME_WITH_GECODE = "#{PKG_NAME_WITH_GECODE}-#{PKG_VERSION}"
 # The location where the precompiled DLL should be placed.
 DLL_LOCATION = 'lib/gecode.dll'
 EXT_DIR = 'ext'
+GECODE_DIR = 'vendor/gecode'
+GECODE_NAME = 'gecode-2.2.0'
+GECODE_ARCHIVE_NAME = "#{GECODE_NAME}.tar.gz"
+
 
 desc 'Generate RDoc'
 rd = Rake::RDocTask.new do |rdoc|
@@ -16,7 +20,7 @@ rd = Rake::RDocTask.new do |rdoc|
   rdoc.template = 'doc/rdoc/jamis.rb'
   rdoc.options << '--line-numbers' << '--inline-source' << 
     '--accessor' << 'delegate' << '--main' << 'README'
-  rdoc.rdoc_files.include('README', 'CHANGES', 'LGPL-LICENSE', 'lib/**/*.rb')
+  rdoc.rdoc_files.include('README', 'CHANGES', 'THANKS', 'LGPL-LICENSE', 'lib/**/*.rb')
 end
 
 TMP_DIR = 'doc/tmp/rdoc_dev'
@@ -43,6 +47,18 @@ task :prepare_rdoc_dev do
   end
 end
 
+desc 'Extracts the source of Gecode before it is packaged into a gem'
+task :extract_gecode do
+  next if File.exist? "#{EXT_DIR}/#{GECODE_NAME}"
+  cd(EXT_DIR) do
+    cp "../#{GECODE_DIR}/#{GECODE_ARCHIVE_NAME}", GECODE_ARCHIVE_NAME
+    system("tar -xvf #{GECODE_ARCHIVE_NAME}")
+    rm GECODE_ARCHIVE_NAME 
+  end
+end
+# To ensure that the Gecode files exist for the gem spec.
+Rake::Task['extract_gecode'].invoke 
+
 spec = Gem::Specification.new do |s|
   s.name = PKG_NAME
   s.version = GecodeR::VERSION
@@ -67,7 +83,7 @@ spec = Gem::Specification.new do |s|
   ].to_a
   s.require_path = 'lib'
   s.extensions << 'ext/extconf.rb'
-  s.requirements << 'Gecode 2.1.1'
+  s.requirements << 'Gecode 2.2.0'
 
   s.has_rdoc = true
   s.rdoc_options = rd.options
@@ -109,7 +125,7 @@ spec_windows_binary_with_gecode.platform = 'x86-mswin32-60' #Gem::Platform::WIN3
 spec_with_gecode = spec.dup
 spec_with_gecode.name = PKG_NAME_WITH_GECODE
 spec_with_gecode.extensions = 
-  spec_with_gecode.extensions.dup.unshift 'ext/gecode-2.1.1/configure'
+  spec_with_gecode.extensions.dup.unshift 'ext/gecode-2.2.0/configure'
 spec_with_gecode.requirements = []
 spec_with_gecode.files = spec.files.dup + FileList['ext/gecode-*/**/*'].to_a 
 
@@ -141,6 +157,8 @@ end
 desc 'Removes generated distribution files'
 task :clobber do
   rm DLL_LOCATION if File.exists? DLL_LOCATION
+  extracted_gecode = "#{EXT_DIR}/#{GECODE_NAME}"
+  rm_r extracted_gecode if File.exists? extracted_gecode
   FileList[
     "#{EXT_DIR}/*.o",
     "#{EXT_DIR}/gecode.{cc,hh}",
@@ -177,8 +195,11 @@ gecode_release_files = [
   "pkg/#{PKG_FILE_NAME_WITH_GECODE}.gem",
   #"pkg/#{PKG_FILE_NAME_WITH_GECODE}.tgz",
   #"pkg/#{PKG_FILE_NAME_WITH_GECODE}.zip",
-  "pkg/#{PKG_FILE_NAME_WITH_GECODE}-x86-mswin32.gem"
+  "pkg/#{PKG_FILE_NAME_WITH_GECODE}-x86-mswin32-60.gem"
 ]
+gecode_release_files.each do |pkg|
+  file pkg => :extract_gecode
+end
 desc 'Publish Gecode/R with Gecode packages on RubyForge'
 task :publish_gecoder_with_gecode_packages => 
     [:verify_user] + gecode_release_files do