gecoder 0.3.0 → 0.4.0

data/specs/spec_helper.rb

@@ -0,0 +1,63 @@
+require File.dirname(__FILE__) + '/../lib/gecoder'
+
+module CustomVarMatchers
+  class HaveDomain
+    def initialize(expected)
+      @expected = expected.to_a
+    end
+    
+    def matches?(target)
+      @target = target
+      return false unless @target.size == @expected.size
+      @expected.each do |element|
+        return false unless @target.in(element)
+      end
+      return true
+    end
+    
+    def failure_message
+      "expected #{@target.inspect} to have domain #{@expected.inspect}"
+    end
+    
+    def negative_failure_message
+      "expected #{@target.inspect} not to have domain #{@expected.inspect}"
+    end
+  end
+
+  # Tests whether a variable has the expected domain.
+  def have_domain(expected)
+    HaveDomain.new(expected)
+  end
+  
+  class IsAlias
+    def initialize(expected)
+      @expected = expected.to_a
+    end
+    
+    def matches?(target)
+      @target = target
+      return false unless @target.size == @expected.size
+      @expected.each do |element|
+        return false unless @target.in(element)
+      end
+      return true
+    end
+    
+    def failure_message
+      "expected #{@target.inspect} to be an alias of #{@expected.inspect}"
+    end
+    
+    def negative_failure_message
+      "expected #{@target.inspect} not to be an alias of #{@expected.inspect}"
+    end
+  end
+
+  # Tests whether a method with a specified name is the alias of another.
+  def is_alias_of(expected)
+    HaveDomain.new(expected)
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.include(CustomVarMatchers)
+end

data/specs/tmp

@@ -0,0 +1,135 @@
+Idea: Write constraints in separate modules and then include the modules in
+the respective place.
+
+    
+    =begin
+  it 'should handle relation with integer variables' do
+    fail
+  end
+  
+  it 'should handle propagation strength domain' do
+    fail
+  end
+  
+  it 'should handle propagation strength val' do
+    fail
+  end
+  
+  it 'should handle propagation strength range' do
+    fail
+  end
+  
+  it 'should raise error for unknown propagation strengths' do
+    fail
+  end
+  
+  it 'should handle reification' do
+    fail
+  end
+=end
+
+=begin
+  it 'should handle variables as right hand side' do
+    (@x + @y).must == @z
+    sol = @model.solution
+    x = sol.x.val
+    y = sol.y.val
+    z = sol.z.val
+    (x + y).should equal(z)
+  end
+
+  it 'should handle multiplication with a constant' do
+    Gecode::Raw.should_receive(:linear).once.with(@model.active_space, 
+      an_instance_of(Gecode::Raw::IntVarArray), Gecode::Raw::IRT_EQ, 1,
+      Gecode::Raw::ICL_DEF).and_return{ |s, arr, irt, res, strength| arr }
+    ((10*@x + @y).must == 1).should contain_vars_with_domains(@x_dom, @y_dom)
+  end
+  
+  it 'should handle addition with a constant' do
+    
+  end
+  
+  it 'should handle relation...' do
+    
+  end
+=end
+
+
+
+module CustomVarMatchers
+  class ContainVarsWithDomains
+    def initialize(*expected_domains)
+      @expected_domains = expected_domains
+    end
+    
+    def matches?(target)
+      @target = target
+      return false unless @target.kind_of? Gecode::Raw::IntVarArray
+      return false unless @target.size == @expected_domains.size
+      @target.size do |i|
+        var = @target.at(i)
+        detected = @expected_domains.detect do |domain| 
+          variable_has_domain?(var, domain)
+        end
+        unless detected.nil?
+          @expected_domains.delete(@expected_domains.index(detected))
+        else
+          return false
+        end
+      end
+      return true
+    end
+    
+    def failure_message
+      "expected #{@target.inspect} to contain variables with domains " + 
+        @expected_vars.inspect
+    end
+    
+    def negative_failure_message
+      "expected #{@target.inspect} to not contain variables with domains " + 
+        @expected_vars.inspect
+    end
+    
+    private
+    
+    def variable_has_domain?(target, expected)
+      return false unless target.size == expected.size
+      expected.each do |element|
+        return false unless target.in(element)
+      end
+      return true
+    end
+  end
+
+  # Tests whether an integer variables array contains variables with the 
+  # expected domains (in any order given).
+  def contain_domains(expected)
+    ContainVarsWithDomains.new(expected)
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.include(CustomVarMatchers)
+end
+
+
+    
+
+Left:
+* Sorted
+* Arithmetic
+
+
+xs.occurrences_of(y).must == z
+xs.occurrences_of(3).must >= 5
+xs.count(y).must == z
+xs.number_of(y).must == z
+
+
+ys.sorted.must == xs
+ys.sorted_with(zs).must == xs
+
+ys.sort.must == xs
+ys.must_be.xs.sorted
+ys.must_be.sort(xs)
+ys.sort.must_be.xs

