gecoder-with-gecode 0.8.3 → 0.9.0

data/lib/gecoder/bindings/bindings.rb

@@ -735,6 +735,11 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
       ['Gecode::IntVar', 'Gecode::BoolVar'].each do |template_type|
         minimodelns.add_cxx_class "LinExpr<#{template_type}>" do |klass|
           klass.add_constructor
+
+          klass.add_constructor do |method|
+            method.add_parameter "#{template_type}&", "x"
+            method.add_parameter "int", "a", true
+          end
         
           klass.add_method "post" do |method|
             method.add_parameter "Gecode::MSpace *", "home"
@@ -1175,6 +1180,7 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
       func.add_parameter "Gecode::IntVar", "y0"
       func.add_parameter "Gecode::IntVar", "y1"
       func.add_parameter "Gecode::IntConLevel", "icl"
+      func.add_parameter "Gecode::PropKind", "pk"
     end
     
     ns.add_function "linear", "void" do |func|
@@ -1377,6 +1383,16 @@ Rust::Bindings::create_bindings Rust::Bindings::LangCxx, "gecode" do |b|
       func.add_parameter "Gecode::IntConLevel", "icl"
       func.add_parameter "Gecode::PropKind", "pk"
     end
+
+    ns.add_function "rel" 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::IntRelType", "r"
+      func.add_parameter "Gecode::IntConLevel", "icl"
+      func.add_parameter "Gecode::PropKind", "pk"
+    end
     
     ns.add_function "rel" do |func|
       func.add_parameter "Gecode::MSpace*", "home"

data/lib/gecoder/bindings.rb

@@ -1,3 +1,45 @@
+# Problems can be formulated and solved either through defining a new
+# class that inherits from Gecode::Model or by using Gecode#solve et al.
+# Gecode::Model describes how to formulate problems.
+#
+# ==== Examples 
+#
+# The following two examples show how to solve the following equation 
+# system, using both ways to define and solve a problem.
+#
+# Equation system:
+#   x + y = z
+#   x = y - 3
+#   0 <= x,y,z <= 9
+#
+# === Inheriting from Gecode::Model
+#
+#   class EquationProblem < Gecode::Model
+#     def initialize
+#       variables_is_an int_var_array(3, 0..9)
+#       x, y, z = variables
+#
+#       (x + y).must == z
+#       x.must == y - 3
+#
+#       branch_on variables
+#     end
+#   end
+#   puts EquationProblem.new.solve!.variables.join(' ')
+#
+# === Using Gecode#solve
+#
+#   solution = Gecode.solve do
+#     variables_is_an int_var_array(3, 0..9)
+#     x, y, z = variables
+#
+#     (x + y).must == z
+#     x.must == y - 3
+#
+#     branch_on variables
+#   end
+#   puts solution.variables.values.join(' ')
+# 
 module Gecode
   # Loads the binding libraries. This is done as a method in order to be easier
   # to test. 

data/lib/gecoder/interface/branch.rb

@@ -1,7 +1,7 @@
 module Gecode
   class Model
     # Specifies which variables that should be branched on (given as an
-    # enum of variables or as a single variable). One can optionally
+    # enum of operands or as a single operand). One can optionally
     # also select which of the variables that should be used first with
     # the :variable option and which value in that variable's domain
     # that should be used with the :value option. If nothing is
@@ -62,16 +62,23 @@ module Gecode
     # [:min]        Selects the smallest value in the unknown part of the set.
     # [:max]        Selects the largest value in the unknown part of the set.
     def branch_on(variables, options = {})
-      if variables.respond_to? :bind
+      if variables.respond_to?(:to_int_var) or 
+          variables.respond_to?(:to_bool_var) or 
+          variables.respond_to?(:to_set_var)
         variables = wrap_enum [variables]
       end
 
-      if variables.respond_to? :to_int_var_array or 
-          variables.respond_to? :to_bool_var_array
-        add_branch(variables, options, Constants::BRANCH_INT_VAR_CONSTANTS, 
+      if variables.respond_to? :to_int_enum 
+        add_branch(variables.to_int_enum, options,
+          Constants::BRANCH_INT_VAR_CONSTANTS, 
           Constants::BRANCH_INT_VALUE_CONSTANTS)
-      elsif variables.respond_to? :to_set_var_array
-        add_branch(variables, options, Constants::BRANCH_SET_VAR_CONSTANTS, 
+      elsif variables.respond_to? :to_bool_enum
+        add_branch(variables.to_bool_enum, options, 
+          Constants::BRANCH_INT_VAR_CONSTANTS, 
+          Constants::BRANCH_INT_VALUE_CONSTANTS)
+      elsif variables.respond_to? :to_set_enum
+        add_branch(variables.to_set_enum, options, 
+          Constants::BRANCH_SET_VAR_CONSTANTS, 
           Constants::BRANCH_SET_VALUE_CONSTANTS)
       else
         raise TypeError, "Unknown type of variable enum #{variables.class}."
@@ -126,7 +133,7 @@ module Gecode
       }
     end
     
-    # Adds a branching selection for the specified variable with the specified
+    # Adds a branching selection for the specified variables with the specified
     # options. The hashes are used to decode the options into Gecode's 
     # constants.
     def add_branch(variables, options, branch_var_hash, branch_value_hash)
@@ -148,7 +155,7 @@ module Gecode
 
       # Add the branching as a gecode interaction.
       add_interaction do
-        Gecode::Raw.branch(active_space, variables.to_var_array, 
+        Gecode::Raw.branch(active_space, variables.bind_array, 
           branch_var_hash[var_strat], branch_value_hash[val_strat])
       end
     end