gecoder-with-gecode 0.7.1-mswin32 → 0.8.0-mswin32

data/specs/constraints/linear.rb

@@ -54,7 +54,7 @@ describe Gecode::Constraints::Int::Linear do
       (@x + @y).must_be.greater_than(@z, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       # TODO: this is hard to spec from this level.
     end
   end
@@ -187,7 +187,7 @@ describe Gecode::Constraints::Int::Linear do
     (@x * :foo).should be_nil
   end
   
-  it_should_behave_like 'constraint with options'
+  it_should_behave_like 'reifiable constraint'
 end
 
 describe Gecode::Constraints::Int::Linear, '(with booleans)' do
@@ -202,7 +202,7 @@ describe Gecode::Constraints::Int::Linear, '(with booleans)' do
       (@x + @y).must_be.greater_than(@z, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       # TODO: this is hard to spec from this level.
     end
   end
@@ -326,7 +326,7 @@ describe Gecode::Constraints::Int::Linear, '(with booleans)' do
     (@x * :foo).should be_nil
   end
   
-  it_should_behave_like 'constraint with options'
+  it_should_behave_like 'reifiable constraint'
 end
 
 

data/specs/constraints/reification_sugar.rb

@@ -27,14 +27,23 @@ describe Gecode::Constraints::ReifiableConstraint do
   end
   
   it 'should translate disjunctions' do
+    Gecode::Raw.should_receive(:rel).once.with(
+      an_instance_of(Gecode::Raw::Space), 
+      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::BOT_OR, 
+      an_instance_of(Gecode::Raw::BoolVar), 
+      an_instance_of(Gecode::Raw::BoolVar),
+      Gecode::Raw::ICL_DEF, Gecode::Raw::PK_DEF      
+    )
     Gecode::Raw.should_receive(:rel).once.with(
       an_instance_of(Gecode::Raw::Space), 
       an_instance_of(Gecode::Raw::IntVar), Gecode::Raw::IRT_GR, 0, 
-      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::ICL_DEF)
+      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::ICL_DEF,
+      Gecode::Raw::PK_DEF)
     Gecode::Raw.should_receive(:rel).once.with(
       an_instance_of(Gecode::Raw::Space), 
       an_instance_of(Gecode::Raw::IntVar), Gecode::Raw::IRT_EQ, 3, 
-      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::ICL_DEF)
+      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::ICL_DEF,
+      Gecode::Raw::PK_DEF)
     (@x.must > 0) | (@y.must == 3)
     sol = @model.solve!
   end
@@ -52,14 +61,23 @@ describe Gecode::Constraints::ReifiableConstraint do
   end
   
   it 'should translate conjunctions' do
+    Gecode::Raw.should_receive(:rel).once.with(
+      an_instance_of(Gecode::Raw::Space), 
+      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::BOT_AND, 
+      an_instance_of(Gecode::Raw::BoolVar), 
+      an_instance_of(Gecode::Raw::BoolVar),
+      Gecode::Raw::ICL_DEF, Gecode::Raw::PK_DEF      
+    )
     Gecode::Raw.should_receive(:rel).once.with(
       an_instance_of(Gecode::Raw::Space), 
       an_instance_of(Gecode::Raw::IntVar), Gecode::Raw::IRT_GR, 0, 
-      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::ICL_DEF)
+      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::ICL_DEF,
+      Gecode::Raw::PK_DEF)
     Gecode::Raw.should_receive(:rel).once.with(
       an_instance_of(Gecode::Raw::Space), 
       an_instance_of(Gecode::Raw::IntVar), Gecode::Raw::IRT_EQ, 2, 
-      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::ICL_DEF)
+      an_instance_of(Gecode::Raw::BoolVar), Gecode::Raw::ICL_DEF,
+      Gecode::Raw::PK_DEF)
     (@x.must > 0) & (@y.must == 2)
     sol = @model.solve!
   end

data/specs/constraints/selection.rb