data/tasks/all_tasks.rb

@@ -0,0 +1 @@
+Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }

data/tasks/distribution.rake

@@ -0,0 +1,64 @@
+require 'lib/gecoder/version'
+
+PKG_NAME = 'gecoder'
+PKG_VERSION = GecodeR::VERSION
+PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+
+desc 'Generate RDoc'
+rd = Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = "#{File.dirname(__FILE__)}/../doc/output/rdoc"
+  rdoc.options << '--title' << 'Gecode/R' << '--line-numbers' << '--inline-source' << '--main' << 'README'
+  rdoc.rdoc_files.include('README', 'lib/**/*.rb')
+end
+
+spec = Gem::Specification.new do |s|
+  s.name = PKG_NAME
+  s.version = GecodeR::VERSION
+  s.summary = 'Ruby interface to Gecode, an environment for constraint programming.'
+
+  s.files = FileList[
+    '[A-Z]*',
+    'lib/**/*.rb', 
+    'examples/**/*',
+    'src/**/*',
+    'vendor/**/*',
+    'tasks/**/*',
+    'specs/**/*',
+    'ext/*'
+  ].to_a
+  s.require_path = 'lib'
+  s.extensions << 'ext/extconf.rb'
+
+  s.has_rdoc = true
+  s.rdoc_options = rd.options
+  s.extra_rdoc_files = rd.rdoc_files
+
+  s.autorequire = 'gecoder'
+  s.author = ["Gecode/R Development Team"]
+  s.email = "gecoder-devel@rubyforge.org"
+  s.homepage = "http://gecoder.rubyforge.org"
+  s.rubyforge_project = "gecoder"
+end
+
+desc 'Generate Gem'
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end
+
+desc "Publish packages on RubyForge"
+task :publish_packages => [:verify_user, :package] do
+  release_files = FileList[
+    "pkg/#{PKG_FILE_NAME}.gem",
+    "pkg/#{PKG_FILE_NAME}.tgz",
+    "pkg/#{PKG_FILE_NAME}.zip"
+  ]
+  require 'meta_project'
+  require 'rake/contrib/xforge'
+
+  Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |xf|
+    xf.user_name = ENV['RUBYFORGE_USER']
+    xf.files = release_files.to_a
+    xf.release_name = "Gecode/R #{PKG_VERSION}"
+  end
+end

data/tasks/rcov.rake

@@ -0,0 +1,17 @@
+require 'spec/rake/spectask'
+require 'spec/rake/verify_rcov'
+
+RCOV_DIR = "#{File.dirname(__FILE__)}/../doc/output/coverage"
+
+desc "Run all specs with rcov"
+Spec::Rake::SpecTask.new(:rcov) do |t|
+  t.spec_files = FileList['specs/**/*.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude examples', '--exclude specs']
+  t.rcov_dir = RCOV_DIR
+end
+
+RCov::VerifyTask.new(:verify_rcov => :rcov) do |t|
+  t.threshold = 100.0
+  t.index_html = "#{RCOV_DIR}/index.html"
+end

data/tasks/specs.rake

