clp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e2766ba9c5090563dd6534448cafcddb24affc2914cfe428671c1974ab7a07
-  data.tar.gz: 98d8951377b92b09c6df285e55117b7ac4d81c1836b54dcf9912b1ed059849de
+  metadata.gz: 1c01ab7d7209bb40c13fe725a54180e7001bd3eff8c406c83e9edb8fa0d686f9
+  data.tar.gz: 9a82639091ecc4cfb4029c7c4ff60ff3913b57cd010e2e21a67580a94b98e6ca
 SHA512:
-  metadata.gz: dbe28bb36c4c55ed5d39d2f6be0c3a2302ff069662c03e3aff4b197a7a63db82cf1c7cac1b8e7ebb6ef9f6d5a840e9b7f964ff3fa8421b1d8b468d1d33eada48
-  data.tar.gz: 5379acb441756aaec7d2c12e3685203c992cb4f14430a75c382fb8bca0e4fd5556012af71ff80f9f2c4cbfa0c77bae29e98cbfc3718e7c8599a0262823a04d6a
+  metadata.gz: e267c07368a63e59e45eceba7dc008b7192fd65ef33e8fe87ba2517f490a7727388414ad9640ccd1f6adc04613440513b77c911440e9205c7489234bc1ec4c8d
+  data.tar.gz: 21578e3dcd102e122ba217adfa41a1c6b6302d13cc26cb13ea054c64ea6c1181f7ae3200090884d24aa04914a284e476b8a13c8446dd0d0b8c3ff6b29f0241ab

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.1 (2022-04-06)
+
+- Fixed shared library detection on Linux
+- Fixed error with Clp < 1.17.2
+
 ## 0.1.0 (2022-04-05)
 
 - First release

data/README.md

@@ -18,7 +18,7 @@ And for Ubuntu, use:
 sudo apt-get install coinor-libclp1
 ```
 
-Add this line to your application’s Gemfile:
+Then add this line to your application’s Gemfile:
 
 ```ruby
 gem "clp"
@@ -51,7 +51,7 @@ Solve
 model.solve
 ```
 
-Write the problem to an MPS file
+Write the problem to an MPS file (requires Clp 1.17.2+)
 
 ```ruby
 model.write_mps("hello.mps")

data/lib/clp/ffi.rb

@@ -33,7 +33,9 @@ module Clp
     # load models
     extern "void Clp_loadProblem(Clp_Simplex *model, int numcols, int numrows, CoinBigIndex *start, int *index, double *value, double *collb, double *colub, double *obj, double *rowlb, double *rowub)"
     extern "int Clp_readMps(Clp_Simplex *model, char *filename, int keepNames, int ignoreErrors)"
-    extern "int Clp_writeMps(Clp_Simplex *model, char *filename, int formatType, int numberAcross, double objSense)"
+    if Gem::Version.new(FFI.Clp_Version.to_s) >= Gem::Version.new("1.17.2")
+      extern "int Clp_writeMps(Clp_Simplex *model, char *filename, int formatType, int numberAcross, double objSense)"
+    end
 
     # getters and setters
     extern "int Clp_numberRows(Clp_Simplex *model)"

data/lib/clp/model.rb

@@ -28,6 +28,9 @@ module Clp
     end
 
     def write_mps(filename)
+      unless FFI.respond_to?(:Clp_writeMps)
+        raise Error, "This feature requires Clp 1.17.2+"
+      end
       check_status FFI.Clp_writeMps(model, filename, 0, 1, 0)
     end
 

data/lib/clp/version.rb

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

data/lib/clp.rb

@@ -13,13 +13,16 @@ module Clp
   end
   lib_name =
     if Gem.win_platform?
-      "clp.dll"
+      # TODO test
+      ["Clp.dll"]
     elsif RbConfig::CONFIG["host_os"] =~ /darwin/i
-      "libclp.dylib"
+      ["libClp.dylib"]
     else
-      "libclp.so"
+      # coinor-libclp-dev has libClp.so
+      # coinor-libclp1 has libClp.so.1
+      ["libClp.so", "libClp.so.1"]
     end
-  self.ffi_lib = [lib_name]
+  self.ffi_lib = lib_name
 
   # friendlier error message
   autoload :FFI, "clp/ffi"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane