scs 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6336ca9d1433f92e77c259062923fa2ce96888d215a6070b5e780730b621571a
-  data.tar.gz: 264f3030f2ddf34565c33dba5d1af5dc6ac8bc11f7ef1f4cf9130646825b48b5
+  metadata.gz: cf0730fd042983c36ce96ea46ad28c0a330c5765e1521f8cfb28eb3321507df9
+  data.tar.gz: 677ebb1dc72dc2c1e51857c8644a11e91f9a332c95574ee8c452e31f36f4ec88
 SHA512:
-  metadata.gz: 6a8ffbd1707be25370186a84542eec3b37f13e452a7f202b04c1386c11fb0df05ccadf86d4268a926cae2266e6b21daf3f19925731bf71eb934360e5772f7b9a
-  data.tar.gz: 850a9e91d62bade7ac1e644745f7eb3b9194d09f894ed6e54f29ab3923d746a8f6ee641c99789f9a0768563e280654b585293ff9bbd9ada09a9f613d4155434a
+  metadata.gz: 889d538aba521314bc093e11fc584eb58f519116f72fedcab865b9a49a44fec44eaffbc20e28d1f2673c294922474c7ccc91f7ee7f0b08243c9e20ae52150e3c
+  data.tar.gz: 25ca5f1af62a227f1f05c34031d8f1554e1b9121c2d8c43bb40c4bd12d0af5d106b73a601f8abb8a3849fbdcde310b51a2fecfe17bb9e4bba4d3a70e5fd59fff

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.2 (2020-07-21)
+
+- Updated SCS to 2.1.2
+
 ## 0.2.1 (2019-11-29)
 
 - Fixed installation on Windows

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019 Andrew Kane
+Copyright (c) 2019-2020 Andrew Kane
 
 MIT License
 

data/lib/scs/solver.rb

@@ -44,11 +44,6 @@ module SCS
       raise Error, "Error code #{ret}" if ret != 0
     end
 
-    def read_string(char_ptr)
-      idx = char_ptr.index { |v| v == 0 }
-      char_ptr[0, idx].map(&:chr).join
-    end
-
     def float_array(arr)
       # SCS float = double
       Fiddle::Pointer[arr.to_a.pack("d*")]

data/lib/scs/version.rb

@@ -1,3 +1,3 @@
 module SCS
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/vendor/scs/README.md

@@ -12,7 +12,9 @@ and can be used in other C, C++,
 [Python](https://github.com/bodono/scs-python),
 [Matlab](https://github.com/bodono/scs-matlab),
 [R](https://github.com/bodono/scs-r),
-[Julia](https://github.com/JuliaOpt/SCS.jl), programs via the linked
+[Julia](https://github.com/JuliaOpt/SCS.jl), and
+[Ruby](https://github.com/ankane/scs),
+programs via the linked
 interfaces. It can also be called as a solver from convex optimization
 toolboxes [CVX](http://cvxr.com/cvx/) (3.0 or later),
 [CVXPY](https://github.com/cvxgrp/cvxpy),

data/vendor/scs/src/scs.c

@@ -625,15 +625,16 @@ static void print_footer(const ScsData *d, const ScsCone *k, ScsSolution *sol,
 
 static scs_int has_converged(ScsWork *w, ScsResiduals *r, scs_int iter) {
   scs_float eps = w->stgs->eps;
-  if (r->res_pri < eps && r->res_dual < eps && r->rel_gap < eps) {
+  if (isless(r->res_pri, eps) && isless(r->res_dual, eps) &&
+      isless(r->rel_gap, eps)) {
     return SCS_SOLVED;
   }
   /* Add iter > 0 to avoid strange edge case where infeasible point found
    * right at start of run `out/demo_SOCP_indirect 2 0.1 0.3 1506264403` */
-  if (r->res_unbdd < eps && iter > 0) {
+  if (isless(r->res_unbdd, eps) && iter > 0) {
     return SCS_UNBOUNDED;
   }
-  if (r->res_infeas < eps && iter > 0) {
+  if (isless(r->res_infeas, eps) && iter > 0) {
     return SCS_INFEASIBLE;
   }
   return 0;
@@ -747,7 +748,9 @@ static ScsWork *init_work(const ScsData *d, const ScsCone *k) {
   if (!(w->accel =
             aa_init(2 * (w->m + w->n + 1), ABS(w->stgs->acceleration_lookback),
                     w->stgs->acceleration_lookback >= 0))) {
-    scs_printf("WARN: aa_init returned NULL, no acceleration applied.\n");
+    if (w->stgs->verbose) {
+      scs_printf("WARN: aa_init returned NULL, no acceleration applied.\n");
+    }
   }
   return w;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: SCS - the splitting conic solver - for Ruby