gecoder-with-gecode 0.8.3 → 0.9.0

data/specs/spec_helper.rb

@@ -5,16 +5,25 @@ require File.dirname(__FILE__) + '/../lib/gecoder'
 module CustomVarMatchers
   class HaveDomain
     def initialize(expected)
-      @expected = expected.to_a
+      @expected = expected
     end
     
     def matches?(target)
       @target = target
-      return false unless @target.size == @expected.size
-      @expected.each do |element|
-        return false unless @target.include? element
+      if @expected.kind_of? Range
+        last = @expected.end
+        last -= 1 if @expected.exclude_end?
+        return @target.range? && @expected.begin == @target.min && 
+          last == @target.max
+      else
+        @expected = @expected.to_a
+        return false unless @target.size == @expected.size
+        @expected.each do |element|
+          return false unless @target.include? element
+        end
+        return true
       end
-      return true
+      return false
     end
     
     def failure_message
@@ -39,7 +48,9 @@ module CustomVarMatchers
     
     def matches?(target)
       @target = target
-      return @target.lower_bound.to_a == @expected_glb &&
+      return @target.lower_bound.size == @expected_glb.size &&
+        @target.upper_bound.size == @expected_lub.size &&
+        @target.lower_bound.to_a == @expected_glb &&
         @target.upper_bound.to_a == @expected_lub
     end
     
@@ -63,3 +74,192 @@ end
 Spec::Runner.configure do |config|
   config.include(CustomVarMatchers)
 end
+
+
+# Help methods for the GecodeR specs. 
+module GecodeR::Specs
+  module SetHelper
+    module_function
+  
+    # Returns the arguments that should be used in a partial mock to expect the
+    # specified constant set (possibly an array of arguments).
+    def expect_constant_set(constant_set)
+      if constant_set.kind_of? Range
+        return constant_set.first, constant_set.last
+      elsif constant_set.kind_of? Fixnum
+        constant_set
+      else
+        an_instance_of(Gecode::Raw::IntSet)
+      end
+    end
+  end
+
+  module GeneralHelper
+    module_function
+
+    # Produces a base operand that can be used to mock specific types of
+    # operands.
+    def general_operand_base(model)
+      mock_op_class = Class.new
+      mock_op_class.class_eval do
+        attr :model
+
+        def bind
+          raise 'Bind should not be called directly for an operand.'
+        end
+        alias_method :bind_array, :bind
+      end
+      op = mock_op_class.new
+      op.instance_eval do
+        @model = model
+      end
+      return op
+    end
+
+    # Produces a general int operand. The method returns two objects: 
+    # the operand itself and the variable it returns when #to_int_var
+    # is called.
+    def general_int_operand(model)
+      op = general_operand_base(model)
+      
+      int_var = model.int_var
+      class <<op
+        include Gecode::Int::IntOperand
+        attr :model
+      end
+      op.stub!(:to_int_var).and_return int_var
+
+      return op, int_var
+    end
+
+    # Produces a general bool operand. The method returns two objects: 
+    # the operand itself and the variable it returns when #to_bool_var
+    # is called.
+    def general_bool_operand(model)
+      op = general_operand_base(model)
+
+      bool_var = model.bool_var
+      class <<op
+        include Gecode::Bool::BoolOperand
+        attr :model
+      end
+      op.stub!(:to_bool_var).and_return bool_var
+
+      return op, bool_var
+    end
+
+    # Produces a general set operand. The method returns two objects: 
+    # the operand itself and the variable it returns when #to_set_var
+    # is called.
+    def general_set_operand(model)
+      op = general_operand_base(model)
+
+      set_var = model.set_var
+      class <<op
+        include Gecode::Set::SetOperand
+        attr :model
+      end
+      op.stub!(:to_set_var).and_return set_var
+
+      return op, set_var
+    end
+    
+    # Produces a general int enum operand. The method returns two objects: 
+    # the operand itself and the variable it returns when #to_int_enum
+    # is called.
+    def general_int_enum_operand(model)
+      op = general_operand_base(model)
+      
+      int_enum = model.int_var_array(5)
+      class <<op
+        include Gecode::IntEnum::IntEnumOperand
+        attr :model
+      end
+      op.stub!(:to_int_enum).and_return int_enum
+
+      return op, int_enum
+    end
+
+    # Produces a general bool enum operand. The method returns two objects: 
+    # the operand itself and the variable it returns when #to_bool_enum
+    # is called.
+    def general_bool_enum_operand(model)
+      op = general_operand_base(model)
+      
+      bool_enum = model.bool_var_array(5)
+      class <<op
+        include Gecode::BoolEnum::BoolEnumOperand
+        attr :model
+      end
+      op.stub!(:to_bool_enum).and_return bool_enum
+
+      return op, bool_enum
+    end
+
+    # Produces a general set enum operand. The method returns two objects: 
+    # the operand itself and the variable it returns when #to_set_enum
+    # is called.
+    def general_set_enum_operand(model)
+      op = general_operand_base(model)
+      
+      set_enum = model.set_var_array(5)
+      class <<op
+        include Gecode::SetEnum::SetEnumOperand
+        attr :model
+      end
+      op.stub!(:to_set_enum).and_return set_enum
+
+      return op, set_enum
+    end
+
+    # Produces a general selected set operand. The method returns two objects: 
+    # the operand itself and the array of variables corresponding to the
+    # operands it returns when # #to_selected_set is called.
+    def general_selected_set_operand(model)
+      set_enum, set_enum_var = general_set_enum_operand(model)
+      set, set_var = general_set_operand(model)
+      op = Gecode::SelectedSet::SelectedSetOperand.new(
+        set_enum, set)
+      return op, [set_enum_var, set_var]
+    end
+
+    # Produces a general set elements  operand. The method returns two 
+    # objects: the operand itself and the set var corresponding to the
+    # operands it returns when # #to_selected_set is called.
+    def general_set_elements_operand(model)
+      set, set_var = general_set_operand(model)
+      op = Gecode::SetElements::SetElementsOperand.new(set)
+      return op, set_var
+    end
+
+    # Produces a general fixnum enum operand. The method returns two objects: 
+    # the operand itself and the variable it returns when #to_fixnum_enum
+    # is called.
+    def general_fixnum_enum_operand(model)
+      op = general_operand_base(model)
+      
+      fixnum_enum = model.wrap_enum([1, -4, 9, 4, 0])
+      class <<op
+        include Gecode::FixnumEnum::FixnumEnumOperand
+        attr :model
+      end
+      op.stub!(:to_fixnum_enum).and_return fixnum_enum
+
+      return op, fixnum_enum
+    end
+
+    # Produces an array of general operands of the specified types.
+    # Returns an array of operands and an array of their variables.
+    def produce_general_arguments(property_types)
+      operands = []
+      variables = []
+      property_types.each do |type|
+        op, var = eval "general_#{type}_operand(@model)"
+        operands << op
+        variables << var
+      end
+      return operands, variables
+    end
+  end
+end
+include GecodeR::Specs::GeneralHelper

