cbc 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3dcf4c5bbcc2757b6b06c4e15dfcd898bc345b1b15b5633f760e0d3539e607
-  data.tar.gz: a939b6d0d0b8694c5e6e8d3f8d737a07a263dc1decbb1cc0cedcf3795567fda9
+  metadata.gz: 872906265947008e72d46ca695d37f3787b58207e985e22e0446c1ecea0e7696
+  data.tar.gz: 0bc422b8cc9b5d7aff800f6210799f4003509c62d5d3833a0c5eee3fbc5b4c62
 SHA512:
-  metadata.gz: 608d2f2389cf608e34be2ad1675016177630c28d95fcc3c6ad2643c7a45bca2cf535cc54319031c1037e79a1d09d86d51e77c7fc42705751ccf98c2f56ba6547
-  data.tar.gz: 2e54fe9d70908e10d03d22119697f9c72d2589ba32defa1fafcf48244e0f44ef9a8c4416d548a2d6a522180f7371a71eec6f435327f17a0606d4f38a3a2726db
+  metadata.gz: 9df3966a5841c3cb280a40153f8c3e97d6b60e52702850b9f5a1f2193759fd17f7f6040830b4f30828686a4b9354f164b79db247102d1c433d80e9a5e2f16e36
+  data.tar.gz: 7937bccb59ba45630c137ec8a415e7e8f15255db4a4ff860bd89629a91682c66f0d338788a1f943684ed16e8617bfc2b9ca8942cd853800feebf45b7353ba431

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.1.2 (2023-06-07)
+
+- Improved support for Mac ARM
+- Fixed error with `dup` and `clone`
+
+## 0.1.1 (2022-06-12)
+
+- Fixed status
+
 ## 0.1.0 (2022-04-13)
 
 - First release

data/README.md

@@ -2,6 +2,8 @@
 
 [Cbc](https://github.com/coin-or/Cbc) - the mixed-integer programming solver - for Ruby
 
+Check out [Opt](https://github.com/ankane/opt) for a high-level interface
+
 [![Build Status](https://github.com/ankane/cbc-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/cbc-ruby/actions)
 
 ## Installation
@@ -52,15 +54,15 @@ Solve
 model.solve
 ```
 
-Write the problem to an LP or MPS file (LP requires Cbc 2.10.0+)
+Write the problem to an LP or MPS file (LP requires Cbc 2.10+)
 
 ```ruby
 model.write_lp("hello.lp")
 # or
-model.write_mps("hello") # adds mps.gz
+model.write_mps("hello") # adds .mps.gz
 ```
 
-Read a problem from an LP or MPS file (LP requires Cbc 2.10.0+)
+Read a problem from an LP or MPS file (LP requires Cbc 2.10+)
 
 ```ruby
 model = Cbc.read_lp("hello.lp")
@@ -70,13 +72,13 @@ model = Cbc.read_mps("hello.mps.gz")
 
 ## Reference
 
-Set the log level (requires Cbc 2.10.0+)
+Set the log level (requires Cbc 2.10+)
 
 ```ruby
 model.solve(log_level: 1) # 0 = off, 3 = max
 ```
 
-Set the time limit in seconds (requires Cbc 2.10.0+)
+Set the time limit in seconds (requires Cbc 2.10+)
 
 ```ruby
 model.solve(time_limit: 30)

data/lib/cbc/ffi.rb

@@ -66,7 +66,16 @@ module Cbc
     extern "int Cbc_isProvenOptimal(Cbc_Model *model)"
     extern "int Cbc_isProvenInfeasible(Cbc_Model *model)"
     extern "int Cbc_isContinuousUnbounded(Cbc_Model *model)"
+    extern "int Cbc_isNodeLimitReached(Cbc_Model * model)"
+    extern "int Cbc_isSecondsLimitReached(Cbc_Model * model)"
+    extern "int Cbc_isSolutionLimitReached(Cbc_Model * model)"
+    extern "int Cbc_isInitialSolveAbandoned(Cbc_Model * model)"
+    extern "int Cbc_isInitialSolveProvenOptimal(Cbc_Model * model)"
+    extern "int Cbc_isInitialSolveProvenPrimalInfeasible(Cbc_Model * model)"
     extern "double Cbc_getObjValue(Cbc_Model *model)"
+    extern "double Cbc_getBestPossibleObjValue(Cbc_Model * model)"
+    extern "int Cbc_getNodeCount(Cbc_Model * model)"
+    extern "void Cbc_printSolution(Cbc_Model * model)"
     extern "int Cbc_status(Cbc_Model *model)"
     extern "int Cbc_secondaryStatus(Cbc_Model *model)"
 

data/lib/cbc/model.rb

@@ -2,7 +2,7 @@ module Cbc
   class Model
     def initialize
       @model = FFI.Cbc_newModel
-      ObjectSpace.define_finalizer(self, self.class.finalize(@model))
+      @model.free = FFI["Cbc_deleteModel"]
 
       @below210 = Gem::Version.new(Cbc.lib_version) < Gem::Version.new("2.10.0")
       FFI.Cbc_setLogLevel(model, 0) unless @below210
@@ -69,10 +69,18 @@ module Cbc
 
       ret_status =
         case status
-        when :not_started, :finished
-          if FFI.Cbc_isProvenOptimal(model)
+        when :not_started
+          if FFI.Cbc_isInitialSolveProvenOptimal(model) != 0
             :optimal
-          elsif FFI.Cbc_isProvenInfeasible(model)
+          elsif FFI.Cbc_isInitialSolveProvenPrimalInfeasible(model) != 0
+            :primal_infeasible
+          else
+            secondary_status
+          end
+        when :finished
+          if FFI.Cbc_isProvenOptimal(model) != 0
+            :optimal
+          elsif FFI.Cbc_isProvenInfeasible(model) != 0
             :infeasible
           else
             secondary_status
@@ -88,11 +96,6 @@ module Cbc
       }
     end
 
-    def self.finalize(model)
-      # must use proc instead of stabby lambda
-      proc { FFI.Cbc_deleteModel(model) }
-    end
-
     private
 
     def model

data/lib/cbc/version.rb

@@ -1,3 +1,3 @@
 module Cbc
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/cbc.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 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: Mixed-integer programming for Ruby