mipper 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bcdfc9d771851b78b8acbe8469b6b5d4be1835
-  data.tar.gz: de3f1d0bbbb0e45ea3bf9ee3be6dad6b83ea54bf
+  metadata.gz: d16f46d5a09d8ff89563f7fbb92a54f257dbb901
+  data.tar.gz: 67f1a0b959ec203c4f27911030d7b41e6db2265a
 SHA512:
-  metadata.gz: 1e52c2d21b3e7b591ad03abd7e1918d4df630b265e044018118f911a4562143975644f89a4fa91076ac1d79a06741e040c70c4ea2cb8fca61e3adb2a701a5e75
-  data.tar.gz: 0296d1b129185658061d6b7c2c1432eed43aae4e569ef5f0b06d4cffd813bf2420e4bf40ca133d81345f8faf8677e9c3a05057f81fd72d010c8f42e69d1b6cc4
+  metadata.gz: 168c66e33986ff8822d988992991ea83dabd649ada9a7d7382e7106f041c148e17c711abcd669949729f3684890fc378071149b9c47b7b178b4ccc19fe267bb0
+  data.tar.gz: ec215186c4ca682f8c7cf1391c8c074fe4e6ce805635b69b1bc393e1d66455d09c9b319485040064689044c53ba483b1402bed1f9357e85cc8452d37d48c8d46

data/lib/mipper/cbc/model.rb

@@ -80,7 +80,8 @@ module MIPPeR
       # Store all the variables in the model
       # Most of the work will be done when we add the constraints
       vars.each do |var|
-        var.instance_variable_set :@model, self
+        var.model = self
+        var.index = @variables.count
         @variables << var
       end
     end
@@ -117,7 +118,8 @@ module MIPPeR
     # Store the index which will be used for each constraint
     def store_constraint_indexes(constrs)
       constrs.each do |constr|
-        constr.instance_variable_set :@index, @constr_count
+        constr.model = self
+        constr.index = @constr_count
         @constr_count += 1
       end
     end
@@ -137,7 +139,7 @@ module MIPPeR
 
         var.constraints.each do |constr|
           col_start += 1
-          index << constr.instance_variable_get(:@index)
+          index << constr.index
           value << constr.expression.terms[var]
         end
       end
@@ -156,7 +158,8 @@ module MIPPeR
 
       # We store variables now since they didn't exist earlier
       vars.each_with_index do |var, i|
-        var.instance_variable_set(:@index, i)
+        var.index = i
+        var.model = self
         store_variable var
       end
     end
@@ -178,7 +181,7 @@ module MIPPeR
         dblptr = Cbc.Cbc_getColSolution @ptr
         values = dblptr.read_array_of_double(@variables.length)
         variable_values = Hash[@variables.map do |var|
-          [var.name, values[var.index]]
+          [var.index, values[var.index]]
         end]
       else
         objective_value = nil
@@ -201,12 +204,11 @@ module MIPPeR
     # Save the constraint to the model and update the constraint pointers
     def store_constraint(constr)
       # Update the constraint to track the index in the model
-      index = constr.instance_variable_get(:@index)
-      constr.instance_variable_set :@model, self
+      constr.model = self
 
       # Set constraint properties
-      Cbc.Cbc_setRowName(@ptr, index, constr.name) unless constr.name.nil?
-      store_constraint_bounds index, constr.sense, constr.rhs
+      Cbc.Cbc_setRowName(@ptr, constr.index, constr.name) unless constr.name.nil?
+      store_constraint_bounds constr.index, constr.sense, constr.rhs
     end
 
     # Store the bounds for a given constraint

data/lib/mipper/constraint.rb

@@ -1,5 +1,6 @@
 module MIPPeR
   class Constraint
+    attr_accessor :model, :index
     attr_reader :expression, :sense, :rhs, :name
 
     def initialize(expr, sense, rhs, name = nil)

data/lib/mipper/glpk/model.rb

@@ -92,8 +92,8 @@ module MIPPeR
       constrs.each do |constr|
         store_constraint constr
         constr.expression.terms.each do |var, coeff|
-          @ia << constr.instance_variable_get(:@index)
-          @ja << var.instance_variable_get(:@index)
+          @ia << constr.index
+          @ja << var.index
           @ar << coeff
         end
       end
@@ -125,7 +125,7 @@ module MIPPeR
         objective_value = GLPK.glp_mip_obj_val @ptr
         variable_values = Hash[@variables.map do |var|
           value = GLPK.glp_mip_col_val(@ptr, var.index)
-          [var.name, value]
+          [var.index, value]
         end]
       else
         objective_value = nil
@@ -139,8 +139,9 @@ module MIPPeR
     def store_constraint(constr)
       # Update the constraint to track the index in the model
       index = @constr_count + 1
