osqp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a723c2590dd5dea89dd98525009db82f6e3bf740e7a47032a822e23bab790eb0
-  data.tar.gz: 4515ead926d38e72843c8193ec67f072d24189108ddcc538ad0c021ccae4c35c
+  metadata.gz: 1b2906722de1daf0e3f2441edee63d8cec2452012cd9fa91634f37418e66f6fc
+  data.tar.gz: ee0cf11cc8ea7d1676843699265ad27623d237940c756fdb9c49c8e404137b37
 SHA512:
-  metadata.gz: ac250fdfa3927134aff7d609456382d3bd9d79e1252e42a2adeba7d79e33db4361c504aa06701bea0cf0fa7d92a843726115af0fcba93734cb619af0883b1068
-  data.tar.gz: 84a1e39d8bbd810e49a0c2ab5dafd897208d87476dbfede8a292482cd74ee078d2e88b11424100b8ae72c6bdfb6c7dc76301ae5d40f513e575d6dea1bb4d851e
+  metadata.gz: 835c7ac35d791e794b7da902a1a248696860ed09d05e8831d0d4b6c54615758f6d930443e1f4b4f21d0b9d10453882653db60e2bda46b107d342a3cda304e889
+  data.tar.gz: 027ec047ca635e1b9f36377921110444a90226dfa85ebeac44ccab5b1945aac2d37f487f7725ba5604f264551f852392855e087c84afd1c39cd7790278fa3c68

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1 (2022-07-05)
+
+- Added `Matrix` class
+
 ## 0.2.0 (2022-06-12)
 
 - Added ARM shared library for Linux

data/README.md

