cbc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3dcf4c5bbcc2757b6b06c4e15dfcd898bc345b1b15b5633f760e0d3539e607
-  data.tar.gz: a939b6d0d0b8694c5e6e8d3f8d737a07a263dc1decbb1cc0cedcf3795567fda9
+  metadata.gz: b77d0c48415a2615b0bf795b962bee34e7f2265306bdbf621a57fb1351206ecc
+  data.tar.gz: ed1ef4406e42333df474c5b1741ffa35a2653ba66f36a792246fa0b84de1419c
 SHA512:
-  metadata.gz: 608d2f2389cf608e34be2ad1675016177630c28d95fcc3c6ad2643c7a45bca2cf535cc54319031c1037e79a1d09d86d51e77c7fc42705751ccf98c2f56ba6547
-  data.tar.gz: 2e54fe9d70908e10d03d22119697f9c72d2589ba32defa1fafcf48244e0f44ef9a8c4416d548a2d6a522180f7371a71eec6f435327f17a0606d4f38a3a2726db
+  metadata.gz: 8b3d02b70ffd66a09f23e1694093f1479e0ddffee9117ece84ea641efadad458d6389ed0bafe6403e809f68b68c6f3e440909e4c067918ddec9d7f6feaa7c6e2
+  data.tar.gz: 611329db4f441e8717ec7b633b191b5569204b180934dae6e369fe81b0c766fcc2c6b09678dd5f6e5fdcd33a6365fdfb545710f2bc0ba7845a59fc7d55ea8d71

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1 (2022-06-12)
+
+- Fixed status
+
 ## 0.1.0 (2022-04-13)
 
 - First release

data/README.md

@@ -52,15 +52,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 +70,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

@@ -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

data/lib/cbc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org