gecoder 0.4.0 → 0.5.0

data/specs/int_var.rb

@@ -89,7 +89,7 @@ describe Gecode::FreeIntVar, ' (with non-range domain of size > 1)' do
   end
 end
 
-describe Gecode::FreeIntVar, '(with a domain of size 1)' do
+describe Gecode::FreeIntVar, ' (with a domain of size 1)' do
   before do
     @domain = [1]
     model = Gecode::Model.new
@@ -105,4 +105,36 @@ describe Gecode::FreeIntVar, '(with a domain of size 1)' do
   it 'should be a range domain' do
     @var.should be_range
   end
+end
+
+describe Gecode::FreeIntVar, ' (assigned)' do
+  before do
+    @domain = [1]
+    model = Gecode::Model.new
+    @var = model.int_var(*@domain)
+  end
+
+  it 'should be assigned' do
+    @var.should be_assigned
+  end
+  
+  it 'should give the assigned number when inspecting' do
+    @var.inspect.should include(" #{@domain[0]}>")
+  end
+end
+
+describe Gecode::FreeIntVar, ' (not assigned)' do
+  before do
+    @domain = 1..2
+    model = Gecode::Model.new
+    @var = model.int_var(*@domain)
+  end
+
+  it 'should not be assigned' do
+    @var.should_not be_assigned
+  end
+  
+  it 'should give the domain range when inspecting' do
+    @var.inspect.should include(" #{@domain.first}..#{@domain.last}>")
+  end
 end

data/specs/model.rb

@@ -81,4 +81,84 @@ describe Gecode::Model, ' (bool creation)' do
     matrix.row_size.should equal(3)
     matrix.column_size.should equal(4)
   end
+end
+
+describe Gecode::Model, ' (set creation)' do
+  before do
+    @model = Gecode::Model.new
+    @glb_range = 0..3
+    @lub_range = 0..5
+    @glb_enum = [0, 3]
+    @lub_enum = [0, 1, 2, 3, 5]
+    @lower_card = 1
+    @upper_card = 3
+  end
+
+  it 'should allow the creation of set variables with glb range and lub range' do
+    @model.set_var(@glb_range, @lub_range).should have_bounds(@glb_range, 
+      @lub_range) 
+  end
+  
+  it 'should allow the creation of set variables with glb enum and lub range' do
+    @model.set_var(@glb_enum, @lub_range).should have_bounds(@glb_enum, 
+      @lub_range) 
+  end
+  
+  it 'should allow the creation of set variables with glb range and lub enum' do
+    @model.set_var(@glb_range, @lub_enum).should have_bounds(@glb_range, 
+      @lub_enum) 
+  end
+  
+  it 'should allow the creation of set variables with glb enum and lub enum' do
+    @model.set_var(@glb_enum, @lub_enum).should have_bounds(@glb_enum, 
+      @lub_enum) 
+  end
+  
+  it 'should allow the creation of set variables with specified lower cardinality bound' do
+    @model.set_var(@glb_range, @lub_range, 
+      @lower_card).card_min.should >= @lower_card
+  end
+  
+  it 'should allow the creation of set variables with specified cardinality range' do
+    var = @model.set_var(@glb_range, @lub_range, @lower_card..@upper_card)
+    var.card_max.should <= @upper_card
+    var.card_min.should >= @lower_card
+  end
+  
+  it 'should allow the creation of arrays of set variables' do
+    arr = @model.set_var_array(3, @glb_enum, @lub_enum, @lower_card..@upper_card)
+    arr.size.should == 3
+    arr.each do |var|
+      var.should have_bounds(@glb_enum, @lub_enum)
+      var.card_max.should <= @upper_card
+      var.card_min.should >= @lower_card
+    end
+  end
+  
+  it 'should allow the creation of matrices of set variables' do
+    matrix = @model.set_var_matrix(4, 5, @glb_enum, @lub_enum, 
+      @lower_card..@upper_card)
+    matrix.row_size.should == 4
+    matrix.column_size.should == 5
+    matrix.each do |var|
+      var.should have_bounds(@glb_enum, @lub_enum)
+      var.card_max.should <= @upper_card
+      var.card_min.should >= @lower_card
+    end
+  end
+  
+  it 'should raise error if glb and lub are not valid when they are given as range' do
+    lambda{ @model.set_var(@lub_range, @glb_range).should }.should raise_error(
+      ArgumentError)  
+  end
+  
+  it 'should raise error if glb and lub are not valid when one is given as enum' do
+    lambda{ @model.set_var(@lub_range, @glb_enum).should }.should raise_error(
+      ArgumentError)
+  end
+  
+  it 'should raise error if glb and lub are not valid when both are given as enums' do
+    lambda{ @model.set_var(@lub_enum, @glb_enum).should }.should raise_error(
+      ArgumentError)  
+  end
 end