@@ -17,9 +17,9 @@ gem "osqp"
 Prep the problem - here’s how it should be [setup](https://osqp.org/docs/examples/setup-and-solve.html)
 
 ```ruby
-p = [[4, 1], [0, 2]]
+p = OSQP::Matrix.from_dense([[4, 1], [0, 2]])
 q = [1, 1]
-a = [[1, 1], [1, 0], [0, 1]]
+a = OSQP::Matrix.from_dense([[1, 1], [1, 0], [0, 1]])
 l = [1, 0, 0]
 u = [1, 0.7, 0.7]
 ```
@@ -41,16 +41,26 @@ solver.warm_start(x, y)
 
 ## Data
 
-Arrays and matrices can be Ruby arrays
+Matrices can be a sparse matrix
 
 ```ruby
-[[1, 2, 3], [4, 5, 6]]
+a = OSQP::Matrix.new(3, 2)
+a[0, 0] = 1
+a[1, 0] = 2
+# or
+OSQP::Matrix.from_dense([[1, 0], [2, 0], [0, 0]])
+```
+
+Arrays can be Ruby arrays
+
+```ruby
+[1, 2, 3]
 ```
 
 Or Numo arrays
 
 ```ruby
-Numo::NArray.cast([[1, 2, 3], [4, 5, 6]])
+Numo::NArray.cast([1, 2, 3])
 ```
 
 ## Resources

data/lib/osqp/matrix.rb

@@ -0,0 +1,64 @@
+module OSQP
+  class Matrix
+    attr_reader :m, :n
+
+    def initialize(m, n)
+      @m = m
+      @n = n
+      @data = {}
+    end
+
+    def []=(row_index, column_index, value)
+      raise IndexError, "row index out of bounds" if row_index < 0 || row_index >= @m
+      raise IndexError, "column index out of bounds" if column_index < 0 || column_index >= @n
+      if value == 0
+        (@data[column_index] ||= {}).delete(row_index)
+      else
+        (@data[column_index] ||= {})[row_index] = value
+      end
+    end
+
+    def to_ptr
+      cx = []
+      ci = []
+      cp = []
+
+      # CSC format
+      # https://www.gormanalysis.com/blog/sparse-matrix-storage-formats/
+      cp << 0
+      n.times do |j|
+        (@data[j] || {}).sort_by { |k, v| k }.each do |k, v|
+          cx << v
+          ci << k
+        end
+        # cumulative column values
+        cp << cx.size
+      end
+
+      nnz = cx.size
+      cx = Utils.float_array(cx)
+      ci = Utils.int_array(ci)
+      cp = Utils.int_array(cp)
+
+      ptr = FFI.csc_matrix(m, n, nnz, cx, ci, cp)
+      # save refs
+      ptr.instance_variable_set(:@osqp_refs, [cx, ci, cp])
+      ptr
+    end
+
+    def self.from_dense(data)
+      data = data.to_a
+      m = data.size
+      n = m > 0 ? data.first.size : 0
+
+      mtx = Matrix.new(m, n)
+      data.each_with_index do |row, i|
+        raise ArgumentError, "row has different number of columns" if row.size != n
+        row.each_with_index do |v, j|
+          mtx[i, j] = v if v != 0
+        end
+      end
+      mtx
+    end
+  end
+end

data/lib/osqp/solver.rb

@@ -10,16 +10,15 @@ module OSQP
 
       # data
       # do not assign directly to struct to keep refs
-      m, n = shape(a)
       p = csc_matrix(p, upper: true)
-      q = float_array(q)
+      q = Utils.float_array(q)
       a = csc_matrix(a)
-      l = float_array(l)
-      u = float_array(u)
+      l = Utils.float_array(l)
+      u = Utils.float_array(u)
 
       data = FFI::Data.malloc
-      data.n = n
-      data.m = m
+      data.n = a.n
+      data.m = a.m
       data.p = p
       data.q = q
       data.a = a
@@ -74,11 +73,11 @@ module OSQP
       raise Error, "Expected y to be size #{m}, got #{y.size}" if y && y.size != m
 
       if x && y
-        check_result FFI.osqp_warm_start(@work, float_array(x), float_array(y))
+        check_result FFI.osqp_warm_start(@work, Utils.float_array(x), Utils.float_array(y))
       elsif x
-        check_result FFI.osqp_warm_start_x(@work, float_array(x))
+        check_result FFI.osqp_warm_start_x(@work, Utils.float_array(x))
       elsif y
-        check_result FFI.osqp_warm_start_y(@work, float_array(y))
+        check_result FFI.osqp_warm_start_y(@work, Utils.float_array(y))
       else
         raise Error, "Must set x or y"
       end
@@ -114,16 +113,6 @@ module OSQP
       end
     end
 
-    def float_array(arr)
-      # OSQP float = double
-      Fiddle::Pointer[arr.to_a.pack("d*")]
-    end
-
-    def int_array(arr)
-      # OSQP int = long long
-      Fiddle::Pointer[arr.to_a.pack("q*")]
-    end
-
     def read_float_array(ptr, size)
       # OSQP float = double
       ptr[0, size * Fiddle::SIZEOF_DOUBLE].unpack("d*")
@@ -134,39 +123,18 @@ module OSQP
       char_ptr[0, idx].map(&:chr).join
     end
 
-    # TODO add support sparse matrices
     def csc_matrix(mtx, upper: false)
-      mtx = mtx.to_a
-
-      m, n = shape(mtx)
-
-      cx = []
-      ci = []
-      cp = []
-
-      # CSC format
-      # https://www.gormanalysis.com/blog/sparse-matrix-storage-formats/
-      cp << 0
-      n.times do |j|
-        mtx.each_with_index do |row, i|
-          if row[j] != 0 && (!upper || i <= j)
-            cx << row[j]
-            ci << i
+      mtx = Matrix.from_dense(mtx) unless mtx.is_a?(Matrix)
+
+      if upper
+        mtx.m.times do |i|
+          mtx.n.times do |j|
+            mtx[i, j] = 0 if i > j
           end
         end
-        # cumulative column values
-        cp << cx.size
       end
 
-      nnz = cx.size
-      cx = float_array(cx)
-      ci = int_array(ci)
-      cp = int_array(cp)
-
-      ptr = FFI.csc_matrix(m, n, nnz, cx, ci, cp)
-      # save refs
-      ptr.instance_variable_set(:@osqp_refs, [cx, ci, cp])
-      ptr
+      mtx
     end
 
     def dimensions
@@ -174,16 +142,6 @@ module OSQP
       [data.m, data.n]
     end
 
-    def shape(a)
-      if defined?(Matrix) && a.is_a?(Matrix)
-        [a.row_count, a.column_count]
-      elsif defined?(Numo::NArray) && a.is_a?(Numo::NArray)
-        a.shape
-      else
-        [a.size, a.first.size]
-      end
-    end
-
     def create_settings(settings)
       set = FFI::Settings.malloc
       FFI.osqp_set_default_settings(set)

data/lib/osqp/utils.rb

@@ -0,0 +1,15 @@
+module OSQP
+  module Utils
+    class << self
+      def float_array(arr)
+        # OSQP float = double
+        Fiddle::Pointer[arr.to_a.pack("d*")]
+      end
+
+      def int_array(arr)
+        # OSQP int = long long
+        Fiddle::Pointer[arr.to_a.pack("q*")]
+      end
+    end
+  end
+end

data/lib/osqp/version.rb

@@ -1,3 +1,3 @@
 module OSQP
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/osqp.rb

@@ -2,7 +2,9 @@
 require "fiddle/import"
 
 # modules
+require "osqp/matrix"
 require "osqp/solver"
+require "osqp/utils"
 require "osqp/version"
 
 module OSQP

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osqp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org
@@ -22,7 +22,9 @@ files:
 - README.md
 - lib/osqp.rb
 - lib/osqp/ffi.rb
+- lib/osqp/matrix.rb
 - lib/osqp/solver.rb
+- lib/osqp/utils.rb
 - lib/osqp/version.rb
 - vendor/aarch64-linux/LICENSE-amd.txt
 - vendor/aarch64-linux/LICENSE-osqp.txt