gecoder 0.8.1 → 0.8.2

data/specs/search.rb

@@ -65,6 +65,12 @@ describe Gecode::Model, ' (with multiple solutions)' do
       s.var.should have_domain(@solved_domain)
     end
   end
+
+  it 'should update the search statistics before yielding to #solution' do
+    @model.solution do |s|
+      @model.search_stats.should_not be_nil
+    end
+  end
   
   it 'should only evaluate the block for one solution in #solution' do
     i = 0
@@ -83,6 +89,18 @@ describe Gecode::Model, ' (with multiple solutions)' do
     end
     Set.new(solutions).should == Set.new([2,3])
   end
+  
+  it 'should update the search statistics before yielding to #each_solution' do
+    solutions = []
+    old_stats = @model.search_stats
+    old_stats.should be_nil
+    @model.each_solution do |s|
+      solutions << s.var.value
+      @model.search_stats.should_not == old_stats
+      @model.search_stats.should_not be_nil
+      old_stats = @model.search_stats
+    end
+  end
 end
 
 describe Gecode::Model, ' (after #solve!)' do
@@ -114,6 +132,15 @@ describe Gecode::Model, ' (after #solve!)' do
     enum[2].first.should have_domain(@solved_domain)
     enum[3][1][:b].should have_domain(@solved_domain)
   end
+  
+  it 'should have updated the search statistics' do
+    stats = @model.search_stats
+    stats[:propagations].should == 0
+    stats[:failures].should == 0
+    stats[:clones].should_not be_nil
+    stats[:commits].should_not be_nil
+    stats[:memory].should > 0
+  end
 end
 
 describe 'reset model', :shared => true do
@@ -126,6 +153,10 @@ describe 'reset model', :shared => true do
     enum[2].first.should have_domain(@reset_domain)
     enum[3][1][:b].should have_domain(@reset_domain)
   end
+  
+  it 'should have cleared the search statistics' do
+    @model.search_stats.should be_nil
+  end
 end
 
 describe Gecode::Model, ' (after #reset!)' do
@@ -205,66 +236,6 @@ describe Gecode::Model, '(optimization search)' do
     solution.z.value.should == 25
   end
   
-  it 'should support maximizing singe variables given as symbols' do
-    solution = SampleOptimizationProblem.new.maximize! :z
-    solution.should_not be_nil
-    solution.x.value.should == 5
-    solution.y.value.should == 5
-    solution.z.value.should == 25
-  end
-  
-  it 'should support maximizing singe variables given as strings' do
-    solution = SampleOptimizationProblem.new.maximize! 'z'
-    solution.should_not be_nil
-    solution.x.value.should == 5
-    solution.y.value.should == 5
-    solution.z.value.should == 25
-  end
-  
-  it 'should raise error if maximize! is given a non-existing method' do
-    lambda do
-      SampleOptimizationProblem.new.maximize! :does_not_exist
-    end.should raise_error(NameError)
-  end
-  
-  it 'should raise error if maximize! is given a method that does not return an integer variable' do
-    lambda do
-      SampleOptimizationProblem.new.maximize! :object_id
-    end.should raise_error(ArgumentError)
-  end
-  
-  it 'should support minimizing singe variables given as symbols' do
-    problem = SampleOptimizationProblem.new
-    problem.z.must > 2
-    solution = problem.minimize! :x
-    solution.should_not be_nil
-    solution.x.value.should == 1
-    solution.y.value.should == 3
-    solution.z.value.should == 3
-  end
-  
-  it 'should support minimizing singe variables given as strings' do
-    problem = SampleOptimizationProblem.new
-    problem.z.must > 2
-    solution = problem.minimize! 'x'
-    solution.should_not be_nil
-    solution.x.value.should == 1
-    solution.y.value.should == 3
-    solution.z.value.should == 3
-  end
-  
-  it 'should raise error if minimize! is given a non-existing method' do
-    lambda do
-      SampleOptimizationProblem.new.minimize! :does_not_exist
-    end.should raise_error(NameError)
-  end
-  
-  it 'should raise error if minimize! is given a method that does not return an integer variable' do
-    lambda do
-      SampleOptimizationProblem.new.minimize! :object_id
-    end.should raise_error(ArgumentError)
-  end
-  
   it 'should not be bothered by garbage collecting' do
     # This goes through 400+ spaces.
     solution = SampleOptimizationProblem2.new.optimize! do |model, best_so_far|