@@ -0,0 +1,16 @@
+require 'spec/rake/spectask'
+
+spec_files = FileList['specs/**/*.rb']
+
+desc 'Run all specs'
+Spec::Rake::SpecTask.new('specs') do |t|
+  t.spec_opts = ["--format", "specdoc"]
+  t.libs = ['lib']
+  t.spec_files = spec_files
+end
+
+desc 'Generate an rspec html report'
+Spec::Rake::SpecTask.new('spec_html') do |t|
+  t.spec_files = spec_files
+  t.spec_opts = ['--format html:doc/output/rspec.html','--backtrace']
+end

data/tasks/svn.rake

@@ -0,0 +1,11 @@
+require 'lib/gecoder/version'
+
+desc "Tag the release in svn"
+task :tag do
+  from = `svn info`.match(/Repository Root: (.*)/n)[1] + '/trunk'
+  to = from.gsub(/trunk/, "tags/gecoder-#{GecodeR::VERSION}")
+
+  puts "Creating tag in SVN"
+  tag_cmd = "svn cp #{from} #{to} -m \"Tag release Gecode/R #{GecodeR::VERSION}\""
+  `#{tag_cmd}` ; raise "ERROR: #{tag_cmd}" unless $? == 0
+end

data/tasks/website.rake

@@ -0,0 +1,58 @@
+require 'rake/contrib/rubyforgepublisher'
+
+desc 'Regenerates the contents of the website'
+task :website do
+  Rake::Task[:clobber].invoke
+  mkdir 'doc/output'
+  begin
+    Rake::Task[:spec_html].invoke
+  rescue
+    # The task will fail unless all specs pass, we want it to continue.
+  end
+  Rake::Task[:rdoc].invoke
+  begin
+    Rake::Task[:rcov].invoke
+  rescue
+    # The task will fail unless all specs pass, we want it to continue.
+  end
+  WebsiteRakeHelpers.webgen
+end
+
+desc 'Removes generated documentation'
+task :clobber do
+  WebsiteRakeHelpers.clobber
+end
+
+task :verify_user do
+  raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
+end
+
+desc "Uploads the website to RubyForge"
+task :publish_website => [:verify_user, :website] do
+  publisher = Rake::SshDirPublisher.new(
+    "#{ENV['RUBYFORGE_USER']}@rubyforge.org",
+    "/var/www/gforge-projects/gecoder",
+    "doc/output"
+  )
+  publisher.upload
+end
+
+module WebsiteRakeHelpers
+  module_function
+  
+  # Remove generated documentation.
+  def clobber
+    rm_rf 'doc/output'
+  end
+  
+  # Generates the website with webgen.
+  def webgen
+    Dir.chdir 'doc' do
+      output = nil
+      IO.popen('webgen 2>&1') do |io|
+        output = io.read
+      end
+      raise "ERROR while running webgen: #{output}" if output =~ /ERROR/n || $? != 0
+    end
+  end
+end

data/vendor/rust/include/rust_conversions.hh