-      constr.instance_variable_set :@model, self
-      constr.instance_variable_set :@index, index
+      constr.model = self
+      constr.index = index
+      constr.freeze
       @constr_count += 1
 
       # Set constraint properties
@@ -166,8 +167,8 @@ module MIPPeR
     def store_variable(var)
       # Update the variable to track the index in the model
       index = @var_count + 1
-      var.instance_variable_set :@model, self
-      var.instance_variable_set :@index, index
+      var.model = self
+      var.index = index
       @var_count += 1
 
       @variables << var

data/lib/mipper/gurobi/model.rb

@@ -151,14 +151,19 @@ module MIPPeR
                                  sense_buffer, rhs_buffer, names_buffer
       fail if ret != 0
 
-      @constraints.concat constrs
+      constrs.each do |constr|
+        constr.model = self
+        constr.index = @constraints.length
+        constr.freeze
+        @constraints << constr
+      end
     end
 
     # Add a new constraint to the model
     def add_constraint(constr)
       terms = constr.expression.terms
       indexes_buffer = build_pointer_array(terms.each_key.map do |var|
-        var.instance_variable_get(:@index)
+        var.index
       end, :int)
       values_buffer = build_pointer_array terms.values, :double
 
@@ -168,6 +173,9 @@ module MIPPeR
                                 constr.rhs, constr.name
       fail if ret != 0
 
+      constr.model = self
+      constr.index = @constraints.length
+      constr.freeze
       @constraints << constr
     end
 
@@ -186,7 +194,7 @@ module MIPPeR
       constrs.each.map do |constr|
         cbeg << cind.length
         constr.expression.terms.each do |var, coeff|
-          cind << var.instance_variable_get(:@index)
+          cind << var.index
           cval << coeff
         end
       end
@@ -205,7 +213,7 @@ module MIPPeR
           Gurobi.GRBgetdblattrarray @ptr, Gurobi::GRB_DBL_ATTR_X,
                                     var.index, 1, dblptr
           value = dblptr.read_array_of_double(1)[0]
-          [var.name, value]
+          [var.index, value]
         end]
       else
         objective_value = nil
@@ -218,8 +226,8 @@ module MIPPeR
     # 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
+      var.model = self
+      var.index = @var_count
       @var_count += 1
 
       @variables << var

data/lib/mipper/lp_solve/model.rb

@@ -73,7 +73,7 @@ module MIPPeR
       colno = []
       constr.expression.terms.each do |var, coeff|
         row << coeff * 1.0
-        colno << var.instance_variable_get(:@index)
+        colno << var.index
       end
 
       row_buffer = build_pointer_array row, :double
@@ -102,7 +102,7 @@ module MIPPeR
         rows = LPSolve.get_Nrows(@ptr)
         variable_values = Hash[@variables.map do |var|
           value = LPSolve.get_var_primalresult @ptr, rows + var.index
-          [var.name, value]
+          [var.index, value]
         end]
       else
         objective_value = nil
@@ -116,8 +116,9 @@ module MIPPeR
     def store_constraint(constr)
       # Update the constraint to track the index in the model
       index = LPSolve.get_Nrows(@ptr)
-      constr.instance_variable_set :@model, self
-      constr.instance_variable_set :@index, index
+      constr.model = self
+      constr.index = index
+      constr.freeze
       @constr_count += 1
 
       # Set constraint properties
@@ -144,8 +145,9 @@ module MIPPeR
     def store_variable(var)
       # Update the variable to track the index in the model
       index = @var_count + 1
-      var.instance_variable_set :@model, self
-      var.instance_variable_set :@index, index
+      var.model = self
+      var.index = index
+      var.freeze
       @var_count += 1
 
       ret = LPSolve.add_columnex @ptr, 0, nil, nil

data/lib/mipper/model.rb

@@ -73,7 +73,7 @@ module MIPPeR
 
     # Get the value of a variable from a previous solution
     def variable_value(var)
-      @solution.variable_values[var.name] unless @solution.nil?
+      @solution.variable_values[var.index] unless @solution.nil?
     end
 
     protected

data/lib/mipper/variable.rb

@@ -1,8 +1,7 @@
 module MIPPeR
   class Variable
-    attr_accessor :constraints
-    attr_reader :lower_bound, :upper_bound, :coefficient, :type, :name, :model,
-                :index
+    attr_accessor :constraints, :model, :index
+    attr_reader :lower_bound, :upper_bound, :coefficient, :type, :name
 
     def initialize(lb, ub, coeff, type, name = nil)
       @lower_bound = lb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mipper
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Michael Mior
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -56,7 +56,7 @@ files:
 - lib/mipper/variable.rb
 homepage: https://github.com/michaelmior/mipper
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -74,9 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to various MIP solvers
 test_files: []
-has_rdoc: