simplex 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d586cdecfc5ebff9463168a641095b14c66f3eb
-  data.tar.gz: 1b99632bec24b3ea8ecf2191e3991f359c45a39a
+  metadata.gz: 8c7dddbf0b80831adfd609722385b79e61c3e541
+  data.tar.gz: 5a21258e6ab16af709a34c45848f9e5c68ced58c
 SHA512:
-  metadata.gz: 30a1509d8f7a9555ed74f3e8ee2148f077d99762e35db770ec5234a4e001ca508fde8e22c9c169f47ebd4bbdcf7a4d4b88d48b2c765f0f5877fd4432ce42198d
-  data.tar.gz: cdda93f918effea817079e509e17790c864fb681f5427b9d27061649873d7d91035fd60269be7f402521edcdc95a47f35bccb990c4af14cab6261e21aeae4123
+  metadata.gz: 769f0edd69b3770e369f6dbb5cbf10c8d1f1dda626392dcf01397fa8874fd38b32251fb76ac104a96171841e8e48dd6ef6c876626b39520f974228f27f7c9e6b
+  data.tar.gz: 5e7010f1267a55da2a2219508fb896e3a547c66d4605d8a0f349eccd2126d4c3d6ca7d696bdb3c4f1f25c2b6f307fe1fe1c9ef700b35e3271460d6736a43a4f3

data/README.md

@@ -4,7 +4,7 @@ simplex
 
 A naive pure-Ruby implementation of the Simplex algorithm for solving linear programming problems. Solves maximizations in standard form.
 
-## Why?
+### Why?
 
 I wrote this because I needed to solve some small allocation problems for a web game I'm writing, 
 and there didn't seem to be any Ruby 2.0 bindings for the "pro" solver libraries, 
@@ -14,16 +14,16 @@ and anyway they are hard to install on Heroku.
      and when you can accept not that great performance. 
  * *Don't use it for*: large LP problems, when you have access to native solvers, when you need very fast solving time.
 
-## Usage
+### Usage
 
 To solve the linear programming problem:
 
-  max x +  y
+    max x +  y
 
-     2x +  y <= 4
-      x + 2y <= 3
+      2x +  y <= 4
+       x + 2y <= 3
 
-      x, y >= 0
+       x, y >= 0
 
 Like this:
 
@@ -35,4 +35,5 @@ Like this:
       ],
       [4, 3]        # .. and the rhs of the inequalities
     ).solution
+    # => [(5/3), (2/3)]
 

data/lib/simplex.rb

@@ -11,7 +11,8 @@ class Vector
 end
 
 class Simplex
-  DEFAULT_MAX_ITERATIONS = 1_000_000
+  DEFAULT_MAX_ITERATIONS = 10_000
+
   attr_accessor :max_iterations
 
   def initialize(c, a, b)
@@ -38,8 +39,10 @@ class Simplex
   def solve
     return if @solved
     i = 0
-    while can_improve? and i < @max_iterations
+    while can_improve?
       i += 1
+      raise "Too many iterations" if i > max_iterations 
+
       pivot_column = entering_variable_ix
       pivot_row    = minimum_coefficient_ratio_row_ix(pivot_column)
       leaving_var = leaving_variable(pivot_row)
@@ -103,7 +106,7 @@ class Simplex
     current_min_index = nil
     @c.each_with_index do |v, i| 
       if v < 0
-        if current_min_value == nil || v <= current_min_value
+        if current_min_value == nil || v < current_min_value
           current_min_value = v
           current_min_index = i
         end
@@ -125,8 +128,11 @@ class Simplex
     current_min_index = nil
     0.upto(@a.row_count - 1) do |row_ix|
       next if @a[row_ix, column_ix] == 0
-      ratio = Rational(@b[row_ix], @a[row_ix, column_ix])
-      if ratio > 0 && (!current_min_value || ratio < current_min_value)
+      b_val = @b[row_ix]
+      a_val = @a[row_ix, column_ix]
+      ratio = Rational(b_val, a_val)
+      is_negative = (@b[row_ix] < 0 || @a[row_ix, column_ix] < 0) && !(@b[row_ix] < 0 && @a[row_ix, column_ix] < 0)
+      if !is_negative && (!current_min_value || ratio <= current_min_value)
         current_min_value = ratio
         current_min_index = row_ix
       end
@@ -135,3 +141,6 @@ class Simplex
   end
 
 end
+
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplex
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Daniel Lucraft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies: []
 description: Naive implementation of the simplex linear programming algorithm in pure
   Ruby.
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simplex linear programming solver