guruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85c5fc8881ff43224999ebb2a998e0726fe7010
-  data.tar.gz: 11467803a852daf27f2df22d702a1b074fabd219
+  metadata.gz: 90abe0f8288b62ebbd12eabbac3fbfbc5a24eb50
+  data.tar.gz: 39f00000b36f43bdc997ecb6a685d3f7c1878523
 SHA512:
-  metadata.gz: 5c581e0e56675d30511262796f90149f1a5a8a6edd635f4a8219e34431350b386cf53bf5dcb8e5ca76af9842be999f99c3158a3f8a544ab396ac8ef32faa4e68
-  data.tar.gz: 78823294b27b58b7b1bd0260ca08d435d68b30834b4e166f1fe59913098f48f889fb6496d7f9bf847e80043cd3aa6bc60b3ea424f0b5a9b8f19f8300cbe7c8a2
+  metadata.gz: 25c749b6eafece828bf27940b7678477230b1f237316e5a331e253b053723db1c8462ce67ecbeafd06842ac4ed96e098e3bfd6dfedde1cf23fa74abf8c6059ac
+  data.tar.gz: e09329ac7900cfbb8dca7447b486e01ff6840d18863971bdaa54f0a05f8a296820ce9847388ca9d995a89a2199203db6b16fff167d1dc42c7bc6cfddd57369c9

data/lib/guruby/ext/gurobi.rb

@@ -22,6 +22,9 @@ module Gurobi
                                 :pointer, :pointer], :int
   attach_function :GRBaddconstr, [:pointer, :int, :pointer, :pointer, :char,
                                   :double, :string], :int
+  attach_function :GRBaddconstrs, [:pointer, :int, :int, :pointer, :pointer,
+                                   :pointer, :pointer, :pointer,
+                                   :pointer], :int
   attach_function :GRBoptimize, [:pointer], :int
   attach_function :GRBcomputeIIS, [:pointer], :int
   attach_function :GRBwrite, [:pointer, :string], :int

data/lib/guruby/model.rb

@@ -17,15 +17,18 @@ module Guruby
       @var_count = 0
       @variables = []
       @constraints = []
+
+      @pending_variables = []
+      @pending_constraints = []
     end
 
     # Add new objects (variables and constraints) to the model
     def <<(obj)
       case obj
       when Variable
-        add_variable obj
+        @pending_variables << obj
       when Constraint
-        add_constraint obj
+        @pending_constraints << obj
       else
         fail TypeError
       end
@@ -33,6 +36,20 @@ module Guruby
 
     # Update the model
     def update
+      if @pending_variables.length == 1
+        add_variable @pending_variables.first
+      elsif @pending_variables.length > 0
+        add_variables @pending_variables
+      end
+      @pending_variables = []
+
+      if @pending_constraints.length == 1
+        add_constraint @pending_constraints.first
+      elsif @pending_constraints.length > 0
+        add_constraints @pending_constraints
+      end
+      @pending_constraints = []
+
       ret = Gurobi.GRBupdatemodel @ptr
       fail if ret != 0
     end
@@ -50,6 +67,9 @@ module Guruby
 
     # Optimize the model
     def optimize
+      # Ensure pending variables and constraints are added
+      update
+
       ret = Gurobi.GRBoptimize @ptr
       fail if ret != 0
     end
@@ -83,6 +103,34 @@ module Guruby
       proc { Gurobi.GRBfreemodel ptr }
     end
 
+    # Add multiple variables to the model simultaneously
+    def add_variables(vars)
+      objective_buffer = FFI::MemoryPointer.new :double, vars.length
+      objective_buffer.write_array_of_double vars.map(&:coefficient)
+
+      lb_buffer = FFI::MemoryPointer.new :double, vars.length
+      lb_buffer.write_array_of_double vars.map(&:lower_bound)
+
+      ub_buffer = FFI::MemoryPointer.new :double, vars.length
+      ub_buffer.write_array_of_double vars.map(&:upper_bound)
+
+      type_buffer = FFI::MemoryPointer.new :char, vars.length
+      type_buffer.write_array_of_char vars.map { |var| var.type.ord }
+
+      names = array_to_pointers_to_names vars
+      names_buffer = FFI::MemoryPointer.new :pointer, vars.length
+      names_buffer.write_array_of_pointer names
+
+      ret = Gurobi.GRBaddvars @ptr, vars.length, 0, nil, nil, nil,
+                              objective_buffer, lb_buffer, ub_buffer,
+                              type_buffer, names_buffer
+
+      fail if ret != 0
+
+      # Store all the variables in the model
+      vars.each { |var| store_variable var }
+    end
+
     # Add a new variable to the model
     def add_variable(var)
       ret = Gurobi.GRBaddvar @ptr, 0, nil, nil, var.coefficient,
@@ -90,6 +138,11 @@ module Guruby
                              var.type.ord, var.name
       fail if ret != 0
 
+      store_variable var
+    end
+
+    # Save the variable to the model and update the variable pointers
+    def store_variable(var)
       # Update the variable to track the index in the model
       var.instance_variable_set :@model, self
       var.instance_variable_set :@index, @var_count
@@ -98,6 +151,44 @@ module Guruby
       @variables << var
     end
 
+    # Add multiple constraints at once
+    def add_constraints(constrs)
+      cbeg = []
+      cind = []
+      cval = []
+      constrs.each_with_index.map do |constr, i|
+        cbeg << cind.length
+        constr.expression.terms.each do |var, coeff|
+          cind << var.instance_variable_get(:@index)
+          cval << coeff
+        end
+      end
+
+      cbeg_buffer = FFI::MemoryPointer.new :pointer, cbeg.length
+      cbeg_buffer.write_array_of_int cbeg
+
+      cind_buffer = FFI::MemoryPointer.new :pointer, cind.length
+      cind_buffer.write_array_of_int cind
+
+      cval_buffer = FFI::MemoryPointer.new :pointer, cval.length
+      cval_buffer.write_array_of_double cval
+
+      sense_buffer = FFI::MemoryPointer.new :pointer, constrs.length
+      sense_buffer.write_array_of_char constrs.map { |c| c.sense.ord }
+
+      rhs_buffer = FFI::MemoryPointer.new :pointer, constrs.length
+      rhs_buffer.write_array_of_double constrs.map(&:rhs)
+
+      names = array_to_pointers_to_names constrs
+      names_buffer = FFI::MemoryPointer.new :pointer, constrs.length
+      names_buffer.write_array_of_pointer names
+
+      ret = Gurobi.GRBaddconstrs @ptr, constrs.length, cind.length,
+                                 cbeg_buffer, cind_buffer, cval_buffer,
+                                 sense_buffer, rhs_buffer, names_buffer
+      fail if ret != 0
+    end
+
     # Add a new constraint to the model
     def add_constraint(constr)
       terms = constr.expression.terms
@@ -117,5 +208,12 @@ module Guruby
       @constraints << constr
     end
 
+    # Convert an array of objects to an FFI array of
+    # memory pointers to the names of each object
+    def array_to_pointers_to_names(arr)
+      arr.map do |obj|
+        obj.name.nil? ? nil : FFI::MemoryPointer.from_string(obj.name)
+      end
+    end
   end
 end

data/lib/guruby/var.rb

@@ -81,7 +81,7 @@ module Guruby
     def set_double_attribute(name, value)
       buffer = FFI::MemoryPointer.new :double, 1
       buffer.write_array_of_double [value]
-      ret = Gurobi.GRBsetdblattrarray model.ptr, name, @index, 1, buffer
+      ret = Gurobi.GRBsetdblattrarray @model.ptr, name, @index, 1, buffer
       fail if ret != 0
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Mior