glpk 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 690771cd02dd1a3291ddf745247b26e45277bb5c3da3d40c3c3bd0d0162d91a7
-  data.tar.gz: 051ded67d27bb14cfa1633c70e15b770920ebc01bbbbb6d32cac24a9f605902e
+  metadata.gz: 562dd3b6bbfbe501c454ab80f9a44ecadbc20035a0e52542dbeb03ebac763056
+  data.tar.gz: c56673b4b51e15e6657d35e813473ec192fff0f5d03f2bc3ebf1a5e99b97abe8
 SHA512:
-  metadata.gz: 4561bc766f46edad790f9dff4259c91f2a5fb06008694dd3f6d668342472fb5eaf9faace3e714da01cf785b2681ae182c6a4ccd4d9e4bdc9e93dfe9042d5a3fc
-  data.tar.gz: 8baebc4a5c8e7de113d87bec86fc7d6fe491c562bec192c91e7d5b5bbb76757902fee0d09f33f267044ff2eb5428fe5ecb3d9df6e32763ccef26f871109677d9
+  metadata.gz: d09999eea8b64cb9b432bffd60620e4b7aab27e578593f0489152525f62a125529c122a3a74a9d06874e141bd50a26b79a984148705f555cdfc06007cf7fdbb8
+  data.tar.gz: e6b556121291fcf6c6bc0a41a06f38910990dcdc74808c85c38b45ce65c19661a547ca52712c95f09bd389124c50f2f265e4105d9ffbc9b3557f88f719c8442b

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.3.0 (2024-10-22)
+
+- Dropped support for Ruby < 3.1
+
+## 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

data/README.md

@@ -2,7 +2,9 @@
 
 [GLPK](https://www.gnu.org/software/glpk/) - the GNU linear programming kit - for Ruby
 
-[![Build Status](https://github.com/ankane/glpk-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/glpk-ruby/actions)
+Check out [Opt](https://github.com/ankane/opt) for a high-level interface
+
+[![Build Status](https://github.com/ankane/glpk-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/glpk-ruby/actions)
 
 ## Installation
 
@@ -74,6 +76,12 @@ problem = Glpk.read_lp("hello.lp")
 problem = Glpk.read_mps("hello.mps")
 ```
 
+Free the problem (required in multi-threaded environments)
+
+```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
 
@@ -121,7 +123,7 @@ module Glpk
         row_primal: num_rows.times.map { |i| FFI.glp_get_row_prim(model, i + 1) },
         col_primal: num_cols.times.map { |i| FFI.glp_get_col_prim(model, i + 1) },
         row_dual: num_rows.times.map { |i| FFI.glp_get_row_dual(model, i + 1) },
-        col_dual: num_cols.times.map { |i| FFI.glp_get_col_dual(model, i + 1) },
+        col_dual: num_cols.times.map { |i| FFI.glp_get_col_dual(model, i + 1) }
       }
     end
 

data/lib/glpk/version.rb

@@ -1,3 +1,3 @@
 module Glpk
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: glpk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
-dependencies: []
+date: 2024-10-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: andrew@ankane.org
 executables: []
@@ -35,14 +49,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Linear programming kit for Ruby