gray_scott_gtk3 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 977bfb0ebc9dffd914937d8e21d1613d71a014d401ec0410d32409597782d810
-  data.tar.gz: ce741a4ec404192dd1a7548576a9cd177f034c441e5912a27ecbe0c359434f73
+  metadata.gz: 179cfc87ecf774d201705002979b4cfa98100c68cff099787a4c743af0d91927
+  data.tar.gz: 90c0a010a021a31aaaeacbd1de9ac96c9a646547746aec8291d377f81d61c07d
 SHA512:
-  metadata.gz: e400b79c6dd8cf90f0aac55bc13c5932f51d411720b85db205ab71dbc560860c51c17a9bdc32df8e65898c0eb63df00318d644b8af19b9a55ca4814a81746a8b
-  data.tar.gz: 366eadb5b58d84a6901ed9d1bb411b1cc2ffcaf39db18856701528b9ab83b7981d079bbaec202e7e787360b768e36d6c14210a55777e2c1fa8177a9892c972e1
+  metadata.gz: 5fc89498db5aff1cffd9ad6562dcc9d03198019a52d71de9429c7a90cf2bb5806786b213c64a83424568c05cb820a4aab4bf86221a45f3741f77f971c56e2b4a
+  data.tar.gz: cf051081312ad9ac1455abac4f147ec74f76bd8ce6ee91dedfd32841f87aad56d97ef410b2339824dd7c6cafb2d3850b7284ad86bf7aed0e352c1e94cc8cd7ac

data/.github/FUNDING.yml

@@ -1,2 +1 @@
-github: kojix2
 ko_fi: kojix2

data/.github/workflows/ci.yml

@@ -6,16 +6,18 @@ jobs:
     runs-on: ${{ matrix.os }}-latest
     strategy:
       matrix:
-        os:   [ 'ubuntu' ]
-        ruby: [ '2.6', '2.7', '3.0' ]
+        os: ["ubuntu"]
+        ruby: ["3.2", "3.3"]
     steps:
-      - uses: actions/checkout@v2
+      - run: |
+          sudo apt-get update -yq
+          sudo apt-get install -y libgtkd-3-dev libgirepository1.0-dev at-spi2-core xvfb
+      - uses: actions/checkout@v7
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - run: |
-          sudo apt install -y xvfb libgtk-3-0
-      - run: | 
           bundle install
       - run: |
           xvfb-run bundle exec rake spec

data/README.md