data/specs/set_var.rb

@@ -0,0 +1,39 @@
+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)
+  end
+  
+  it 'should not be assigned' do
+    @var.should_not be_assigned
+  end
+  
+  it 'should give glb and lub ranges when inspecting' do
+    @var.inspect.should include('lub-range')
+    @var.inspect.should include('glb-range')
+  end
+end
+
+describe Gecode::FreeSetVar, '(assigned)' do
+  before do
+    model = Gecode::Model.new
+    @var = model.set_var([1], [1])
+    model.solve!
+  end
+  
+  it 'should be 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_not include('lub-range')
+  end
+end

data/specs/spec_helper.rb

@@ -29,6 +29,41 @@ module CustomVarMatchers
     HaveDomain.new(expected)
   end
   
+  class HaveBounds
+    def initialize(expected_glb, expected_lub)
+      @expected_glb = expected_glb.to_a
+      @expected_lub = expected_lub.to_a
+    end
+    
+    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
+    end
+    
+    def failure_message
+      "expected #{@target.inspect} to have greatest lower bound " + 
+        "#{@expected_glb.inspect} and least upper bound #{@expected_lub.inspect}"
+    end
+    
+    def negative_failure_message
+      "expected #{@target.inspect} to not have greatest lower bound " + 
+        "#{@expected_glb.inspect} and least upper bound #{@expected_lub.inspect}"
+    end
+  end
+
+  # Tests whether a set variable has the expected bounds.
+  def have_bounds(expected_glb, expected_lub)
+    HaveBounds.new(expected_glb, expected_lub)
+  end
+  
   class IsAlias
     def initialize(expected)
       @expected = expected.to_a

data/specs/tmp

@@ -2,134 +2,21 @@ 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
+=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
-
-  # Tests whether an integer variables array contains variables with the 
-  # expected domains (in any order given).
-  def contain_domains(expected)
-    ContainVarsWithDomains.new(expected)
+  
+  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
-
-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
+=end

data/tasks/distribution.rake

@@ -19,7 +19,7 @@ spec = Gem::Specification.new do |s|
   s.files = FileList[
     '[A-Z]*',
     'lib/**/*.rb', 
-    'examples/**/*',
+    'example/**/*',
     'src/**/*',
     'vendor/**/*',
     'tasks/**/*',

data/vendor/rust/rust/class.rb

@@ -117,13 +117,13 @@ module Rust
     end
     
     def add_attribute(name, type, bindname = name)
-    	attribute = Attribute.new(name, type, { :parent => self })
-    	
-    	yield attribute if block_given?
-    	
-    	@children << attribute
-    	
-    	attribute
+      attribute = Attribute.new(name, type, { :parent => self })
+      
+      yield attribute if block_given?
+      
+      @children << attribute
+      
+      attribute
     end
     
     def add_operator(name, return_value, bindname = name)
@@ -294,11 +294,11 @@ module Rust
             @position = 3
             "notequalop"
           when "<<"
-          	@position = 3
-          	"outstream"
+            @position = 3
+            "outstream"
           when ">>"
             @position = 3
-          	"intstream"
+            "intstream"
           when "!"
             @position = 1
             "notop"

data/vendor/rust/rust/constants.rb

@@ -30,7 +30,7 @@ module Rust
     def initialize(name, value, parent)
       super()
 
-      @name = name.upcase
+      @name = name
       @value = value
       @parent = parent
 

data/vendor/rust/rust/function.rb

@@ -388,13 +388,13 @@ module Rust
               call += "      if( is_#{valid_name}(argv[#{argindex}]) ) {\n" 
             end
           }
-	      
+        
           call += "           #{func.bind_call(argc)}"
           call += "           ok = true;\n"
-	  call += "}"*argc # closes if's
-	  call += "\n"
-	  
-	  current_function_index += 1
+    call += "}"*argc # closes if's
+    call += "\n"
+    
+    current_function_index += 1
         }
         call += "     } break;\n"
         