data/tasks/distribution.rake

@@ -12,8 +12,10 @@ EXT_DIR = 'ext'
 desc 'Generate RDoc'
 rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/output/rdoc'
-  rdoc.options << '--title' << 'Gecode/R' << '--line-numbers' << 
-    '--inline-source' << '--accessor' << 'delegate' << '--main' << 'README'
+  rdoc.title = 'Gecode/R'
+  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')
 end
 
@@ -32,7 +34,7 @@ task :prepare_rdoc_dev do
   # Copy the rdoc and remove all #:nodoc: .
   Dir['lib/**/*.rb'].each do |source_name|
     destination_name = source_name.sub('lib', TMP_DIR)
-    File.makedirs File.dirname(destination_name)
+    FileUtils.makedirs File.dirname(destination_name)
     destination = File.open(destination_name, 'w')
     File.open(source_name) do |source|
       source.each{ |line| destination << line.gsub('#:nodoc:', '' ) }
@@ -72,11 +74,24 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = rd.rdoc_files
   s.test_files = FileList['specs/**/*.rb']
 
-  s.autorequire = 'gecoder'
-  s.author = ["Gecode/R Development Team"]
+  s.authors = ["Gecode/R Development Team"]
   s.email = "gecoder-users@rubyforge.org"
   s.homepage = "http://gecoder.rubyforge.org"
   s.rubyforge_project = "gecoder"
+
+=begin
+  # Development dependencies.
+  # Not listed: rubygems >= 1.2
+  [['rake'], 
+    ['webgen', '= 0.4.7'], 
+    ['coderay'], 
+    ['rspec', '>= 1.0'], 
+    ['rcov'], 
+    ['meta_project'], 
+    ['rubyforge']].each do |dependency|
+    s.add_development_dependency(*dependency)
+  end
+=end
 end
 
 # Create a clone of the gem spec with the precompiled binaries for Windows.
@@ -88,7 +103,7 @@ spec_windows_binary_with_gecode.requirements = []
 spec_windows_binary_with_gecode.files = spec.files.dup -
   FileList['ext/**/*'].to_a + 
   FileList['vendor/gecode/win32/lib/*'].to_a << 'lib/gecode.dll'
-spec_windows_binary_with_gecode.platform = Gem::Platform::WIN32
+spec_windows_binary_with_gecode.platform = 'mswin32' #Gem::Platform::WIN32
 
 # Create a clone of the gem spec that includes Gecode.
 spec_with_gecode = spec.dup
@@ -162,7 +177,7 @@ 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}-mswin32.gem"
+  "pkg/#{PKG_FILE_NAME_WITH_GECODE}-x86-mswin32.gem"
 ]
 desc 'Publish Gecode/R with Gecode packages on RubyForge'
 task :publish_gecoder_with_gecode_packages => 

data/tasks/svn.rake

@@ -3,7 +3,9 @@ require 'lib/gecoder/version'
 desc "Tag the release in svn"
 task :tag do
   base_url = `svn info`.match(/Repository Root: (.*)/n)[1]
-  base_url.gsub!('rubyforge', "#{ENV['RUBYFORGE_USER']}@rubyforge")
+  unless base_url.include? ENV['RUBYFORGE_USER']
+    base_url.gsub!('rubyforge', "#{ENV['RUBYFORGE_USER']}@rubyforge")
+  end
   from = base_url + '/trunk'
   to = base_url + "/tags/gecoder-#{GecodeR::VERSION}"
   options = "-m \"Tag release Gecode/R #{GecodeR::VERSION}\""