rglpk 0.2.4 → 0.2.5

data/ChangeLog.md

@@ -1,3 +1,8 @@
+# rglpk 0.2.5 2011-06-23
+
+* Add Row#get_stat, Row#get_prim Row#get_dual.
+* Update tests to work with Ruby 1.9.2.
+
 # rglpk 0.2.4 2010-11-04
 
 * Add Rglpk#mip_status.
@@ -12,7 +17,7 @@
 
 # rglpk 0.2.1 2010-10-13
 
-* Point readers to gethub in README.
+* Point readers to github in README.
 
 # rglpk 0.2.0 2010-10-07
 

data/README.md

@@ -29,7 +29,7 @@ Rglpk provides two primary files: ext/glpk_wrapper.c which is a Swig generated w
 
 An example:
 
-  	# The same Brief Example as found in section 1.3 of 
+	# The same Brief Example as found in section 1.3 of 
 	# glpk-4.44/doc/glpk.pdf.
 	#
 	# maximize
@@ -80,6 +80,16 @@ An example:
 	printf("z = %g; x1 = %g; x2 = %g; x3 = %g\n", z, x1, x2, x3)
 	#=> z = 733.333; x1 = 33.3333; x2 = 66.6667; x3 = 0
 
+# Testing
+
+Test everything with:
+
+	> rake test
+
+Test a specific test with:
+
+	> ruby test/test_brief_example.rb # or what have you.
+
 # License
 
 Copyright (C) 2007 Alex Gutteridge

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/rglpk.rb

@@ -81,13 +81,27 @@ module Rglpk
     def nz
       Glpk_wrapper.glp_get_num_nz(@lp)
     end
-
+    
+    def add_row
+      Glpk_wrapper.glp_add_rows(@lp, 1)
+      new_row = Row.new(self, @rows.size + 1)
+      @rows.send(:push, new_row)
+      new_row
+    end
+    
     def add_rows(n)
       Glpk_wrapper.glp_add_rows(@lp, n)
       s = @rows.size
       n.times{|i| @rows.send(:push, Row.new(self, s + i + 1))}
       @rows
     end
+
+    def add_col
+      Glpk_wrapper.glp_add_cols(@lp, 1)
+      new_column = Column.new(self, @cols.size + 1)
+      @cols.send(:push, new_column)
+      new_column
+    end
     
     def add_cols(n)
       Glpk_wrapper.glp_add_cols(@lp, n)
@@ -115,7 +129,7 @@ module Rglpk
     end
 
     def del_cols(a)
-      # Ensure the array of rows tro delete is sorted and unique.
+      # Ensure the array of rows to delete is sorted and unique.
       a = a.sort.uniq
 
       r = Glpk_wrapper.new_intArray(a.size + 1)
@@ -194,6 +208,13 @@ module Rglpk
     def mip_status
       Glpk_wrapper.glp_mip_status(@lp)
     end
+    
+    
+    def write_lp(filename)
+      Glpk_wrapper.glp_write_lp(@lp, nil, filename)
+    end
+    
+    
   end
         
   class Row
@@ -211,7 +232,7 @@ module Rglpk
     def name
       Glpk_wrapper.glp_get_row_name(@p.lp, @i)
     end
-    
+        
     def set_bounds(type, lb, ub)
       raise ArgumentError unless TypeConstants.include?(type)
       lb = 0.0 if lb.nil?
@@ -254,6 +275,18 @@ module Rglpk
       end
       row
     end
+    
+    def get_stat
+      Glpk_wrapper.glp_get_row_stat(@p.lp, @i)
+    end
+    
+    def get_prim
+      Glpk_wrapper.glp_get_row_prim(@p.lp, @i)
+    end
+    
+    def get_dual
+      Glpk_wrapper.glp_get_row_dual(@p.lp, @i)
+    end
   end
   
   class Column

