glpk 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86566e1e5bf15191e73ee45386a860854d42be93ca39d149eea0821128a5116a
-  data.tar.gz: c14d0f10736dc2180b3d90c284f3816fb30bf424de6a112a4c281c4952a76c07
+  metadata.gz: b33673df7b1d1ddefb1d561f60a0742cc57988154b027814690a23751eb325ad
+  data.tar.gz: 1145b0ad7dfbc30a7fd4cd11c83ad834deb98679760f613d018620869e9956c4
 SHA512:
-  metadata.gz: 32d6f945c5abc14eaa7e8e7f08696f0d6db629bcfbf4edb42bb1fe8dc68de10b01a4aff472ddd6ae154ba857fe293a017beba34d0337e9f352dbbb02542040ca
-  data.tar.gz: c1be49795ce8d6eb3a22d81dd02a7d2045401aaef038d1c1f933b8f03ec1d338a00adee08bb624855a6959d9dfffeb58155b027038a785f87e7a4211240e02b8
+  metadata.gz: 4be3835974e198a429e28c9aef30b898c8b1fa2e8634e80b822570a533c6f6b2ac92a4416c7d04af0f2ec53b8edef558fd263b9bedcd09d85276a4f8c6a92123
+  data.tar.gz: 967a2d957f359fccfc40d3ce03eb8526d445a1142119417c27a0c7c76017552bbd13b3413964cc6a99209e5baeef2e415a474d7f37c79d056ef4a53b3ac1aceb

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.2.1 (2023-06-07)
+
+- Added `free` method
+- Improved support for Mac ARM
+- Fixed error with `dup` and `clone`
+
+## 0.2.0 (2023-01-25)
+
+- Improved MIP status when LP fails
+
 ## 0.1.0 (2022-04-13)
 
 - First release

data/README.md

@@ -2,6 +2,8 @@
 
 [GLPK](https://www.gnu.org/software/glpk/) - the GNU linear programming kit - for Ruby
 
+Check out [Opt](https://github.com/ankane/opt) for a high-level interface
+
 [![Build Status](https://github.com/ankane/glpk-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/glpk-ruby/actions)
 
 ## Installation
@@ -12,12 +14,18 @@ First, install GLPK. For Homebrew, use:
 brew install glpk
 ```
 
-And for Ubuntu, use:
+For Ubuntu, use:
 
 ```sh
 sudo apt-get install libglpk40
 ```
 
+And for Fedora, use:
+
+```sh
+sudo dnf install glpk
+```
+
 Then add this line to your application’s Gemfile:
 
 ```ruby
@@ -68,6 +76,12 @@ problem = Glpk.read_lp("hello.lp")
 problem = Glpk.read_mps("hello.mps")
 ```
 
+Free the problem (only required in multi-threaded environments) [unreleased]
+
+```ruby
+problem.free
+```
+
 ## Reference
 
 Set the message level

data/lib/glpk/problem.rb

@@ -2,7 +2,13 @@ module Glpk
   class Problem
     def initialize
       @model = FFI.glp_create_prob
-      ObjectSpace.define_finalizer(self, self.class.finalize(@model))
+      @model.free = FFI["glp_delete_prob"]
+    end
+
+    def free
+      model.free = nil
+      FFI.glp_delete_prob(model)
+      @model = nil
     end
 
     def load_problem(obj_dir:, obj_coef:, mat_ia:, mat_ja:, mat_ar:, col_kind:, col_lower:, col_upper:, row_lower:, row_upper:)
@@ -73,14 +79,10 @@ module Glpk
       end
     end
 
-    def self.finalize(model)
-      # must use proc instead of stabby lambda
-      proc { FFI.glp_delete_prob(model) }
-    end
-
     private
 
     def model
+      raise Error, "can't use freed problem" unless @model
       @model
     end
 
@@ -135,6 +137,10 @@ module Glpk
 
       status = FFI::RET_CODE[ret_code] || FFI::SOLUTION_STATUS[FFI.glp_mip_status(model)]
 
+      if status == :root_lp_optimum
+        status = FFI::SOLUTION_STATUS[FFI.glp_get_status(model)]
+      end
+
       {
         status: status,
         obj_val: FFI.glp_mip_obj_val(model),

data/lib/glpk/version.rb

@@ -1,3 +1,3 @@
 module Glpk
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/glpk.rb

@@ -2,8 +2,8 @@
 require "fiddle/import"
 
 # modules
-require "glpk/problem"
-require "glpk/version"
+require_relative "glpk/problem"
+require_relative "glpk/version"
 
 module Glpk
   class Error < StandardError; end
@@ -16,7 +16,11 @@ module Glpk
       # TODO test
       ["glpk.dll"]
     elsif RbConfig::CONFIG["host_os"] =~ /darwin/i
-      ["libglpk.dylib"]
+      if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
+        ["libglpk.dylib", "/opt/homebrew/lib/libglpk.dylib"]
+      else
+        ["libglpk.dylib"]
+      end
     else
       ["libglpk.so", "libglpk.so.40"]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glpk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Linear programming kit for Ruby