mipper 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d16f46d5a09d8ff89563f7fbb92a54f257dbb901
-  data.tar.gz: 67f1a0b959ec203c4f27911030d7b41e6db2265a
+  metadata.gz: 7287ac319911c87f47829488284ae00f4025dc90
+  data.tar.gz: 88886036462522fff9ccbb6352df3217bed26ca4
 SHA512:
-  metadata.gz: 168c66e33986ff8822d988992991ea83dabd649ada9a7d7382e7106f041c148e17c711abcd669949729f3684890fc378071149b9c47b7b178b4ccc19fe267bb0
-  data.tar.gz: ec215186c4ca682f8c7cf1391c8c074fe4e6ce805635b69b1bc393e1d66455d09c9b319485040064689044c53ba483b1402bed1f9357e85cc8452d37d48c8d46
+  metadata.gz: 13d92ca34c6786899b00dae5a8332e110f6b943504495c9fc54e726708dc1f3bf8f17a24a609b18a4b747374867cb43b0991a564fc293833369e785f91515897
+  data.tar.gz: 9a8c5d65132217994a1532ed8952e163bf07f19d276f28975ec447711ef2e859c8b6111a429ffaa35b776495db6c6033a0698ed31667fc4dc46751c03ab71269

data/lib/mipper/cbc/model.rb

@@ -179,13 +179,10 @@ module MIPPeR
       if status == :optimized
         objective_value = Cbc.Cbc_getObjValue @ptr
         dblptr = Cbc.Cbc_getColSolution @ptr
-        values = dblptr.read_array_of_double(@variables.length)
-        variable_values = Hash[@variables.map do |var|
-          [var.index, values[var.index]]
-        end]
+        variable_values = dblptr.read_array_of_double(@variables.length)
       else
         objective_value = nil
-        variable_values = {}
+        variable_values = []
       end
 
       @solution = Solution.new status, objective_value, variable_values

data/lib/mipper/glpk/model.rb

@@ -123,13 +123,13 @@ module MIPPeR
 
       if status == :optimized
         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.index, value]
-        end]
+        variable_values = [nil]
+        @variables.each do |var|
+          variable_values << GLPK.glp_mip_col_val(@ptr, var.index)
+        end
       else
         objective_value = nil
-        variable_values = {}
+        variable_values = []
       end
 
       @solution = Solution.new status, objective_value, variable_values

data/lib/mipper/gurobi/model.rb

@@ -208,16 +208,15 @@ module MIPPeR
 
       if status == :optimized
         objective_value = gurobi_objective
-        variable_values = Hash[@variables.map do |var|
+        variable_values = @variables.map do |var|
           dblptr = FFI::MemoryPointer.new :pointer
           Gurobi.GRBgetdblattrarray @ptr, Gurobi::GRB_DBL_ATTR_X,
                                     var.index, 1, dblptr
-          value = dblptr.read_array_of_double(1)[0]
-          [var.index, value]
-        end]
+          dblptr.read_array_of_double(1)[0]
+        end
       else
         objective_value = nil
-        variable_values = {}
+        variable_values = []
       end
 
       @solution = Solution.new status, objective_value, variable_values

data/lib/mipper/lp_solve/model.rb

@@ -100,13 +100,14 @@ module MIPPeR
       if status == :optimized
         objective_value = LPSolve.get_objective @ptr
         rows = LPSolve.get_Nrows(@ptr)
-        variable_values = Hash[@variables.map do |var|
-          value = LPSolve.get_var_primalresult @ptr, rows + var.index
-          [var.index, value]
-        end]
+        variable_values = [nil]
+        @variables.each do |var|
+          variable_values << LPSolve.get_var_primalresult(@ptr,
+                                                          rows + var.index)
+        end
       else
         objective_value = nil
-        variable_values = {}
+        variable_values = []
       end
 
       @solution = Solution.new status, objective_value, variable_values

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mipper
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Michael Mior
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi