gray_scott_gtk3 0.5.3 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4f58211b0ab0cd8b0bbc3fdab15dadc240f4f2fb9cb4b22d6d49d85e696d7a
-  data.tar.gz: d0d8fc77fae048d5fd9250805cf202c4e35a9d5799c26a3ae5ad65f8e87c90c3
+  metadata.gz: 4b05f0ded43ea9aacb610353610ceee7467ea79e9780910b99aca883268a2e5a
+  data.tar.gz: 478e33120c796fa6c4d05f353d7e5193b83d94cabd94936966df41d128fcf84e
 SHA512:
-  metadata.gz: 57eb46e7262c6fa35cd4937bb849731c685bdb312f0c5066ee71c51a87bced2709fbae0428aa2040ae1c492f8f663596989dcbff82612df93fb430bde934356d
-  data.tar.gz: 56fe55ecdf81df295cae9c1e02f48839c403abb2586d82cfefcb918a5308eada89625b788dc0dec772f0b6bce1924015aff720f5c423997dc2881657660cab61
+  metadata.gz: 48b77d17fce3734b60a27521f478bad40a8fb7caada166ddcf7f49a6f95529366220eb1d8880a869c6464c8c595129a86fda68a84b2f2f826c68ac96179053b4
+  data.tar.gz: 586fb519f89010e7c72decfcb9610c5348d17597c258e1997d5bc131f2b57d40df7e682daf55dd9403cd0ea04ab3db23fb65cdfd18c671cfb3b588a02f45fd51

data/.github/FUNDING.yml

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

data/.github/workflows/ci.yml

