gecoder 0.5.0 → 0.6.0

data/specs/set_var.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe Gecode::FreeSetVar, '(not assigned)' do
   before do
     model = Gecode::Model.new
-    @var = model.set_var(0..3, 0..4)
+    @var = model.set_var(1..3, 0..4)
   end
   
   it 'should not be assigned' do
@@ -14,6 +14,34 @@ describe Gecode::FreeSetVar, '(not assigned)' do
     @var.inspect.should include('lub-range')
     @var.inspect.should include('glb-range')
   end
+  
+  it 'should report the correct bounds' do
+    @var.lower_bound.sort.to_a.should == (1..3).to_a
+    @var.upper_bound.sort.to_a.should == (0..4).to_a
+  end
+  
+  it 'should report correct bounds on upper bound' do
+    @var.upper_bound.min.should == 0
+    @var.upper_bound.max.should == 4
+  end
+  
+  it 'should report correct bounds on lower bound' do
+    @var.lower_bound.min.should == 1
+    @var.lower_bound.max.should == 3
+  end
+  
+  it 'should raise error when trying to access assigned value' do
+    lambda{ @var.value }.should raise_error(RuntimeError)
+  end
+  
+  it 'should not raise error when enumerating over bound multiple times' do
+    # For C0 coverage.
+    lower_bound = @var.lower_bound
+    lambda do
+      lower_bound.each{}
+      lower_bound.each{}
+    end.should_not raise_error
+  end
 end
 
 describe Gecode::FreeSetVar, '(assigned)' do
@@ -27,13 +55,14 @@ describe Gecode::FreeSetVar, '(assigned)' do
     @var.should be_assigned
   end
   
-  it 'should include the assigned elements' do
-    @var.should include(1)
-    @var.should_not include(0)
-  end
-  
   it "should give it's value when inspecting" do
-    @var.inspect.should include('1..1')
+    @var.inspect.should include('[1]')
     @var.inspect.should_not include('lub-range')
   end
+  
+  it 'should report the correct bounds' do
+    @var.upper_bound.to_a.should == [1]
+    @var.lower_bound.to_a.should == [1]
+    @var.value.to_a.should == [1]
+  end
 end

data/specs/spec_helper.rb

@@ -10,7 +10,7 @@ module CustomVarMatchers
       @target = target
       return false unless @target.size == @expected.size
       @expected.each do |element|
-        return false unless @target.in(element)
+        return false unless @target.include? element
       end
       return true
     end
@@ -37,15 +37,8 @@ module CustomVarMatchers
     
     def matches?(target)
       @target = target
-      return false unless @target.glb_size == @expected_glb.size and
-        @target.lub_size == @expected_lub.size
-      @expected_glb.each do |element|
-        return false unless @target.include_glb?(element)
-      end
-      @expected_lub.each do |element|
-        return false unless @target.include_lub?(element)
-      end
-      return true
+      return @target.lower_bound.to_a == @expected_glb &&
+        @target.upper_bound.to_a == @expected_lub
     end
     
     def failure_message

data/vendor/rust/rust/templates/FunctionDefinition.rusttpl

@@ -4,6 +4,6 @@
 !function_prototype! {
   !function_call!
   
-  rb_raise(rb_eArgError, "Mantatory parameters missing"); // FIXME
+  rb_raise(rb_eArgError, "Mandatory parameters missing"); // FIXME
   return Qnil; 
 }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: gecoder
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2007-07-11 00:00:00 +02:00
+  version: 0.6.0
+date: 2007-07-18 00:00:00 +02:00
 summary: Ruby interface to Gecode, an environment for constraint programming.
 require_paths: 
 - lib
@@ -52,6 +52,7 @@ files:
 - lib/gecoder/interface/constraints/int_enum_constraints.rb
 - lib/gecoder/interface/constraints/bool_enum_constraints.rb
 - lib/gecoder/interface/constraints/set_var_constraints.rb
+- lib/gecoder/interface/constraints/set_enum_constraints.rb
 - lib/gecoder/interface/constraints/bool/boolean.rb
 - lib/gecoder/interface/constraints/int/linear.rb
 - lib/gecoder/interface/constraints/int/domain.rb
@@ -66,7 +67,10 @@ files:
 - lib/gecoder/interface/constraints/bool_enum/boolean.rb
 - lib/gecoder/interface/constraints/set/domain.rb
 - lib/gecoder/interface/constraints/set/relation.rb
+- lib/gecoder/interface/constraints/set/connection.rb
 - lib/gecoder/interface/constraints/set/cardinality.rb
+- lib/gecoder/interface/constraints/set_enum/distinct.rb
+- lib/gecoder/interface/constraints/set_enum/channel.rb
 - lib/gecoder/bindings/bindings.rb
 - example/example_helper.rb
 - example/raw_bindings.rb
@@ -145,7 +149,6 @@ files:
 - tasks/svn.rake
 - specs/search.rb
 - specs/model.rb
-- specs/tmp
 - specs/branch.rb
 - specs/binding_changes.rb
 - specs/spec_helper.rb
@@ -155,6 +158,7 @@ files:
 - specs/bool_var.rb
 - specs/enum_matrix.rb
 - specs/set_var.rb
+- specs/logging.rb
 - specs/constraints/linear.rb
 - specs/constraints/set_relation.rb
 - specs/constraints/distinct.rb
@@ -172,6 +176,7 @@ files:
 - specs/constraints/int_domain.rb
 - specs/constraints/set_domain.rb
 - specs/constraints/int_relation.rb
+- specs/constraints/connection.rb
 - specs/constraints/cardinality.rb
 - ext/missing.h
 - ext/extconf.rb
@@ -207,6 +212,7 @@ extra_rdoc_files:
 - lib/gecoder/interface/constraints/int_enum_constraints.rb
 - lib/gecoder/interface/constraints/bool_enum_constraints.rb
 - lib/gecoder/interface/constraints/set_var_constraints.rb
+- lib/gecoder/interface/constraints/set_enum_constraints.rb
 - lib/gecoder/interface/constraints/bool/boolean.rb
 - lib/gecoder/interface/constraints/int/linear.rb
 - lib/gecoder/interface/constraints/int/domain.rb
@@ -221,7 +227,10 @@ extra_rdoc_files:
 - lib/gecoder/interface/constraints/bool_enum/boolean.rb
 - lib/gecoder/interface/constraints/set/domain.rb
 - lib/gecoder/interface/constraints/set/relation.rb
+- lib/gecoder/interface/constraints/set/connection.rb
 - lib/gecoder/interface/constraints/set/cardinality.rb
+- lib/gecoder/interface/constraints/set_enum/distinct.rb
+- lib/gecoder/interface/constraints/set_enum/channel.rb
 - lib/gecoder/bindings/bindings.rb
 executables: []
 

data/specs/tmp

@@ -1,22 +0,0 @@
-Idea: Write constraints in separate modules and then include the modules in
-the respective place.
-
-    
-
-
-
-
-    
-=begin
-  it 'should handle disjunction being constraint to be true' do
-    @bools.disjunction.must_be.true
-    @model.solve!
-    @bools.any?{ |b| b.true? }.should be_true
-  end
-  
-  it 'should handle disjunction being constraint to be false' do
-    @bools.disjunction.must_be.false
-    @model.solve!
-    @bools.all?{ |b| b.false? }.should be_true
-  end
-=end