@@ -303,4 +274,91 @@ describe Gecode::Model, '(optimization search)' do
     solution.y.value.should == 5
     solution.z.value.should == 25
   end
-end
+  
+  it 'should update the search statistics' do
+    model = SampleOptimizationProblem.new
+    solution = model.maximize! :z
+    
+    stats = model.search_stats
+    stats.should_not be_nil
+    stats[:propagations].should be_between(1, 100)
+    stats[:failures].should be_between(1, 100)
+    stats[:clones].should_not be_nil
+    stats[:commits].should_not be_nil
+    stats[:memory].should > 0
+  end
+end
+
+describe 'single variable optimization', :shared => true do
+  it "should support #{@method_name} having the variable given as a symbol" do
+    solution = @model.method(@method_name).call(@variable_name.to_sym)
+    @expect_to_be_correct.call(solution)
+  end
+  
+  it "should support #{@method_name} having the variable given as a string" do
+    solution = @model.method(@method_name).call(@variable_name.to_s)
+    @expect_to_be_correct.call(solution)
+  end
+  
+  it "should raise error if #{@method_name} is given a non-existing method" do
+    lambda do
+      SampleOptimizationProblem.new.method(@method_name).call(:does_not_exist)
+    end.should raise_error(NameError)
+  end
+  
+  it "should raise error if #{@method_name} is given a method that does not return an integer variable" do
+    lambda do
+      SampleOptimizationProblem.new.method(@method_name).call(:object_id)
+    end.should raise_error(ArgumentError)
+  end
+  
+  it 'should update the search statistics' do
+    @model.method(@method_name).call(@variable_name.to_sym)
+    
+    stats = @model.search_stats
+    stats.should_not be_nil
+    stats[:propagations].should be_between(1, 100)
+    stats[:failures].should be_between(1, 100)
+    stats[:clones].should_not be_nil
+    stats[:commits].should_not be_nil
+    stats[:memory].should > 0
+  end
+end
+
+describe Gecode::Model, '(single variable minimization)' do
+  before do
+    @method_name = 'minimize!'
+    @variable_name = 'x'
+    
+    @model = SampleOptimizationProblem.new
+    @model.z.must > 2
+    
+    @expect_to_be_correct = lambda do |solution|
+      solution.should_not be_nil
+      solution.x.value.should == 1
+      solution.y.value.should == 3
+      solution.z.value.should == 3
+    end
+  end
+  
+  it_should_behave_like 'single variable optimization'
+end
+
+describe Gecode::Model, '(single variable maximization)' do
+  before do
+    @method_name = 'maximize!'
+    @variable_name = 'z'
+    
+    @model = SampleOptimizationProblem.new
+    
+    @expect_to_be_correct = lambda do |solution|
+      solution.should_not be_nil
+      solution.x.value.should == 5
+      solution.y.value.should == 5
+      solution.z.value.should == 25
+    end
+  end
+  
+  it_should_behave_like 'single variable optimization'
+end
+

data/specs/spec_helper.rb

@@ -58,34 +58,6 @@ module CustomVarMatchers
   def have_bounds(expected_glb, expected_lub)
     HaveBounds.new(expected_glb, expected_lub)
   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|

data/tasks/distribution.rake

@@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
   s.files = FileList[
     '[A-Z]*',
     'lib/**/*.rb', 
-    'example/**/*',
+    'example/**/*.rb',
     'src/**/*',
     'vendor/rust/**/*',
     'tasks/**/*',
@@ -144,9 +144,8 @@ vanilla_release_files = [
   "pkg/#{PKG_FILE_NAME}.tgz",
   "pkg/#{PKG_FILE_NAME}.zip"
 ]
-
 desc 'Publish Gecode/R packages on RubyForge'
-task :publish_gecoder_packages => [:verify_user].concat(vanilla_release_files) do
+task :publish_gecoder_packages => [:verify_user] + vanilla_release_files do
   require 'meta_project'
   require 'rake/contrib/xforge'
 
@@ -161,14 +160,13 @@ end
 # Files included in the release with Gecode.
 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}.tgz",