@@ -0,0 +1,21 @@
+name: test
+on: [push, pull_request]
+jobs:
+  build:
+    name: ${{ matrix.os }} Ruby ${{ matrix.ruby }}
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      matrix:
+        os:   [ 'ubuntu' ]
+        ruby: [ '2.6', '2.7', '3.0' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: |
+          sudo apt install -y xvfb libgtk-3-0
+      - run: | 
+          bundle install
+      - run: |
+          xvfb-run bundle exec rake spec

data/.gitignore

@@ -1,55 +1,7 @@
 *.gem
 *.rbc
 *.glade~
-/.config
 /coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
 /tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
 Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# rspec
-/spec/reports/
 .rspec_status

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/README.md

@@ -1,52 +1,41 @@
 # Gray-Scott
 
-![screenshot](https://raw.githubusercontent.com/kojix2/Gray-Scott/screenshot/screenshot/screenshot.gif)
+[![Gem](https://img.shields.io/gem/v/gray_scott_gtk3)](https://rubygems.org/gems/gray_scott_gtk3)
+[![build status](https://travis-ci.com/kojix2/Gray-Scott.svg?branch=master)](https://travis-ci.com/github/kojix2/Gray-Scott)
+[![DOI](https://zenodo.org/badge/158914232.svg)](https://zenodo.org/badge/latestdoi/158914232)
 
-## Requirements
+Ruby implementation of the Reaction diffusion system (Gray-Scott model).
 
-* Ruby
-* Numo/NArray (CPU)
-  * Cumo/NArray (GPU)
-* Ruby/Gtk3
+![screenshot](https://raw.githubusercontent.com/kojix2/Gray-Scott/screenshot/screenshot/screenshot.gif)
 
 ## Installation
 
-$ gem install gray_scott_gtk3
+```bash
+gem install gray_scott_gtk3
+```
 
 ## Usage
 
-$ grayscott
-
-$ grayscott -w 256 -h 256 # size of model. display is fixed to 512 x 512 pixels.
-
-## Usage with terminal(example)
-
-$ bundle install
-
-$ bundle exec bin/console
-
-```ruby
-c = GrayScott::Controller.new 'resources/', width:1024, height:1024
+```bash
+grayscott
+```
 
-# custom feed / kill ratio
-na = Numo::SFloat.new(1024,1).seq + 10 # avoid zero
-na = na * Numo::SFloat.ones(1, 1024)
-na = na / na.max
-f = na * 0.05
-k = na.transpose * 0.06 + 0.01
-c.model.f = f
-c.model.k = k
-c.model.v.rand(0.0, 0.15)
-c.color = 'reverse_green' # colorful is slow. 
-Gtk.main
+```bash
+grayscott --help
+# Usage: grayscott [options]
+#    -h, --height val                 height of the model
+#    -w, --width val                  width of the model
+#    -g, --gpu                        use GPU(Cumo)
 ```
 
+NOTE : You can set the width and height of the model, but the width and height of the window is fixed at 512 x 512 pixels.
+
 ![screenshot](https://raw.githubusercontent.com/kojix2/Gray-Scott/screenshot/screenshot/reverse-green.png)
 
 ## Known issue
 
 Glib::Timeout.add(number_of_seconds)
-If processing can not be completed within the time, it will not be displayed. 
+If processing can not be completed within the time, it will not be displayed.
 In this case, you should increase the number of seconds.
 
 ## Contributing

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/exe/grayscott

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'optparse'
 
-opt = {}
+opt = { width: 256, height: 256 }
 OptionParser.new do |op|
-  op.on('-h val', '--height', 'height of the model') { |v| opt[:height] = v.to_i }
-  op.on('-w val', '--width', 'width of the model') { |v| opt[:width] = v.to_i }
+  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.parse!(ARGV)
 end
@@ -19,7 +20,7 @@ module GrayScott
   class << self
     def run(opt)
       xml_path = File.expand_path('../resources/', __dir__)
-      Controller.new(xml_path, opt)
+      Controller.new(xml_path, height: opt[:height], width: opt[:width])
       Gtk.main
     end
   end

data/gray_scott_gtk3.gemspec

@@ -1,6 +1,6 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gray_scott/version'
+# frozen_string_literal: true
+
+require_relative 'lib/gray_scott/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'gray_scott_gtk3'
@@ -12,19 +12,17 @@ Gem::Specification.new do |spec|
   spec.description   = 'Reaction diffusion system (Gray-Scott model).'
   spec.homepage      = 'https://github.com/kojix2/Gray-Scott'
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = ['grayscott']
   spec.require_paths = ['lib']
 
   spec.add_dependency 'gtk3'
   spec.add_dependency 'numo-narray'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 end

data/lib/gray_scott/color.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
+
 module GrayScott
   module Color
-    include XumoShortHand
-
     def colorize(ar, color_type)
       case color_type
       when 'colorful'
@@ -25,23 +25,31 @@ module GrayScott
       end
     end
 
+    # speed
+    def uInt8_dstack(ar)
+      x = UInt8.zeros(*ar[0].shape, 3)
+      x[true, true, 0] = ar[0]
+      x[true, true, 1] = ar[1]
+      x[true, true, 2] = ar[2]
+      x
+    end
+
     def hsv2rgb(h)
-      height, width = h.shape
       i = UInt8.cast(h * 6)
       f = (h * 6.0) - i
-      p = UInt8.zeros height, width, 1
-      v = UInt8.new(height, width, 1).fill 255
+      p = UInt8.zeros(*h.shape)
+      v = UInt8.new(*h.shape).fill 255
       q = (1.0 - f) * 256
       t = f * 256
-      rgb = UInt8.zeros height, width, 3
-      t = UInt8.cast(t).expand_dims(2)
-      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]
-      rgb[i.eq 2] = UInt8.dstack([p, v, t])[i.eq 2]
-      rgb[i.eq 3] = UInt8.dstack([p, q, v])[i.eq 3]
-      rgb[i.eq 4] = UInt8.dstack([t, p, v])[i.eq 4]
-      rgb[i.eq 5] = UInt8.dstack([v, p, q])[i.eq 5]
+      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]
+      rgb[i.eq 2] = uInt8_dstack([p, v, t])[i.eq 2]
+      rgb[i.eq 3] = uInt8_dstack([p, q, v])[i.eq 3]
+      rgb[i.eq 4] = uInt8_dstack([t, p, v])[i.eq 4]
+      rgb[i.eq 5] = uInt8_dstack([v, p, q])[i.eq 5]
       rgb
     end
 
@@ -71,7 +79,7 @@ module GrayScott
 
     def grayscale(ar)
       d = ar * 255
-      UInt8.dstack([d,d,d])
+      uInt8_dstack([d, d, d])
     end
 
     private

data/lib/gray_scott/controller/aboutdialog.rb

@@ -1,14 +1,21 @@
+# frozen_string_literal: true
+
 module GrayScott
   class Controller
     class AboutDialog
       def initialize(resource_dir)
-        @a = Gtk::AboutDialog.new
-        @a.program_name = 'Gray-Scott'
-        @a.logo = GdkPixbuf::Pixbuf.new(file: File.join(resource_dir, 'about_icon.png'))
-        @a.authors = ['kojix2']
-        @a.version = GrayScott::VERSION
-        @a.run
-        @a.destroy
+        Gtk::AboutDialog.new.tap do |d|
+          d.program_name = 'Gray-Scott'
+          d.comments = 'Reaction diffusion system'
+          d.logo = GdkPixbuf::Pixbuf.new(file: File.join(resource_dir, 'about_icon.png'))
+          d.copyright = 'Copyright (C) kojix2'
+          d.authors = ['kojix2']
+          d.version = GrayScott::VERSION
+          d.website = 'https://github.com/kojix2/Gray-Scott'
+          d.website_label = 'Github kojix2/Gray-Scott'
+          d.run
+          d.destroy
+        end
       end
     end
   end

data/lib/gray_scott/controller.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require_relative 'controller/aboutdialog'
 
 module GrayScott
   class Controller
     include Color
-    include XumoShortHand
     attr_accessor :resource_dir, :height, :width, :model, :color
 
     def initialize(dir, height: 256, width: 256)
@@ -13,14 +14,14 @@ module GrayScott
       @model = Model.new(height: height, width: width)
       @show_u = false
       @color = 'colorful'
-      @frames = 1
+      @frames = 5
       @msec = 40
 
       builder = Gtk::Builder.new
       builder.add_from_file File.join(resource_dir, 'gray_scott.glade')
 
       %w[win execute_button gimage legend_image uv_combobox pen_density pen_radius].each do |s|
-        instance_variable_set('@' + s, builder.get_object(s))
+        instance_variable_set("@#{s}", builder.get_object(s))
       end
 
       builder.connect_signals { |handler| method(handler) }

data/lib/gray_scott/model.rb

@@ -1,9 +1,8 @@
-module GrayScott
+# frozen_string_literal: true
 
+module GrayScott
   # Gray-Scott model
   class Model
-    include XumoShortHand
-
     Dx = 0.01
 
     # Delta t is the change in time for each iteration

data/lib/gray_scott/utils/math.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrayScott
   module Utils
     module Math

data/lib/gray_scott/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrayScott
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.5.7'
 end

data/lib/gray_scott.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'gtk3'
 
+# Support for Cumo
 if Object.const_defined? :Cumo
   Xumo = Cumo
 else
@@ -7,13 +10,14 @@ else
   Xumo = Numo
 end
 
-module XumoShortHand
-  class Xumo::SFloat
+# Monkey patch
+module Xumo
+  class SFloat
     alias _ inplace
   end
-  SFloat = Xumo::SFloat
-  UInt8  = Xumo::UInt8
 end
+SFloat = Xumo::SFloat
+UInt8  = Xumo::UInt8
 
 require 'gray_scott/model'
 require 'gray_scott/color'