nlopt 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7b9fe5b30fd9f60c726dccd8edb8859e65eca488cd30e3e252c5ac83eacc4d
-  data.tar.gz: 260121b1a693646f681419086ababd4a569903289b2e2031610af9dd2a1357c7
+  metadata.gz: 602a77cd42c00081de3dede47c44ee742f7e4005e1021147f156748ccd1237d0
+  data.tar.gz: b1bc21d5c4623003966dcc5847faf9e72e9c24036103aee70471c0c55d971753
 SHA512:
-  metadata.gz: af0d54c03bfa3f38c080d65ef8f4ba5b3550085cb1acc8ad5990cb3a052e21e35bd7fa2ac75cfa417f21e4ef0e2dd2a0fb662aee7fe1cb40890463da3b6c1e6f
-  data.tar.gz: b9273f26c650eee060ce9b8228bcc2223ed7a28df4582d903cfff8ba598cd77215529a24078cd668197e23a0bb314e399d01410cd819f7eb892691a21e8c6c93
+  metadata.gz: 107e857772ea0e4ff58ca66d0d94b4343dd096b85645a7718667cb739cfdf7aa57fb34fd848c12ea0151105cdb99af2e59ccdaff436ca62e19a7743277e23255
+  data.tar.gz: 2263fcc3f23bfcd103ff35d4f28357a133e00d82317578649343be47e31018ad7546e23eaffcba9a6061ce40aa936a702028aec6b84533ce4651b9f34969622c

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.1.3 (2025-05-04)
+
+- Fixed memory leaks
+
+## 0.1.2 (2024-12-16)
+
+- Added `add_inequality_constraint` and `add_equality_constraint` methods
+- Added `initial_step` method
+
 ## 0.1.1 (2024-12-15)
 
 - Added more methods

data/lib/nlopt/gradient.rb

@@ -6,12 +6,12 @@ module NLopt
     end
 
     def [](index)
-      check_index(index)
+      index = check_index(index)
       @ptr[index * Fiddle::SIZEOF_DOUBLE, Fiddle::SIZEOF_DOUBLE].unpack1("d")
     end
 
     def []=(index, value)
-      check_index(index)
+      index = check_index(index)
       @ptr[index * Fiddle::SIZEOF_DOUBLE, Fiddle::SIZEOF_DOUBLE] = [value].pack("d")
     end
 
@@ -26,10 +26,13 @@ module NLopt
 
     private
 
-    def check_index(index)
-      if index >= @n
-        raise IndexError, "index #{index} outside of array bounds"
+    def check_index(original_index)
+      index = original_index
+      index += @n if index < 0
+      if index < 0 || index >= @n
+        raise IndexError, "index #{original_index} outside of array bounds"
       end
+      index
     end
   end
 end

data/lib/nlopt/opt.rb

@@ -3,7 +3,7 @@ module NLopt
     attr_reader :last_optimum_value
 
     def initialize(algorithm, n)
-      algorithm = FFI.nlopt_algorithm_from_string(algorithm)
+      algorithm = FFI.nlopt_algorithm_from_string(+algorithm)
       if algorithm < 0
         raise ArgumentError, "Invalid algorithm"
       end
@@ -14,6 +14,9 @@ module NLopt
 
       @opt = FFI.nlopt_create(algorithm, n)
       @opt.free = FFI["nlopt_destroy"]
+
+      @inequality_constraints = []
+      @equality_constraints = []
     end
 
     def dimension
@@ -64,12 +67,26 @@ module NLopt
       out_dptr { |ptr| FFI.nlopt_get_upper_bounds(@opt, ptr) }
     end
 
+    def add_inequality_constraint(fc, tol: 0)
+      cb = objective_callback(fc)
+      check_res FFI.nlopt_add_inequality_constraint(@opt, cb, nil, tol)
+      @inequality_constraints << cb # keep reference
+    end
+
+    def add_equality_constraint(h, tol: 0)
+      cb = objective_callback(h)
+      check_res FFI.nlopt_add_equality_constraint(@opt, cb, nil, tol)
+      @equality_constraints << cb # keep reference
+    end
+
     def remove_inequality_constraints
       check_res FFI.nlopt_remove_inequality_constraints(@opt)
+      @inequality_constraints.clear
     end
 
     def remove_equality_constraints
       check_res FFI.nlopt_remove_equality_constraints(@opt)
+      @equality_constraints.clear
     end
 
     def set_stopval(stopval)
@@ -153,15 +170,15 @@ module NLopt
     end
 
     def set_param(name, val)
-      check_res FFI.nlopt_set_param(@opt, name, val)
+      check_res FFI.nlopt_set_param(@opt, +name, val)
     end
 
     def param(name, defaultval)
-      FFI.nlopt_get_param(@opt, name, defaultval)
+      FFI.nlopt_get_param(@opt, +name, defaultval)
     end
 
     def has_param?(name)
-      FFI.nlopt_has_param(@opt, name) == 1
+      FFI.nlopt_has_param(@opt, +name) == 1
     end
 
     def num_params
@@ -175,7 +192,7 @@ module NLopt
 
     def optimize(init)
       x = alloc_dptr(init)
-      opt_f = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE)
+      opt_f = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
       res = FFI.nlopt_optimize(@opt, x, opt_f)
 
       if res < 0 && res != -4
@@ -207,6 +224,10 @@ module NLopt
       end
     end
 
+    def initial_step(x)
+      out_dptr { |ptr| FFI.nlopt_get_initial_step(@opt, alloc_dptr(x), ptr) }
+    end
+
     def set_population(pop)
       check_res FFI.nlopt_set_population(@opt, pop)
     end
@@ -223,6 +244,10 @@ module NLopt
       FFI.nlopt_get_vector_storage(@opt)
     end
 
+    def to_ptr
+      @opt
+    end
+
     private
 
     def check_res(res)
@@ -241,11 +266,11 @@ module NLopt
 
     def read_dptr(ptr, size = nil)
       size ||= ptr.size
-      ptr.to_s(size).unpack("d*")
+      ptr.to_str(size).unpack("d*")
     end
 
     def out_dptr
-      ptr = Fiddle::Pointer.malloc(dimension * Fiddle::SIZEOF_DOUBLE)
+      ptr = Fiddle::Pointer.malloc(dimension * Fiddle::SIZEOF_DOUBLE, Fiddle::RUBY_FREE)
       res = yield ptr
       check_res res
       read_dptr(ptr)

data/lib/nlopt/version.rb

@@ -1,3 +1,3 @@
 module NLopt
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/nlopt.rb

@@ -33,9 +33,9 @@ module NLopt
   autoload :FFI, "nlopt/ffi"
 
   def self.lib_version
-    major, minor, bugfix = 3.times.map { Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT) }
+    major, minor, bugfix = 3.times.map { Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT, Fiddle::RUBY_FREE) }
     FFI.nlopt_version(major, minor, bugfix)
-    [major, minor, bugfix].map { |v| v.to_s(v.size).unpack1("i") }.join(".")
+    [major, minor, bugfix].map { |v| v.to_str(v.size).unpack1("i") }.join(".")
   end
 
   def self.srand(seed)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nlopt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrew Kane
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -24,7 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -42,7 +40,6 @@ homepage: https://github.com/ankane/nlopt-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -57,8 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Nonlinear optimization for Ruby
 test_files: []