flex-cartesian 1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b89541266e2ac802592bc652ddbf2edffe1aea4e47ab1d732e2623ad2cc5835b
-  data.tar.gz: d717084b70f95af0e3f5706a426731685cc0cc7ddcba038b15b662d2d3226b3b
+  metadata.gz: f3005b96077c2ec5e9a273bf58c6740fb3715524ca69328523370f1d67db01e9
+  data.tar.gz: 95c612d95526fa4fa2aafa3fe38ab9861e0bb2b442bdec5a34b74bd45ee3180b
 SHA512:
-  metadata.gz: 26b83b8486d89c151ae8fbc23b7ed9c19f5417a582fd6843b9e654264f0e1deb2615686fe6872b053252c9059a843ca416c41a97ccbc546de3da32b0228b7c61
-  data.tar.gz: aa43ccd2936336564a8b14e70a6142167a17db9b93e646ea56445f25b477cd95c8a219fdeac383801c71ea4a07210c00fb1ecbd67d51f18e97afe7ad7b01c8da
+  metadata.gz: 0560a624b178dda3526775093e692a3cb09d032a5b00463ec556bd6a24a4bc51281c0294249f6ae2c0a1070bee8eae8ef4f7f686aed4092ea1f8e33295a4da57
+  data.tar.gz: fabdc19cb4647e2863aceffbf3888c3f274c7df3f1514ff31dd9e94f142506cf67b3715b7d6bac9df8aa504d416ba39282a319d59bb370f9a63e424c389e3e57

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.2.1 - 2025-07-28
+### Fixed
+- When adding function, check if its namesake exists
+
+## 1.2 - 2025-07-23
+## Added
+- Optional progress bar to the function command :run
+
+## 1.1 - 2025-07=22
+### Fixed
+- Dependencies
+
 ## 1.0 - 2025-07-14
 ### Added
 - Optional flad for hiding function from output

data/README.md

@@ -297,7 +297,7 @@ s.func(:add, :time) { |v| v.raw_ping[/min\/avg\/max\/(?:mdev|stddev) = [^\/]+\/(
 s.func(:add, :min) { |v| v.raw_ping[/min\/avg\/max\/(?:mdev|stddev) = ([^\/]+)/, 1]&.to_f } # fetch min time from result
 s.func(:add, :loss) { |v| v.raw_ping[/(\d+(?:\.\d+)?)% packet loss/, 1]&.to_f } # fetch ping loss from result
 
-s.func(:run) # Sweep analysis! Benchmark all possible combinations of parameters
+s.func(:run, progress: true, title: "Pinging") # Sweep analysis! Benchmark all possible combinations of parameters
 
 s.output(format: :csv, file: './result.csv') # save benchmark result as CSV
 
@@ -374,7 +374,7 @@ s.cartesian { |v| puts "#{v.dim1} - #{v.dim2}" }
 
 ### Handling Functions
 ```ruby
-func(command = :print, name = nil, hide: false, &block)
+func(command = :print, name = nil, hide: false, progress: false, title: "calculating functions", &block)
 ```
 - `command`: symbol, one of the following
   - `:add` to add function as a virtual dimension to Cartesian space
@@ -383,6 +383,8 @@ func(command = :print, name = nil, hide: false, &block)
   - `:run` to calculate all the functions defined for Cartesian space
 - `name`: symbol, name of the virtual dimension, e.g. `:my_function`
 - `hide`: flag that hides or shows the function in .output; it is useful to hide intermediate calculations
+- `progress`: show progress bar during `:run`, useful for large Cartesian space
+- `title`: title of the progress bar
 - `block`: a function that receives each vector and returns a computed value
 
 Functions show up in `.output` like additional (virtual) dimensions.

data/lib/flex-cartesian.rb

@@ -59,7 +59,7 @@ class FlexCartesian
     end
   end
 
-def func(command = :print, name = nil, hide: false, &block)
+def func(command = :print, name = nil, hide: false, progress: false, title: "calculating functions", &block)
   case command
   when :add
     raise ArgumentError, "Function name and block required for :add" unless name && block_given?
@@ -86,13 +86,27 @@ def func(command = :print, name = nil, hide: false, &block)
 
   when :run
     @function_results = {}
+
+    if progress
+    bar = ProgressBar.create(title: title, total: size, format: '%t [%B] %p%% %e')
+
     cartesian do |v|
       @function_results[v] ||= {}
       @derived.each do |fname, block|
         @function_results[v][fname] = block.call(v)
       end
+      bar.increment if progress
     end
 
+  else
+    cartesian do |v|
+      @function_results[v] ||= {}
+      @derived.each do |fname, block|
+        @function_results[v][fname] = block.call(v)
+      end
+    end
+  end
+
   else
     raise ArgumentError, "Unknown command for function: #{command.inspect}"
   end
@@ -100,6 +114,11 @@ end
 
   def add_function(name, &block)
     raise ArgumentError, "Block required" unless block_given?
+    if reserved_function_names.include?(name.to_sym)
+      raise ArgumentError, "Function name '#{name}' has been already added"
+    elsif reserved_struct_names.include?(name.to_sym)
+      raise ArgumentError, "Name '#{name}' has been reserved for internal method, you can't use it for a function"
+    end
     @derived[name.to_sym] = block
   end
 
@@ -268,6 +287,14 @@ end
 
 private
 
+  def reserved_struct_names
+    (base_struct_methods = Struct.new(:dummy).methods(false) + Struct.new(:dummy).instance_methods(false)).uniq
+  end
+
+  def reserved_function_names
+    (self.methods + self.class.instance_methods(false)).uniq
+  end
+
   def fmt_cell(value, colorize, width = nil)
     str = case value
           when String then value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flex-cartesian
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.2.1
 platform: ruby
 authors:
 - Yury Rassokhin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-22 00:00:00.000000000 Z
+date: 2025-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize