gecoder-with-gecode 0.8.2-mswin32 → 0.8.3-mswin32

data/CHANGES

@@ -1,3 +1,17 @@
+== Version 0.8.3 
+This release adds regular expression constraints, the last channel
+constraint and various minor convenience improvements. It also fixes a
+rather serious bug that occurs when using the latest patchlevels of Ruby
+1.8.6. 
+
+* [#20888] Fixed a GC bug causing problems with Ruby 1.8.6 at patchlevels around 230.
+* Boolean constraints can no longer be specified using the form "bool.must == true". Only the "bool.must_be.true" form can now be used.
+* Added constants in Model that contain the limits of the variables' domains.
+* The domain when construction arrays and matrices of int variables now default to the same as when creating single variables (the largest possible domain).
+* Model#branch_on now accepts single variables as well as enums.
+* Added channel constraints between single set variables and enumerations of boolean variables.
+* Added integer and boolean regular expression constraints. Thanks goes to Eivind Eklund for providing the idea for the syntax used to specify the regular expressions.
+
 == Version 0.8.2
 This release adds search statistics along with some new arithmetic constraints 
 and channel constraints between boolean and integer variables.

data/lib/gecoder/bindings/bindings.rb

@@ -77,7 +77,7 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
   b.include_header 'gecode/set.hh', Rust::Bindings::HeaderGlobal
   b.include_header 'gecode/search.hh', Rust::Bindings::HeaderGlobal
   b.include_header 'gecode/minimodel.hh', Rust::Bindings::HeaderGlobal
-  b.include_header 'missing.h', Rust::Bindings::HeaderLocal
+  b.include_header 'gecoder.h', Rust::Bindings::HeaderLocal
   
   b.add_custom_definition ruby2intargs
   b.add_custom_definition custom_mark_definitions
@@ -351,52 +351,47 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
       klass.add_method "tuples", "int"
     end
     
-    ns.add_cxx_class "MBranchingDesc" do |klass|
-      klass.bindname = "BranchingDesc"
-      klass.add_constructor
-      klass.add_method "alternatives", "int"
-      klass.add_method "size", "int"
-    end
-    
     ns.add_cxx_class "MSpace" do |klass|
       klass.bindname = "Space"
       klass.function_mark = 'Gecode_MSpace_custom_mark'
       
       klass.add_constructor
-      
-      klass.add_method "debug"
-      
+
       klass.add_method "constrain" do |method|
         method.add_parameter "Gecode::MSpace*", "s"
       end
       
-      klass.add_method "own" do |method|
-        method.add_parameter "Gecode::MIntVarArray *", "x"
-        method.add_parameter "char*", "name"
+      klass.add_method "new_int_var", "int" do |method|
+        method.add_parameter "int", "min"
+        method.add_parameter "int", "max"
       end
       
-      klass.add_method "own" do |method|
-        method.add_parameter "Gecode::MBoolVarArray *", "x"
-        method.add_parameter "char*", "name"
+      klass.add_method "new_int_var", "int" do |method|
+        method.add_parameter "Gecode::IntSet", "domain"
       end
-      
-      klass.add_method "own" do |method|
-        method.add_parameter "Gecode::MSetVarArray *", "x"
-        method.add_parameter "char*", "name"
+
+      klass.add_method "new_bool_var", "int" do |method|
       end
-      
-      klass.add_method "intVarArray", "Gecode::MIntVarArray *" do |method|
-        method.add_parameter "char *", "name"
+
+      klass.add_method "new_set_var", "int" do |method|
+        method.add_parameter "Gecode::IntSet", "glb"
+        method.add_parameter "Gecode::IntSet", "lub"
+        method.add_parameter "int", "cardMin"
+        method.add_parameter "int", "cardMax"
       end
-      
-      klass.add_method "boolVarArray", "Gecode::MBoolVarArray *" do |method|
-        method.add_parameter "char *", "name"
+
+      klass.add_method "int_var", "Gecode::IntVar*" do |method|
+        method.add_parameter "int", "id"
       end
-      
-      klass.add_method "setVarArray", "Gecode::MSetVarArray *" do |method|
-        method.add_parameter "char *", "name"
+
+      klass.add_method "bool_var", "Gecode::BoolVar*" do |method|
+        method.add_parameter "int", "id"
       end
       
+      klass.add_method "set_var", "Gecode::SetVar*" do |method|
+        method.add_parameter "int", "id"
+      end
+
       klass.add_method "clone", "Gecode::MSpace *" do |method|
         method.add_parameter "bool", "shared"
       end
@@ -411,13 +406,6 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
       # description method used by rspec, and isn't used directly in the 
       # interface.
       #klass.add_method "mdescription", "Gecode::MBranchingDesc *", "description"
-      
-      klass.add_method "commit" do |method|
-        method.add_parameter "Gecode::MBranchingDesc", "desc" do |param|
-          param.custom_conversion = "ruby2Gecode_MBranchingDescPtr(desc, 1)->ptr()"
-        end
-        method.add_parameter "int", "a"
-      end
     end
     
     # The namespace structure doesn't completely mimic Gecode's namespace 
@@ -659,6 +647,57 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
       klass.add_method "next", "Gecode::MSpace *"
       klass.add_method "statistics", "Gecode::Search::Statistics"
     end
+
+    ns.add_cxx_class "DFA" do |klass|
+      klass.add_constructor
+    end
+
+    ns.add_cxx_class "REG" do |klass|
+      klass.add_constructor
+
+      klass.add_constructor do |method|
+        method.add_parameter "int", "s"
+      end
+
+      klass.add_constructor do |method|
+        method.add_parameter "Gecode::IntArgs&", "x"
+      end
+
+      klass.add_constructor do |method|
+        method.add_parameter "Gecode::REG&", "r"
+      end
+
+      klass.add_operator "+", "Gecode::REG" do |operator|
+        operator.add_parameter "Gecode::REG&", "r"
+      end
+
+      klass.add_operator "+=", "Gecode::REG&" do |operator|
+        operator.add_parameter "Gecode::REG&", "r"
+      end
+
+      klass.add_operator "|", "Gecode::REG" do |operator|
+        operator.add_parameter "Gecode::REG&", "r"
+      end
+      
+      klass.add_operator "|=", "Gecode::REG&" do |operator|
+        operator.add_parameter "Gecode::REG&", "r"
+      end
+      
+      klass.add_operator "*", "Gecode::REG" do |operator|
+      end
+      
+      klass.add_operator "+", "Gecode::REG" do |operator|
+      end
+
+      klass.add_operator "()", "Gecode::REG" do |operator|
+        operator.add_parameter "int", "n"
+        operator.add_parameter "int", "m"
+      end
+
+      klass.add_operator "()", "Gecode::REG" do |operator|
+        operator.add_parameter "int", "n"
+      end
+    end
     
     # SEARCH NAMESPACE
     
@@ -789,7 +828,7 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
           method.add_parameter "Gecode::MiniModel::LinRel<Gecode::BoolVar>", "e"
         end        
         
-        klass.add_method "post" do |method|
+        klass.add_method "post", "Gecode::BoolVar" do |method|
           method.add_parameter "Gecode::MSpace *", "home"
           method.add_parameter "Gecode::IntConLevel", "icl"
           method.add_parameter "Gecode::PropKind", "pk"
@@ -1276,14 +1315,25 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
       func.add_parameter "Gecode::PropKind", "pk"
     end
   
-# 		ns.add_function "regular", "void" do |func|
-# 			func.add_parameter "Gecode::MSpace*", "home"
-# 			func.add_parameter "Gecode::MIntVarArray *", "x" do |param|
-# 				param.custom_conversion = "*ruby2Gecode_MIntVarArrayPtr(argv[1], 2)->ptr()"
-# 			end
-# 			func.add_parameter "Gecode::DFA", "dfa" # TODO: add class DFA
-# 			func.add_parameter "Gecode::IntConLevel", "icl", true
-# 		end
+    ns.add_function "extensional", "void" do |func|
+      func.add_parameter "Gecode::MSpace*", "home"
+      func.add_parameter "Gecode::MIntVarArray *", "x" do |param|
+        param.custom_conversion = "*ruby2Gecode_MIntVarArrayPtr(argv[1], 2)->ptr()"
+      end
+      func.add_parameter "Gecode::REG", "dfa" 
+      func.add_parameter "Gecode::IntConLevel", "icl"
+      func.add_parameter "Gecode::PropKind", "pk"
+    end
+
+    ns.add_function "extensional", "void" do |func|
+      func.add_parameter "Gecode::MSpace*", "home"
+      func.add_parameter "Gecode::MBoolVarArray *", "x" do |param|
+        param.custom_conversion = "*ruby2Gecode_MBoolVarArrayPtr(argv[1], 2)->ptr()"
+      end
+      func.add_parameter "Gecode::REG", "dfa" 
+      func.add_parameter "Gecode::IntConLevel", "icl"
+      func.add_parameter "Gecode::PropKind", "pk"
+    end
     
     ns.add_function "bab", "Gecode::MSpace*" do |func|
       func.add_parameter "Gecode::MSpace*", "home"
@@ -1765,6 +1815,14 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
         param.custom_conversion = "*ruby2Gecode_MSetVarArrayPtr(argv[2], 3)->ptr()"
       end
     end
+
+    ns.add_function "channel" do |func|
+      func.add_parameter "Gecode::MSpace*", "home"
+      func.add_parameter "Gecode::MBoolVarArray", "x" do |param|
+        param.custom_conversion = "*ruby2Gecode_MBoolVarArrayPtr(argv[1], 2)->ptr()"
+      end
+      func.add_parameter "Gecode::SetVar", "y"
+    end
     
     ns.add_function "weights" do |func|
       func.add_parameter "Gecode::MSpace*", "home"

data/lib/gecoder/interface/binding_changes.rb

@@ -1,309 +1,9 @@
-# This file adds a small layer on top of the bindings. It alters the allocation 
-# of variables so that a single array is allocated in each space which is then 
-# used to store variable. The variables themselves are not directly returned, 
-# rather they are represented as the index in that store, which allows the 
-# variable to be retrieved back given a space.
-#
-# This layer should be moved to the C++ side instead when possible for better
-# performance.
+# This file adds a small layer on top of the bindings.
 module GecodeRaw #:nodoc: all
   class Space
-    # Creates the specified number of integer variables in the space with the
-    # specified domain. Returns the indices with which they can then be 
-    # accessed using int_var. The domain can be given as a Range (trated 
-    # specially) or as another enum.
-    def new_int_vars(domain, count = 1)
-      int_var_store.new_vars(domain, count)
-    end
-    
-    # Gets the int variable with the specified index, nil if none exists.
-    def int_var(index)
-      int_var_store[index]
-    end
-    
-    # Creates the specified number of boolean variables in the space. Returns
-    # the indices with which they can then be accessed using bool_var.
-    def new_bool_vars(count = 1)
-      bool_var_store.new_vars(count)
-    end
-    
-    # Gets the bool variable with the specified index, nil if none exists.
-    def bool_var(index)
-      bool_var_store[index]
-    end
-    
-    # Creates the specified number of set variables in the space with the 
-    # specified domain for greatest lower bound and least upper bound 
-    # (specified as either a range or enum). A range for the allowed 
-    # cardinality of the set can also be specified, if none is specified, or 
-    # nil is given, then the default range (anything) will be used. Returns 
-    # the indices with which they can then be accessed using set_var.
-    def new_set_vars(*vars)
-      set_var_store.new_vars(*vars)
-    end
-    
-    # Gets the set variable with the specified index, nil if none exists.
-    def set_var(index)
-      set_var_store[index]
-    end
-    
     # Used by Gecode during BAB-search.
     def constrain(best_so_far_space)
       Gecode::Model.constrain(self, best_so_far_space)
     end
-    
-    # Refreshes the underlying stores used by the space.
-    def refresh
-      @int_var_store = nil
-      @bool_var_store = nil
-      @set_var_store = nil
-    end
-    
-    private
-    
-    # Retrieves the store used for integer variables. Creates one if none
-    # exists.
-    def int_var_store
-      # TODO: caching interferes with the variable creation during BAB-search,
-      # find out why.
-      #if @int_var_store.nil?
-        @int_var_store = Gecode::Util::IntVarStore.new(self) 
-      #end
-      return @int_var_store
-    end
-    
-    # Retrieves the store used for boolean variables. Creates one if none
-    # exists.
-    def bool_var_store
-      #if @bool_var_store.nil?
-        @bool_var_store = Gecode::Util::BoolVarStore.new(self) 
-      #end
-      return @bool_var_store
-    end
-    
-    # Retrieves the store used for set variables. Creates one if none exists.
-    def set_var_store
-      #if @set_var_store.nil?
-        @set_var_store = Gecode::Util::SetVarStore.new(self) 
-      #end
-      return @set_var_store
-    end
-  end
-end
-
-module Gecode
-  # Various utility (mainly used to change the behavior of the raw bindings).
-  module Util #:nodoc: all
-    # Provides common methods to the variable stores. The stores must provide
-    # @next_index, @var_array, @size, ARRAY_IDENTIFIER and #new_storage_array .
-    module VarStoreMethods
-      # Returns the int var with the specified index, nil if none exists.
-      def [](index)
-        if index < 0 or index >= @next_index
-          return nil
-        end
-        return @var_array.at(index)
-      end
-      
-      private
-      
-      # Grows the store to the new size.
-      def grow(new_size)
-        @var_array.enlargeArray(@space, new_size - @size)
-        @size = new_size
-      end
-    end
-  
-    # A store in which int variables are created and stored.
-    class IntVarStore
-      # Design note: The store used to double its size when it needed to grow
-      # leaving unallocated slots (in rev 16). This was changed to only growing
-      # the amount of space needed because the additional information about which
-      # slot is the next unallocated one could not be encoded without changes to
-      # the bindings (and without that information we can not deduce the store
-      # from the new copy of space). So for additional performance the bindings 
-      # should grow the array more than needed (when this is moved to the bindings).
-      
-      include VarStoreMethods
-      
-      private
-    
-      # A string that identifies the array used by the store.
-      ARRAY_IDENTIFIER = 'int_array'
-    
-      public
-      
-      # Creates a store for the specified space with the specified capacit.
-      def initialize(space)
-        @space = space
-        
-        @var_array = space.int_var_array(ARRAY_IDENTIFIER)
-        if @var_array.nil?
-          # Create a new one.
-          @var_array = new_storage_array(0)
-        end
-  
-        @size = @var_array.size
-        @next_index = @size
-      end
-      
-      # Creates the specified number of integer variables in the space with the
-      # specified domain. Returns the indices with which they can then be 
-      # accessed using int_var. The domain can be given as a Range (trated 
-      # specially) or as another enum.
-      def new_vars(domain, count = 1)
-        grow(@next_index + count) # See the design note for more information.
-        count.times do |i|
-          if domain.kind_of? Range
-            domain_params = [domain.first, domain.last] 
-          elsif domain.kind_of? Enumerable
-            arr = domain.to_a
-            domain_params = [Gecode::Raw::IntSet.new(arr, arr.size)]
-          else
-            raise TypeError, "Expected Enumerable, got #{domain.class}."
-          end
-
-          @var_array[@next_index] = Gecode::Raw::IntVar.new(@space, 
-            *domain_params)
-          @next_index += 1
-        end
-        
-        ((@next_index - count)...@next_index).to_a
-      end
-  
-      # Returns the int var with the specified index, nil if none exists.
-      def [](index)
-        if index < 0 or index >= @next_index
-          return nil
-        end
-        return @var_array.at(index)
-      end
-  
-      private
-      
-      # Creates a new storage array for int variables.
-      def new_storage_array(new_size)
-        arr = Gecode::Raw::IntVarArray.new(@space, new_size)
-        @space.own(arr, ARRAY_IDENTIFIER)
-        return arr
-      end
-    end
-    
-    # A store in which int variables are created and stored.
-    class BoolVarStore
-      # TODO: can we refactor this better seeing as IntVarStore and BoolVarStore
-      # are similar?
-      
-      include VarStoreMethods
-      
-      private
-    
-      # A string that identifies the array used by the store.
-      ARRAY_IDENTIFIER = 'bool_array'
-    
-      public
-      
-      # Creates a store for the specified space with the specified capacit.
-      def initialize(space)
-        @space = space
-      
-        @var_array = space.bool_var_array(ARRAY_IDENTIFIER)
-        if @var_array.nil?
-          # Create a new one.
-          @var_array = new_storage_array(0)
-        end
-  
-        @size = @var_array.size
-        @next_index = @size
-      end
-      
-      # Creates the specified number of new bool variables. Returns the indices 
-      # of the created variables as an array.
-      def new_vars(count = 1)
-        grow(@next_index + count) # See the design note for more information.
-        count.times do |i|
-          @var_array[@next_index] = Gecode::Raw::BoolVar.new(@space, 0, 1)
-          @next_index += 1
-        end
-        
-        ((@next_index - count)...@next_index).to_a
-      end
-  
-      private
-      
-      # Creates a new storage array for bool variables.
-      def new_storage_array(new_size)
-        arr = Gecode::Raw::BoolVarArray.new(@space, new_size)
-        @space.own(arr, ARRAY_IDENTIFIER)
-        return arr
-      end
-    end
-    
-    # A store in which int variables are created and stored.
-    class SetVarStore
-      include VarStoreMethods
-      
-      private
-    
-      # A string that identifies the array used by the store.
-      ARRAY_IDENTIFIER = 'set_array'
-    
-      public
-      
-      # Creates a store for the specified space with the specified capacit.
-      def initialize(space)
-        @space = space
-      
-        @var_array = space.set_var_array(ARRAY_IDENTIFIER)
-        if @var_array.nil?
-          # Create a new one.
-          @var_array = new_storage_array(0)
-        end
-  
-        @size = @var_array.size
-        @next_index = @size
-      end
-      
-      # Creates the specified number of set variables in the space with the 
-      # specified domain for greatest lower bound and least upper bound 
-      # (specified as either a range or enum). A range for the allowed 
-      # cardinality of the set can also be specified, if none is specified, or 
-      # nil is given, then the default range (anything) will be used. Returns 
-      # the indices with which they can then be accessed using set_var.
-      def new_vars(glb_domain, lub_domain, cardinality_range = nil, count = 1)
-        grow(@next_index + count) # See the design note for more information.
-
-        if cardinality_range.nil?
-          cardinality_range = 0..Gecode::Raw::SetLimits::CARD
-        end
-        
-        params = [@space]
-        params << domain_to_args(glb_domain)
-        params << domain_to_args(lub_domain)
-        params << cardinality_range.first << cardinality_range.last
-        count.times do |i|
-          @var_array[@next_index] = Gecode::Raw::SetVar.new(*params.flatten)
-          @next_index += 1
-        end
-        
-        ((@next_index - count)...@next_index).to_a
-      end
-  
-      private
-      
-      # Transforms a lub or glb domain given as a fixnum, range or enumeration 
-      # into one or more parameters that describe the domain to 
-      # Gecode::Raw::SetVar .
-      def domain_to_args(domain)
-        Gecode::Constraints::Util.constant_set_to_int_set(domain)
-      end
-      
-      # Creates a new storage array for bool variables.
-      def new_storage_array(new_size)
-        arr = Gecode::Raw::SetVarArray.new(@space, new_size)
-        @space.own(arr, ARRAY_IDENTIFIER)
-        return arr
-      end
-    end
   end
 end