@@ -67,8 +67,7 @@ static inline VALUE cxx2ruby(double val) {
 static inline int *ruby2intArray(VALUE rval, int argn = -1) {
   int i;
   RArray *array = RARRAY(rval);
-//   int *ret = new int(array->len);
-  int ret[array->len];
+  int* ret = (int*)malloc(array->len*sizeof(int)); // FIXME: Leak!!!
   for(i = 0; i < array->len; i++)
   {
     ret[i] = NUM2INT(array->ptr[i]);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: gecoder
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-06-26 00:00:00 +02:00
+  version: 0.4.0
+date: 2007-07-03 00:00:00 +02:00
 summary: Ruby interface to Gecode, an environment for constraint programming.
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - lib/gecoder.rb
 - lib/gecoder/interface.rb
 - lib/gecoder/bindings.rb
+- lib/gecoder/version.rb
 - lib/gecoder/interface/search.rb
 - lib/gecoder/interface/model.rb
 - lib/gecoder/interface/constraints.rb
@@ -44,13 +45,22 @@ files:
 - lib/gecoder/interface/branch.rb
 - lib/gecoder/interface/enum_wrapper.rb
 - lib/gecoder/interface/variables.rb
+- lib/gecoder/interface/enum_matrix.rb
 - lib/gecoder/interface/constraints/reifiable_constraints.rb
 - lib/gecoder/interface/constraints/bool_var_constraints.rb
 - lib/gecoder/interface/constraints/int_var_constraints.rb
 - lib/gecoder/interface/constraints/int_enum_constraints.rb
 - lib/gecoder/interface/constraints/bool/boolean.rb
 - lib/gecoder/interface/constraints/int/linear.rb
+- lib/gecoder/interface/constraints/int/domain.rb
+- lib/gecoder/interface/constraints/int/arithmetic.rb
 - lib/gecoder/interface/constraints/int_enum/distinct.rb
+- lib/gecoder/interface/constraints/int_enum/equality.rb
+- lib/gecoder/interface/constraints/int_enum/channel.rb
+- lib/gecoder/interface/constraints/int_enum/element.rb
+- lib/gecoder/interface/constraints/int_enum/count.rb
+- lib/gecoder/interface/constraints/int_enum/sort.rb
+- lib/gecoder/interface/constraints/int_enum/arithmetic.rb
 - lib/gecoder/bindings/bindings.rb
 - vendor/rust
 - vendor/rust/test
@@ -111,6 +121,37 @@ files:
 - vendor/rust/rust/templates/ClassDeclarations.rusttpl
 - vendor/rust/rust/templates/MethodInitBinding.rusttpl
 - vendor/rust/rust/templates/CxxMethodStub.rusttpl
+- tasks/rcov.rake
+- tasks/all_tasks.rb
+- tasks/specs.rake
+- tasks/distribution.rake
+- tasks/website.rake
+- tasks/svn.rake
+- specs/search.rb
+- specs/model.rb
+- specs/tmp
+- specs/branch.rb
+- specs/binding_changes.rb
+- specs/spec_helper.rb
+- specs/enum_wrapper.rb
+- specs/int_var.rb
+- specs/constraints
+- specs/bool_var.rb
+- specs/enum_matrix.rb
+- specs/constraints/linear.rb
+- specs/constraints/relation.rb
+- specs/constraints/distinct.rb
+- specs/constraints/constraint_helper.rb
+- specs/constraints/constraints.rb
+- specs/constraints/boolean.rb
+- specs/constraints/reification_sugar.rb
+- specs/constraints/domain.rb
+- specs/constraints/equality.rb
+- specs/constraints/channel.rb
+- specs/constraints/element.rb
+- specs/constraints/count.rb
+- specs/constraints/sort.rb
+- specs/constraints/arithmetic.rb
 - ext/missing.h
 - ext/extconf.rb
 - ext/vararray.cpp
@@ -130,6 +171,7 @@ extra_rdoc_files:
 - lib/gecoder.rb
 - lib/gecoder/interface.rb
 - lib/gecoder/bindings.rb
+- lib/gecoder/version.rb
 - lib/gecoder/interface/search.rb
 - lib/gecoder/interface/model.rb
 - lib/gecoder/interface/constraints.rb
@@ -137,13 +179,22 @@ extra_rdoc_files:
 - lib/gecoder/interface/branch.rb
 - lib/gecoder/interface/enum_wrapper.rb
 - lib/gecoder/interface/variables.rb
+- lib/gecoder/interface/enum_matrix.rb
 - lib/gecoder/interface/constraints/reifiable_constraints.rb
 - lib/gecoder/interface/constraints/bool_var_constraints.rb
 - lib/gecoder/interface/constraints/int_var_constraints.rb
 - lib/gecoder/interface/constraints/int_enum_constraints.rb
 - lib/gecoder/interface/constraints/bool/boolean.rb
 - lib/gecoder/interface/constraints/int/linear.rb
+- lib/gecoder/interface/constraints/int/domain.rb
+- lib/gecoder/interface/constraints/int/arithmetic.rb
 - lib/gecoder/interface/constraints/int_enum/distinct.rb
+- lib/gecoder/interface/constraints/int_enum/equality.rb
+- lib/gecoder/interface/constraints/int_enum/channel.rb
+- lib/gecoder/interface/constraints/int_enum/element.rb
+- lib/gecoder/interface/constraints/int_enum/count.rb
+- lib/gecoder/interface/constraints/int_enum/sort.rb
+- lib/gecoder/interface/constraints/int_enum/arithmetic.rb
 - lib/gecoder/bindings/bindings.rb
 executables: []