data/rglpk.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rglpk}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Gutteridge", "William Taysom"]
-  s.date = %q{2010-11-04}
+  s.date = %q{2011-06-23}
   s.description = %q{Rglpk is a package providing a Ruby wrapper to the [GNU GLPK](http://www.gnu.org/software/glpk/) library.  The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear programming (LP), mixed integer programming (MIP), and other related problems.
 
 Rglpk (pronounced as "wriggle-pick") is currently in alpha status and the API should be considered subject to change.  Rglpk uses [Swig](http://www.swig.org/) to initially wrap the C GLPK library (using a Swig wrapper originally developed by Nigel Galloway) and then a pure Ruby library to wrap the Swig code in a more friendly OO-style.
@@ -19,44 +19,35 @@ See [github](http://github.com/wtaysom/rglpk) for installation instructions.  Al
   s.extensions = ["ext/extconf.rb", "ext/extconf.rb"]
   s.extra_rdoc_files = [
     "ChangeLog.md",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "ChangeLog.md",
-     "License.txt",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "ext/extconf.rb",
-     "ext/glpk_wrapper.c",
-     "lib/rglpk.rb",
-     "rglpk.gemspec",
-     "swig/Makefile.in",
-     "swig/configure.in",
-     "swig/glpk.i",
-     "test/helper.rb",
-     "test/test_all.rb",
-     "test/test_basic.rb",
-     "test/test_brief_example.rb",
-     "test/test_problem_kind.rb"
+    "ChangeLog.md",
+    "License.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "ext/extconf.rb",
+    "ext/glpk_wrapper.c",
+    "lib/rglpk.rb",
+    "rglpk.gemspec",
+    "swig/Makefile.in",
+    "swig/configure.in",
+    "swig/glpk.i",
+    "test/helper.rb",
+    "test/test_all.rb",
+    "test/test_basic.rb",
+    "test/test_brief_example.rb",
+    "test/test_problem_kind.rb"
   ]
   s.homepage = %q{http://rglpk.rubyforge.org/}
-  s.rdoc_options = ["--charset=UTF-8", "--exclude", "."]
+  s.rdoc_options = ["--exclude", "."]
   s.require_paths = ["lib", "ext", "ext"]
   s.rubyforge_project = %q{rglpk}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Rglpk is a package providing a Ruby wrapper to the [GNU GLPK](http://www.gnu.org/software/glpk/) library.  The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear programming (LP), mixed integer programming (MIP), and other related problems.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_all.rb",
-     "test/test_basic.rb",
-     "test/test_brief_example.rb",
-     "test/test_problem_kind.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/helper.rb

@@ -1,3 +1,5 @@
+here = File.expand_path(File.dirname(__FILE__))
+
 require 'test/unit'
 $LOAD_PATH << './ext'
-require 'lib/rglpk'
+require here+'/../lib/rglpk'

data/test/test_basic.rb

@@ -27,6 +27,17 @@ class TestRglpk < Test::Unit::TestCase
     assert_raise(ArgumentError){p.obj.dir = 3}
   end
 
+  def test_add_row
+    p = Rglpk::Problem.new
+    r = p.add_row
+    assert_kind_of Rglpk::Row, r
+    assert_equal 1, r.i
+    assert_equal 1, p.rows.size
+    r = p.add_row
+    assert_equal 2, r.i
+    assert_equal 2, p.rows.size
+  end
+
   def test_add_rows
     p = Rglpk::Problem.new
     p.add_rows(2)
@@ -35,6 +46,17 @@ class TestRglpk < Test::Unit::TestCase
     assert_equal 4, p.rows.size
   end
 
+  def test_add_column
+    p = Rglpk::Problem.new
+    c = p.add_col
+    assert_kind_of Rglpk::Column, c
+    assert_equal 1, c.j
+    assert_equal 1, p.cols.size
+    c = p.add_col
+    assert_equal 2, c.j
+    assert_equal 2, p.cols.size
+  end
+
   def test_add_cols
     p = Rglpk::Problem.new
     p.add_cols(2)

data/test/test_brief_example.rb

@@ -52,5 +52,11 @@ class TestExample < Test::Unit::TestCase
     
     result = "z = %g; x1 = %g; x2 = %g; x3 = %g" % [z, x1, x2, x3]
     assert_equal "z = 733.333; x1 = 33.3333; x2 = 66.6667; x3 = 0", result
+    assert_equal Rglpk::GLP_NU, rows[0].get_stat
+    assert_equal 100, rows[0].get_prim
+    assert_equal 3.333333333333333, rows[0].get_dual
+    File.delete("test.lp") rescue Errno::ENOENT
+    p.write_lp("test.lp")
+    assert File.exists?("test.lp")    
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rglpk
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors: 
 - Alex Gutteridge
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +08:00
+date: 2011-06-23 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -38,7 +33,6 @@ extra_rdoc_files:
 - ChangeLog.md
 - README.md
 files: 
-- .gitignore
 - ChangeLog.md
 - License.txt
 - README.md
@@ -62,7 +56,6 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
 - --exclude
 - .
 require_paths: 
@@ -74,29 +67,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rglpk
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rglpk is a package providing a Ruby wrapper to the [GNU GLPK](http://www.gnu.org/software/glpk/) library.  The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear programming (LP), mixed integer programming (MIP), and other related problems.
-test_files: 
-- test/helper.rb
-- test/test_all.rb
-- test/test_basic.rb
-- test/test_brief_example.rb
-- test/test_problem_kind.rb
+test_files: []
+

data/.gitignore

@@ -1,17 +0,0 @@
-pkg
-*.swp
-
-# SWIG Files
-swig/Makefile
-swig/autom4te.cache/
-swig/config.log
-swig/config.status
-swig/configure
-swig/rglpk.c
-
-# ext Files
-ext/Makefile
-ext/conftest.dSYM/
-ext/mkmf.log
-ext/glpk_wrapper.bundle
-ext/glpk_wrapper.o