+  #"pkg/#{PKG_FILE_NAME_WITH_GECODE}.zip",
   "pkg/#{PKG_FILE_NAME_WITH_GECODE}-mswin32.gem"
 ]
-
 desc 'Publish Gecode/R with Gecode packages on RubyForge'
 task :publish_gecoder_with_gecode_packages => 
-    [:verify_user].concat(gecode_release_files) do
+    [:verify_user] + gecode_release_files do
   require 'meta_project'
   require 'rake/contrib/xforge'
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: gecoder
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
-date: 2008-04-20 00:00:00 +02:00
+  version: 0.8.2
+date: 2008-05-08 00:00:00 +02:00
 summary: Ruby interface to Gecode, an environment for constraint programming.
 require_paths: 
 - lib
@@ -34,6 +34,7 @@ files:
 - COPYING
 - README
 - LGPL-LICENSE
+- lib/gecoder/interface/constraints/bool_enum/channel.rb
 - lib/gecoder/interface/constraints/bool_enum/extensional.rb
 - lib/gecoder/interface/constraints/bool_enum/relation.rb
 - lib/gecoder/interface/constraints/set_enum/operation.rb
@@ -43,8 +44,10 @@ files:
 - lib/gecoder/interface/constraints/int/domain.rb
 - lib/gecoder/interface/constraints/int/arithmetic.rb
 - lib/gecoder/interface/constraints/int/linear.rb
+- lib/gecoder/interface/constraints/int/channel.rb
 - lib/gecoder/interface/constraints/bool/boolean.rb
 - lib/gecoder/interface/constraints/bool/linear.rb
+- lib/gecoder/interface/constraints/bool/channel.rb
 - lib/gecoder/interface/constraints/set/relation.rb
 - lib/gecoder/interface/constraints/set/connection.rb
 - lib/gecoder/interface/constraints/set/operation.rb
@@ -158,6 +161,7 @@ files:
 - tasks/dependencies.txt
 - specs/constraints
 - specs/constraints/boolean.rb
+- specs/constraints/channel.rb
 - specs/constraints/int_domain.rb
 - specs/constraints/distinct.rb
 - specs/constraints/set_domain.rb
@@ -174,7 +178,6 @@ files:
 - specs/constraints/connection.rb
 - specs/constraints/cardinality.rb
 - specs/constraints/constraints.rb
-- specs/constraints/channel.rb
 - specs/constraints/linear.rb
 - specs/constraints/set_operation.rb
 - specs/constraints/extensional.rb
@@ -199,6 +202,7 @@ files:
 - ext/extconf.rb
 test_files: 
 - specs/constraints/boolean.rb
+- specs/constraints/channel.rb
 - specs/constraints/int_domain.rb
 - specs/constraints/distinct.rb
 - specs/constraints/set_domain.rb
@@ -215,7 +219,6 @@ test_files:
 - specs/constraints/connection.rb
 - specs/constraints/cardinality.rb
 - specs/constraints/constraints.rb
-- specs/constraints/channel.rb
 - specs/constraints/linear.rb
 - specs/constraints/set_operation.rb
 - specs/constraints/extensional.rb
@@ -246,6 +249,7 @@ extra_rdoc_files:
 - README
 - CHANGES
 - LGPL-LICENSE
+- lib/gecoder/interface/constraints/bool_enum/channel.rb
 - lib/gecoder/interface/constraints/bool_enum/extensional.rb
 - lib/gecoder/interface/constraints/bool_enum/relation.rb
 - lib/gecoder/interface/constraints/set_enum/operation.rb
@@ -255,8 +259,10 @@ extra_rdoc_files:
 - lib/gecoder/interface/constraints/int/domain.rb
 - lib/gecoder/interface/constraints/int/arithmetic.rb
 - lib/gecoder/interface/constraints/int/linear.rb
+- lib/gecoder/interface/constraints/int/channel.rb
 - lib/gecoder/interface/constraints/bool/boolean.rb
 - lib/gecoder/interface/constraints/bool/linear.rb
+- lib/gecoder/interface/constraints/bool/channel.rb
 - lib/gecoder/interface/constraints/set/relation.rb
 - lib/gecoder/interface/constraints/set/connection.rb
 - lib/gecoder/interface/constraints/set/operation.rb