gray_scott_gtk3 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4f58211b0ab0cd8b0bbc3fdab15dadc240f4f2fb9cb4b22d6d49d85e696d7a
-  data.tar.gz: d0d8fc77fae048d5fd9250805cf202c4e35a9d5799c26a3ae5ad65f8e87c90c3
+  metadata.gz: 2d6144fd61b89a4f478d3551ed4648ce9fe10bba4b6c61b0dcb40aa596c21d82
+  data.tar.gz: 8cb60d9a0a48f7abbaae085fc11e8d1347d39879108ca904d0d809b464dedef9
 SHA512:
-  metadata.gz: 57eb46e7262c6fa35cd4937bb849731c685bdb312f0c5066ee71c51a87bced2709fbae0428aa2040ae1c492f8f663596989dcbff82612df93fb430bde934356d
-  data.tar.gz: 56fe55ecdf81df295cae9c1e02f48839c403abb2586d82cfefcb918a5308eada89625b788dc0dec772f0b6bce1924015aff720f5c423997dc2881657660cab61
+  metadata.gz: '099e6543d57bdd095f6ff28ee74291dbca5ab089a07d7b304c9b91afe28583d2f71686fb66f97f8434c3e9b4ddeb5544890b6ac9b710944c8c3c04e0a24887ba'
+  data.tar.gz: 629899205425c0d7caab3c62f4adeec2e6694d66fa33bd22e6674045c787c02ce40f065855785a42a1515a5803bbf687477843d18b53885036af920c5f54c1a7

data/README.md

@@ -1,46 +1,31 @@
 # Gray-Scott
 
-![screenshot](https://raw.githubusercontent.com/kojix2/Gray-Scott/screenshot/screenshot/screenshot.gif)
-
-## 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

data/gray_scott_gtk3.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'gtk3'
   spec.add_dependency 'numo-narray'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
 end

data/lib/gray_scott/color.rb

@@ -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/model.rb

@@ -1,5 +1,4 @@
 module GrayScott
-
   # Gray-Scott model
   class Model
     include XumoShortHand

data/lib/gray_scott/version.rb

@@ -1,3 +1,3 @@
 module GrayScott
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gray_scott_gtk3
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gray-Scott model.