@@ -14,7 +14,9 @@ Ruby implementation of the [Reaction diffusion system](https://en.wikipedia.org/
 gem install gray_scott_gtk3
 ```
 
-Support GPGPU with [Cumo](https://github.com/sonots/cumo).
+GPGPU support requires installing [Cumo](https://github.com/sonots/cumo) separately in a compatible CUDA environment.
+
+Saved models use JSON. Models saved by older releases in the unsafe `Marshal` format cannot be opened.
 
 ## Usage
 
@@ -43,3 +45,7 @@ In this case, you should increase the number of seconds.
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/kojix2/Gray-Scott.
+
+    Do you need commit rights to my repository?
+    Do you want to get admin rights and take over the project?
+    If so, please feel free to contact me @kojix2.

data/exe/grayscott

@@ -8,11 +8,19 @@ OptionParser.new do |op|
   op.on('-h val', '--height', 'height of the model', Integer) { |v| opt[:height] = v }
   op.on('-w val', '--width', 'width of the model', Integer) { |v| opt[:width] = v }
   op.on('-g', '--gpu', 'use GPU(Cumo)') { |v| opt[:gpu] = v }
+  op.on_tail('--help', 'show this message') { puts op; exit }
   op.parse!(ARGV)
 end
 
-require 'cumo/narray' if opt[:gpu]
-opt.delete(:gpu)
+abort 'width and height must be integers greater than or equal to 2' unless opt[:width] >= 2 && opt[:height] >= 2
+
+if opt.delete(:gpu)
+  begin
+    require 'cumo/narray'
+  rescue LoadError
+    abort 'GPU support requires the optional cumo gem and a compatible CUDA environment'
+  end
+end
 
 require 'gray_scott'
 

data/gray_scott_gtk3.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'gtk3'
-  spec.add_dependency 'numo-narray'
+  spec.add_dependency 'numo-narray-alt'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/gray_scott/color.rb

@@ -35,14 +35,14 @@ module GrayScott
     end
 
     def hsv2rgb(h)
+      h = h - h.floor
       i = UInt8.cast(h * 6)
       f = (h * 6.0) - i
       p = UInt8.zeros(*h.shape)
       v = UInt8.new(*h.shape).fill 255
-      q = (1.0 - f) * 256
-      t = f * 256
+      q = UInt8.cast((1.0 - f) * 255)
+      t = UInt8.cast(f * 255)
       rgb = UInt8.zeros(*h.shape, 3)
-      t = UInt8.cast(t)
       i = uInt8_dstack([i, i, i])
       rgb[i.eq 0] = uInt8_dstack([v, t, p])[i.eq 0]
       rgb[i.eq 1] = uInt8_dstack([q, v, p])[i.eq 1]
@@ -86,7 +86,7 @@ module GrayScott
 
     def uint8_zeros_256(ch, ar)
       d = UInt8.zeros(*ar.shape, 3)
-      d[true, true, ch] = UInt8.cast(ar * 256)
+      d[true, true, ch] = UInt8.cast(ar * 255)
       d
     end
   end

data/lib/gray_scott/controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 require_relative 'controller/aboutdialog'
 
 module GrayScott
@@ -47,7 +49,7 @@ module GrayScott
     end
 
     def on_msec_changed(msec)
-      @msec = msec.value.to_i
+      @msec = [msec.value.to_i, 1].max
     end
 
     def display
@@ -66,23 +68,34 @@ module GrayScott
       if widget.active?
         execute
       else
-        @doing_now = false
+        stop
       end
     end
 
     def execute
+      return if @timeout_id
+
       @doing_now = true
-      GLib::Timeout.add @msec do
+      @timeout_id = GLib::Timeout.add([@msec, 1].max) do
         @frames.times do
-          model.update
+          model.step
         end
         display
-        @doing_now
+        if @doing_now
+          true
+        else
+          @timeout_id = nil
+          false
+        end
       end
     end
 
     def stop
       @doing_now = false
+      if @timeout_id
+        GLib::Source.remove(@timeout_id)
+        @timeout_id = nil
+      end
       @execute_button.active = false
     end
 
@@ -92,11 +105,13 @@ module GrayScott
                                           action: :open,
                                           buttons: [%i[open accept], %i[cancel cancel]])
       if dialog.run == :accept
-        filename = dialog.filename
-        str = File.read(filename)
-        # TODO: check model
-        @model = Marshal.load(str)
-        display
+        begin
+          @model = load_model(File.read(dialog.filename))
+          @height, @width = @model.u.shape
+          display
+        rescue JSON::ParserError, ArgumentError, KeyError, TypeError => e
+          warn "Unable to open model: #{e.message}"
+        end
       end
       dialog.destroy
     end
@@ -108,9 +123,7 @@ module GrayScott
                                           buttons: [%i[save accept], %i[cancel cancel]])
       dialog.do_overwrite_confirmation = true
       if dialog.run == :accept
-        filename = dialog.filename
-        str = Marshal.dump(model)
-        File.write(filename, str)
+        File.write(dialog.filename, JSON.generate(model_data))
       end
       dialog.destroy
     end
@@ -172,6 +185,52 @@ module GrayScott
 
     private
 
+    def model_data
+      height, width = model.u.shape
+      {
+        version: 1,
+        width: width,
+        height: height,
+        f: model.f,
+        k: model.k,
+        u: model.u.to_a,
+        v: model.v.to_a
+      }
+    end
+
+    def load_model(serialized)
+      data = JSON.parse(serialized)
+      version = data.fetch('version')
+      width = data.fetch('width')
+      height = data.fetch('height')
+      f = data.fetch('f')
+      k = data.fetch('k')
+      u = data.fetch('u')
+      v = data.fetch('v')
+
+      unless version == 1 &&
+             [width, height].all? { |dimension| dimension.is_a?(Integer) && dimension >= 2 } &&
+             [f, k].all? { |value| value.is_a?(Numeric) && value.finite? } &&
+             [u, v].all? { |array| valid_model_array?(array, height, width) }
+        raise ArgumentError, 'invalid model data'
+      end
+
+      Model.new(width: width, height: height).tap do |loaded_model|
+        loaded_model.f = f
+        loaded_model.k = k
+        loaded_model.u = SFloat.cast(u)
+        loaded_model.v = SFloat.cast(v)
+      end
+    end
+
+    def valid_model_array?(array, height, width)
+      array.is_a?(Array) && array.length == height &&
+        array.all? do |row|
+          row.is_a?(Array) && row.length == width &&
+            row.all? { |value| value.is_a?(Numeric) && value.finite? }
+        end
+    end
+
     def debug_p_u
       p model.u
     end

data/lib/gray_scott/model.rb

@@ -17,6 +17,10 @@ module GrayScott
     attr_accessor :f, :k, :u, :v
 
     def initialize(width: 256, height: 256)
+      unless [width, height].all? { |dimension| dimension.is_a?(Integer) && dimension >= 2 }
+        raise ArgumentError, 'width and height must be integers greater than or equal to 2'
+      end
+
       # Feed rate
       @f = 0.04
 
@@ -35,7 +39,7 @@ module GrayScott
       v.fill 0.0
     end
 
-    def update
+    def step
       l_u = Utils::Math._laplacian2d u, Dx
       l_v = Utils::Math._laplacian2d v, Dx
 
@@ -44,10 +48,10 @@ module GrayScott
       dvdt = Dv * l_v + uvv - (f + k) * v
       u._ + (Dt * dudt)
       v._ + (Dt * dvdt)
-      immune_surveillance
+      sanitize
     end
 
-    def immune_surveillance
+    def sanitize
       # clip is better.
       @u[@u.lt 0.00001] = 0.00001
       @u[@u.gt 1] = 1

data/lib/gray_scott/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrayScott
-  VERSION = '0.5.8'
+  VERSION = '0.6.0'
 end

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

data/resources/gray_scott.glade

@@ -25,6 +25,7 @@
     <signal name="value-changed" handler="on_k_changed" swapped="no"/>
   </object>
   <object class="GtkAdjustment" id="msec">
+    <property name="lower">1</property>
     <property name="upper">10000</property>
     <property name="value">40</property>
     <property name="step-increment">1</property>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gray_scott_gtk3
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - kojix2
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -25,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: numo-narray
+  name: numo-narray-alt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -104,12 +103,12 @@ files:
 - lib/gray_scott/model.rb
 - lib/gray_scott/utils/math.rb
 - lib/gray_scott/version.rb
+- renovate.json
 - resources/about_icon.png
 - resources/gray_scott.glade
 homepage: https://github.com/kojix2/Gray-Scott
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -124,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Gray-Scott model.
 test_files: []