data/vendor/rust/rust/type.rb

@@ -53,7 +53,7 @@ module Rust
     end
     
     def native?
-      [ /int\s*\*{0,1}/, /float\s*\*{0,1}/, /double\s*\*{0,1}/, /char\s*\*{0,1}/, /bool/ ].each { |type|
+      [ /(u){0,1}int(\d\d_t){0,1}\s*\*{0,1}/, /float\s*\*{0,1}/, /double\s*\*{0,1}/, /char\s*\*{0,1}/, /bool/, /(std::){0,1}string/ ].each { |type|
         if @name =~ type
           return true
         end

data/vendor/rust/test/constants.rb

@@ -33,3 +33,4 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "constants_rb" do |b|
     ns.add_constant 'ModuleConstant', '"foobar"'
   end
 end
+

data/vendor/rust/test/cppclass.cc

@@ -27,6 +27,9 @@ TestClass::TestClass() {
   str = "undefined";
 }
 
+TestClass::~TestClass() {
+}
+
 void TestClass::action1(uint32_t unused_parameter) {
   val = unused_parameter;
 }
@@ -38,3 +41,5 @@ void TestClass::action2(char *string) {
 void TestClass::action3(const TestClass &tc) {
   str = "action3 called";
 }
+
+

data/vendor/rust/test/cppclass.hh

@@ -27,6 +27,7 @@
 class TestClass {
 public:
   TestClass();
+  ~TestClass();
 
   void action1(uint32_t unused_parameter);
   void action2(char *string);
@@ -61,3 +62,6 @@ protected:
 
   uint32_t m_variable;
 };
+
+
+

data/vendor/rust/test/lib/extension-test.rb

@@ -25,7 +25,7 @@ require 'rbconfig'
 require 'pathname'
 require 'tmpdir'
 
-$: << (Pathname.new(__FILE__).dirname + "../..").realpath
+$: << (Pathname.new(File.dirname(__FILE__) ) + "../..").realpath
 
 module Rust
 

data/vendor/rust/test/operators.cc

@@ -0,0 +1,41 @@
+/* Copyright (c) 2005-2007 Diego Pettenò <flameeyes@gmail.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE
+ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "operators.hh"
+
+Operators::Operators() {
+  m_array = new uint32_t(4*sizeof(uint32_t));
+  
+  for(int i = 0; i < 4; i++)
+    m_array[i] = i;
+}
+
+Operators::~Operators() {
+  delete m_array;
+}
+
+uint32_t &Operators::operator [](uint32_t index) {
+  return m_array[index];
+}
+
+

data/vendor/rust/test/operators.hh

@@ -0,0 +1,39 @@
+/* Copyright (c) 2005-2007 Diego Pettenò <flameeyes@gmail.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE
+ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <string>
+#include <stdint.h>
+
+class Operators {
+public:
+  Operators();
+  ~Operators();
+
+  uint32_t &operator [](uint32_t index);
+
+protected:
+  uint32_t *m_array;
+};
+
+
+

data/vendor/rust/test/operators.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2007 Diego Pettenò <flameeyes@gmail.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE
+# FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'rust'
+
+Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "operators_rb" do |b|
+  b.include_header 'operators.hh', Rust::Bindings::HeaderLocal
+
+  b.add_namespace "RustTestOperators", "" do |ns|
+    ns.add_cxx_class "Operators" do |klass|
+      klass.add_constructor do |method|
+      end
+
+      klass.add_operator "[]", "uint32_t", "at" do |method|
+        method.add_parameter "uint32_t", "index"
+      end
+    end
+  end
+end
+

data/vendor/rust/test/test-cwrapper.rb

@@ -20,6 +20,9 @@
 # CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
+exit 0 # Disabled
+
 require 'lib/extension-test'
 
 module Rust::Test

data/vendor/rust/test/test-operators.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2007 Diego Pettenò <flameeyes@gmail.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE
+# FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'lib/extension-test'
+
+module Rust::Test
+
+  class CppClassTest < Test::Unit::TestCase
+    include ExtensionTest
+
+    def setup
+      extension_setup("operators", "cc")
+
+      @instance = RustTestOperators::Operators.new
+    end
+
+    def test_at
+      v = @instance.at(3)
+      assert(v == 3, "must be 3")
+    end
+  end
+
+end