@@ -79,7 +79,7 @@ describe 'selection constraint', :shared => true do
       @stub.must_be.subset_of(@target, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       @expect.call(17, Gecode::Raw::SRT_SUB, @target, reif_var, false)
     end
   end
@@ -267,7 +267,7 @@ describe Gecode::Constraints::SetEnum::Selection, ' (disjoint)' do
       @sets[@set].must_be.disjoint(hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       @expect.call(@set)
     end
   end

data/specs/constraints/set_domain.rb

@@ -35,7 +35,7 @@ describe Gecode::Constraints::Set::Domain do
       @set.must_be.superset_of(@non_range, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       @expect.call(Gecode::Raw::SRT_SUP, @non_range, reif_var, false)
     end
   end
@@ -100,6 +100,7 @@ describe Gecode::Constraints::Set::Domain, ' (equality)' do
     @range = 0..1
     @non_range = [0, 2]
     @singleton = 0
+    @model.branch_on @model.wrap_enum([@set])
     
     @expect = lambda do |relation_type, rhs, reif_var|
       @model.allow_space_access do
@@ -123,7 +124,7 @@ describe Gecode::Constraints::Set::Domain, ' (equality)' do
       @set.must_be.equal_to(@non_range, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       @expect.call(Gecode::Raw::SRT_EQ, @non_range, reif_var)
     end
   end
@@ -174,7 +175,10 @@ describe Gecode::Constraints::Set::Domain, ' (equality)' do
   
   it 'should constrain the domain with inequality' do
     @set.must_not == @singleton
-    @model.solve!.should be_nil
+    @model.solve!
+    @set.should be_assigned
+    @set.value.should include(@singleton)
+    @set.value.size.should > 1
   end
   
   it_should_behave_like 'reifiable set constraint'

data/specs/constraints/set_operation.rb

@@ -31,7 +31,7 @@ describe Gecode::Constraints::Set::Operation do
       @set1.union(@set2).must_be.superset_of(@rhs, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       @expect.call(@set1, Gecode::Raw::SOT_SUP, @set2, Gecode::Raw::SRT_SUP, 
         @rhs, reif_var, false)
     end
@@ -199,7 +199,7 @@ describe 'set enum operation constraint', :shared => true do
       @stub.must_be.superset_of(@rhs, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       @expect.call(@sets, @operation_type, Gecode::Raw::SRT_SUP, @rhs, 
         reif_var, false)
     end

data/specs/constraints/set_relation.rb

@@ -31,7 +31,7 @@ describe Gecode::Constraints::Set::Relation do
       @set.must_be.superset_of(@set2, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       @expect.call(Gecode::Raw::SRT_SUP, @set2, reif_var, false)
     end
   end
@@ -84,7 +84,7 @@ describe Gecode::Constraints::Set::Relation, ' (equality)' do
       @set.must_be.equal_to(@set2, hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       @expect.call(Gecode::Raw::SRT_EQ, @set2, reif_var)
     end
   end
@@ -146,10 +146,6 @@ describe Gecode::Constraints::Set::Relation, ' (elements)' do
     @invoke_options = lambda do |hash|
       @set.elements.must_be.equal_to(@int_var, hash)
     end
-    
-    @invoke_options = lambda do |hash|
-      @set.elements.must_be.equal_to(@int_var, hash)
-    end
   end
   
   Gecode::Constraints::Util::RELATION_TYPES.each_pair do |relation, type|

data/specs/constraints/sort.rb

@@ -28,24 +28,28 @@ describe Gecode::Constraints::IntEnum::Sort, ' (without :as and :order)' do
       @vars.must_be.sorted(hash)
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
+    @expect_options = option_expectation do |strength, kind, reif_var|
       if reif_var.nil?
         Gecode::Raw.should_receive(:rel).exactly(@vars.size - 1).times.with(
           an_instance_of(Gecode::Raw::Space), 
           an_instance_of(Gecode::Raw::IntVar), Gecode::Raw::IRT_LQ,
-          an_instance_of(Gecode::Raw::IntVar), strength)
+          an_instance_of(Gecode::Raw::IntVar), strength, kind)
       else
+        Gecode::Raw.should_receive(:rel).once.with(
+          an_instance_of(Gecode::Raw::Space), anything, 
+          an_instance_of(Gecode::Raw::BoolVarArray), 
+          anything, anything, anything)
         Gecode::Raw.should_receive(:rel).exactly(@vars.size - 1).times.with(
           an_instance_of(Gecode::Raw::Space), 
           an_instance_of(Gecode::Raw::IntVar), Gecode::Raw::IRT_LQ,
           an_instance_of(Gecode::Raw::IntVar), 
-          an_instance_of(Gecode::Raw::BoolVar), strength)
+          an_instance_of(Gecode::Raw::BoolVar), strength, kind)
       end
     end
   end
   
   it 'should translate into n relation constraints' do
-    @expect_options.call(Gecode::Raw::ICL_DEF, nil)
+    @expect_options.call({})
     @invoke_options.call({})
   end
 
@@ -62,7 +66,7 @@ describe Gecode::Constraints::IntEnum::Sort, ' (without :as and :order)' do
     values.should_not == values.sort
   end
   
-  it_should_behave_like 'constraint with options'
+  it_should_behave_like 'reifiable constraint'
 end
 
 describe Gecode::Constraints::IntEnum::Sort, ' (with :as)' do
@@ -78,16 +82,16 @@ describe Gecode::Constraints::IntEnum::Sort, ' (with :as)' do
       @vars.must_be.sorted hash.update(:as => @sorted) 
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
-      Gecode::Raw.should_receive(:sortedness).once.with(
+    @expect_options = option_expectation do |strength, kind, reif_var|
+      Gecode::Raw.should_receive(:sorted).once.with(
         an_instance_of(Gecode::Raw::Space), 
         an_instance_of(Gecode::Raw::IntVarArray), 
-        an_instance_of(Gecode::Raw::IntVarArray), strength)
+        an_instance_of(Gecode::Raw::IntVarArray), strength, kind)
     end
   end
   
   it 'should translate into a sortedness constraints' do
-    @expect_options.call(Gecode::Raw::ICL_DEF, nil)
+    @expect_options.call({})
     @invoke_options.call({})
   end
   
@@ -107,7 +111,7 @@ describe Gecode::Constraints::IntEnum::Sort, ' (with :as)' do
       Gecode::MissingConstraintError) 
   end
   
-  it_should_behave_like 'constraint with strength option'
+  it_should_behave_like 'non-reifiable constraint'
 end
 
 describe Gecode::Constraints::IntEnum::Sort, ' (with :order)' do
@@ -124,22 +128,22 @@ describe Gecode::Constraints::IntEnum::Sort, ' (with :order)' do
       @vars.must_be.sorted hash.update(:order => @indices, :as => @sorted) 
       @model.solve!
     end
-    @expect_options = lambda do |strength, reif_var|
-      Gecode::Raw.should_receive(:sortedness).once.with(
+    @expect_options = option_expectation do |strength, kind, reif_var|
+      Gecode::Raw.should_receive(:sorted).once.with(
         an_instance_of(Gecode::Raw::Space), 
         an_instance_of(Gecode::Raw::IntVarArray), 
         an_instance_of(Gecode::Raw::IntVarArray),
-        an_instance_of(Gecode::Raw::IntVarArray), strength)
+        an_instance_of(Gecode::Raw::IntVarArray), strength, kind)
     end
   end
   
   it 'should translate into a sortedness constraints' do
-    @expect_options.call(Gecode::Raw::ICL_DEF, nil)
+    @expect_options.call({})
     @invoke_options.call({})
   end
   
   it 'should translate into a sortedness constraints, even without a target' do
-    @expect_options.call(Gecode::Raw::ICL_DEF, nil)
+    @expect_options.call({})
     @vars.must_be.sorted(:order => @indices) 
     @model.solve!
   end
@@ -171,5 +175,5 @@ describe Gecode::Constraints::IntEnum::Sort, ' (with :order)' do
     end.should raise_error(Gecode::MissingConstraintError) 
   end
   
-  it_should_behave_like 'constraint with strength option'
+  it_should_behave_like 'non-reifiable constraint'
 end

data/specs/model.rb

@@ -13,8 +13,8 @@ describe Gecode::Model, ' (integer creation)' do
   it 'should allow the creation of int variables without specified domain' do
     var = @model.int_var
     var.should be_range
-    var.min.should == Gecode::Raw::Limits::Int::INT_MIN
-    var.max.should == Gecode::Raw::Limits::Int::INT_MAX
+    var.min.should == Gecode::Raw::IntLimits::MIN
+    var.max.should == Gecode::Raw::IntLimits::MAX
   end
 
   it 'should allow the creation of int variables with non-range domains' do
@@ -98,8 +98,8 @@ describe Gecode::Model, ' (set creation)' do
   it 'should allow the creation of set variables without specified bounds' do
     var = @model.set_var
     var.lower_bound.size.should == 0
-    var.upper_bound.min.should == Gecode::Raw::Limits::Set::INT_MIN
-    var.upper_bound.max.should == Gecode::Raw::Limits::Set::INT_MAX
+    var.upper_bound.min.should == Gecode::Raw::SetLimits::MIN
+    var.upper_bound.max.should == Gecode::Raw::SetLimits::MAX
   end
 
   it 'should allow the creation of set variables with glb range and lub range' do

data/tasks/dependencies.txt

@@ -0,0 +1,21 @@
+Doing the full "release" task requires a number of gems:
+
+# To run the Rake scripts.
+rake
+
+# To generate the website.
+webgen
+coderay
+
+# To run the specs and produce a report for the website.
+rspec
+
+# To release files to RubyForge.
+meta_project
+rubyforge
+
+
+
+To precompile the Windows gem you need to set up a cross-compilation 
+environment. See the following notes for instructions:
+http://rubyforge.org/pipermail/gecoder-devel/2008-January/000039.html

data/tasks/distribution.rake

@@ -5,6 +5,8 @@ PKG_NAME_WITH_GECODE = 'gecoder-with-gecode'
 PKG_VERSION = GecodeR::VERSION
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 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'
 
 desc 'Generate RDoc'
 rd = Rake::RDocTask.new do |rdoc|
@@ -59,7 +61,7 @@ spec = Gem::Specification.new do |s|
   ].to_a
   s.require_path = 'lib'
   s.extensions << 'ext/extconf.rb'
-  s.requirements << 'Gecode 1.3.1'
+  s.requirements << 'Gecode 2.1.1'
 
   s.has_rdoc = true
   s.rdoc_options = rd.options
@@ -87,7 +89,8 @@ spec_windows_binary_with_gecode.platform = Gem::Platform::WIN32
 # Create a clone of the gem spec that includes Gecode.
 spec_with_gecode = spec.dup
 spec_with_gecode.name = PKG_NAME_WITH_GECODE
-spec_with_gecode.extensions = spec.extensions.dup << 'ext/gecode-1.3.1/extconf.rb'
+spec_with_gecode.extensions = 
+  spec_with_gecode.extensions.dup.unshift 'ext/gecode-2.1.1/configure'
 spec_with_gecode.requirements = []
 spec_with_gecode.files = spec.files.dup + FileList['ext/gecode-*/**/*'].to_a 
 
@@ -112,12 +115,17 @@ file 'lib/gecode.dll' do
   cd 'ext' do
     sh 'ruby -Iwin32 extconf-win32.rb'
     sh 'make'
-    mv 'gecode.so', '../lib/gecode.dll'
+    mv 'gecode.so', "../#{DLL_LOCATION}"
   end
 end
 
+desc 'Removes generated distribution files'
+task :clobber do
+  rm DLL_LOCATION if File.exists? DLL_LOCATION
+end
+
 desc 'Publish packages on RubyForge'
-task :publish_packages => [:publist_gecoder_packages, 
+task :publish_packages => [:publish_gecoder_packages, 
   :publish_gecoder_with_gecode_packages]
 
 desc 'Publish Gecode/R packages on RubyForge'
@@ -153,4 +161,4 @@ task :publish_gecoder_with_gecode_packages => [:verify_user, :package] do
     xf.files = release_files.to_a
     xf.release_name = "Gecode/R with Gecode #{PKG_VERSION}"
   end
-end
+end

data/vendor/rust/include/rust_checks.hh

@@ -82,7 +82,8 @@ static inline bool is_array(VALUE val)
 
 static inline bool is_int(VALUE val)
 {
-  return isType(val, T_FIXNUM);
+  return isType(val, T_FIXNUM) || 
+  	(isType(val, T_BIGNUM) && NUM2INT(val) < INT_MAX);
 }
 
 static inline bool is_hash(VALUE val)

data/vendor/rust/include/rust_conversions.hh

@@ -38,11 +38,11 @@ static inline int32_t ruby2int(VALUE rval, int argn = -1) {
 }
 
 static inline VALUE cxx2ruby(int32_t val) {
-  return INT2FIX(val);
+  return INT2NUM(val);
 }
 
 static inline VALUE cxx2ruby(uint32_t val) {
-  return INT2FIX(val);
+  return INT2NUM(val);
 }
 
 static inline VALUE cxx2ruby(double val) {

data/vendor/rust/rust/attribute.rb

@@ -38,10 +38,10 @@ module Rust
       @prototype_template = "void set!attribute_bindname!(VALUE self, VALUE val);\nVALUE get!attribute_bindname!(VALUE self);\n"
       @initialization_template = Templates["AttributeInitBinding"]
       
-      
       add_expansion 'parent_varname', "@options[:parent].varname"
       add_expansion 'attribute_bindname', "@name"
-      add_expansion 'attribute_type', "@type"
+      add_expansion 'attribute_type', "@type.name"
+      add_expansion 'attribute_convert_name', "@type.valid_name"
       add_expansion 'attribute_name', "@name"
     end