clp 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c01ab7d7209bb40c13fe725a54180e7001bd3eff8c406c83e9edb8fa0d686f9
-  data.tar.gz: 9a82639091ecc4cfb4029c7c4ff60ff3913b57cd010e2e21a67580a94b98e6ca
+  metadata.gz: ce8d28ee2e7e1772cfc1cdc8ea027e6946a791a3682ac4865f10f78cce765426
+  data.tar.gz: 656c14297cc86e4baf08b33b64940530b3a83e2133a8e944c1c47d75487fae0f
 SHA512:
-  metadata.gz: e267c07368a63e59e45eceba7dc008b7192fd65ef33e8fe87ba2517f490a7727388414ad9640ccd1f6adc04613440513b77c911440e9205c7489234bc1ec4c8d
-  data.tar.gz: 21578e3dcd102e122ba217adfa41a1c6b6302d13cc26cb13ea054c64ea6c1181f7ae3200090884d24aa04914a284e476b8a13c8446dd0d0b8c3ff6b29f0241ab
+  metadata.gz: '086c1b6352fb07f1a425b955ccf95eebe4fbf7c4c7a2ba8736ca04811732dd0c9dde9f7233611d12ed71c9880b2646f6ffcc892b334231a33aee9e63f2b1ace7'
+  data.tar.gz: 103720186f2a2a547fd9561a381ab9b4bb7b7c8c197a2f573ac6183e52506ecafb6d1513a61cd68862209d915a3dabc3e856d7cbceb3d9e4ca3a9c492ecc2e0c

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.1.3 (2023-06-07)
+
+- Improved support for Mac ARM
+- Fixed error with `dup` and `clone`
+
+## 0.1.2 (2022-04-14)
+
+- Added `log_level` and `time_limit` options to `solve` method
+
 ## 0.1.1 (2022-04-06)
 
 - Fixed shared library detection on Linux

data/README.md

@@ -2,6 +2,8 @@
 
 [Clp](https://github.com/coin-or/Clp) - linear programming solver - for Ruby
 
+Check out [Opt](https://github.com/ankane/opt) for a high-level interface
+
 [![Build Status](https://github.com/ankane/clp-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/clp-ruby/actions)
 
 ## Installation
@@ -63,6 +65,20 @@ Read a problem from an MPS file
 model = Clp.read_mps("hello.mps")
 ```
 
+## Reference
+
+Set the log level
+
+```ruby
+model.solve(log_level: 4)
+```
+
+Set the time limit in seconds
+
+```ruby
+model.solve(time_limit: 30)
+```
+
 ## History
 
 View the [changelog](https://github.com/ankane/clp-ruby/blob/master/CHANGELOG.md)

data/lib/clp/ffi.rb

@@ -14,6 +14,7 @@ module Clp
 
     OBJ_SENSE = {
       minimize: 1,
+      ignore: 0,
       maximize: -1
     }
 
@@ -42,6 +43,8 @@ module Clp
     extern "int Clp_numberColumns(Clp_Simplex *model)"
     extern "double Clp_objectiveOffset(Clp_Simplex *model)"
     extern "void Clp_setObjectiveOffset(Clp_Simplex *model, double value)"
+    extern "double Clp_maximumSeconds(Clp_Simplex *model)"
+    extern "void Clp_setMaximumSeconds(Clp_Simplex *model, double value)"
     extern "int Clp_status(Clp_Simplex *model)"
     extern "double Clp_getObjSense(Clp_Simplex *model)"
     extern "void Clp_setObjSense(Clp_Simplex *model, double objsen)"
@@ -57,6 +60,7 @@ module Clp
     extern "double * Clp_getElements(Clp_Simplex *model)"
     extern "double Clp_objectiveValue(Clp_Simplex *model)"
     extern "void Clp_setLogLevel(Clp_Simplex *model, int value)"
+    extern "int Clp_logLevel(Clp_Simplex *model)"
 
     # solve
     extern "int Clp_initialSolve(Clp_Simplex *model)"

data/lib/clp/model.rb

@@ -2,7 +2,7 @@ module Clp
   class Model
     def initialize
       @model = FFI.Clp_newModel
-      ObjectSpace.define_finalizer(self, self.class.finalize(@model))
+      @model.free = FFI["Clp_deleteModel"]
 
       FFI.Clp_setLogLevel(model, 0)
     end
@@ -34,8 +34,11 @@ module Clp
       check_status FFI.Clp_writeMps(model, filename, 0, 1, 0)
     end
 
-    def solve
-      check_status FFI.Clp_initialSolve(model)
+    def solve(log_level: nil, time_limit: nil)
+      with_options(log_level: log_level, time_limit: time_limit) do
+        # do not check status
+        FFI.Clp_initialSolve(model)
+      end
 
       num_rows = FFI.Clp_numberRows(model)
       num_cols = FFI.Clp_numberColumns(model)
@@ -50,11 +53,6 @@ module Clp
       }
     end
 
-    def self.finalize(model)
-      # must use proc instead of stabby lambda
-      proc { FFI.Clp_deleteModel(model) }
-    end
-
     private
 
     def model
@@ -63,7 +61,7 @@ module Clp
 
     def check_status(status)
       if status != 0
-        raise Error, "Bad status"
+        raise Error, "Bad status: #{status}"
       end
     end
 
@@ -87,5 +85,22 @@ module Clp
     def read_double_array(ptr, size)
       ptr[0, size * Fiddle::SIZEOF_DOUBLE].unpack("d#{size}")
     end
+
+    def with_options(log_level:, time_limit:)
+      if log_level
+        previous_log_level = FFI.Clp_logLevel(model)
+        FFI.Clp_setLogLevel(model, log_level)
+      end
+
+      if time_limit
+        previous_time_limit = FFI.Clp_maximumSeconds(model)
+        FFI.Clp_setMaximumSeconds(model, time_limit)
+      end
+
+      yield
+    ensure
+      FFI.Clp_setLogLevel(model, previous_log_level) if previous_log_level
+      FFI.Clp_setMaximumSeconds(model, previous_time_limit) if previous_time_limit
+    end
   end
 end

data/lib/clp/version.rb

@@ -1,3 +1,3 @@
 module Clp
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/clp.rb

@@ -2,8 +2,8 @@
 require "fiddle/import"
 
 # modules
-require "clp/model"
-require "clp/version"
+require_relative "clp/model"
+require_relative "clp/version"
 
 module Clp
   class Error < StandardError; end
@@ -16,7 +16,11 @@ module Clp
       # TODO test
       ["Clp.dll"]
     elsif RbConfig::CONFIG["host_os"] =~ /darwin/i
-      ["libClp.dylib"]
+      if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
+        ["libClp.dylib", "/opt/homebrew/lib/libClp.dylib"]
+      else
+        ["libClp.dylib"]
+      end
     else
       # coinor-libclp-dev has libClp.so
       # coinor-libclp1 has libClp.so.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-06 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 solver for Ruby