red-palette 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f12b7fc4cf789b440ea06399e24819d4579a78ad85d13cd9f39098470ff52c1c
-  data.tar.gz: 73cce0dfa74982c73d927f548313a46a46310060423cfda3e848b3710c8adb34
+  metadata.gz: 3122a06d16fd374d4d82abe074c2dbff00a2b75f546f785c9cc72ded5d0a2148
+  data.tar.gz: d4003bbc74cdfdaddf32775b07d2870f1b3f4f3c23da36ec1735a23f007802be
 SHA512:
-  metadata.gz: 4b7e09883c5eb529d2c999aca1c297655d6d162fb3f49af18272dc29e947e1573597447f0d09e1e4592c1d02c444fc7c4200335fe814e362167251f2bba4beea
-  data.tar.gz: 1c017fc86fc8cfc3b178773ae17235e0094d215a382abc61e161fd3223fc9c84dda2caf24cf266b84b824ecfec02070510934a793c42d4bc3a88f9a0620cc7a2
+  metadata.gz: 73d4618b458ddfec249662b3b3082ce61a3482671f8f6d26365fe510dc7fd9f3b6e3c78ea7eb9ddacff856184e376aa0957d3d0f4b5f7faa465e1ee584e29fcb
+  data.tar.gz: e0c74affc25e2f964c6f076caa739c7431d7b0c6957912198cfe2a930fafabdfc30bce259eda1e4a2333d070f2032f3b912a1ff0da83a6dc817364bd9b57254c

data/lib/palette.rb

@@ -70,6 +70,42 @@ class Palette
     @desaturate_factor = desaturate_factor
   end
 
+  private def parse_cubehelix_args(str)
+    if str.start_with?("ch:")
+      str = str[3..-1]
+    end
+    if str.end_with?("_r")
+      reverse = true
+      str = str[0..-3]
+    else
+      reverse = false
+    end
+    if str.empty?
+      return [], {reverse: reverse}
+    end
+
+    short_key_map = {
+      "s" => :start, "r" => :rot,   "g" => :gamma,
+      "h" => :hue,   "l" => :light, "d" => :dark
+    }
+
+    all_args = str.split(",")
+    args, kwargs = [], {}
+    all_args.each do |a|
+      if a.include? "="
+        key, value = a.split("=")
+        key = short_key_map.fetch(key.strip, key).to_sym
+        kwargs[key] = Float(value.strip)
+      else
+        args << Float(a.strip)
+      end
+    end
+
+    kwargs[:reverse] = true if reverse
+
+    return args, kwargs
+  end
+
   attr_reader :name, :colors, :desaturate_factor
 
   def n_colors
@@ -88,11 +124,15 @@ class Palette
   end
 
   def [](i)
-    @palette[i % n_colors]
+    @colors[i % n_colors]
+  end
+
+  def to_colormap(n=self.n_colors)
+    Colors::ListedColormap.new(colors, n_colors: n)
   end
 
   def to_ary
-    @palette.dup
+    @colors.dup
   end
 
   def to_iruby

data/lib/palette/colors.rb

@@ -53,10 +53,30 @@ class Palette
     (0...n_colors).map {|i| Colors::HUSL.new(hues[i], s, l) }
   end
 
-  def self.cubehelix_colors(n_colors, start=0, rot=0.4r, gamma=1.0r, hue=0.8r,
-                             light=0.85r, dark=0.15r, reverse=false, as_cmap: false)
-    raise NotImplementedError,
-          "Cubehelix palette has not been implemented"
+  def self.cubehelix_colors(n_colors=6, start: 0, rot: 0.4r, gamma: 1.0r, hue: 0.8r,
+                             light: 0.85r, dark: 0.15r, reverse: false)
+    get_color_function = ->(p0, p1) do
+      color = -> (x) do
+        xg = x ** gamma
+        a = hue * xg * (1 - xg) / 2
+        phi = 2 * Math::PI * (start / 3 + rot * x)
+        return xg + a * (p0 * Math.cos(phi) + p1 * Math.sin(phi))
+      end
+      return color
+    end
+
+    segmented_data = {
+      red:   get_color_function.(-0.14861, 1.78277),
+      green: get_color_function.(-0.29227, -0.90649),
+      blue:  get_color_function.(1.97294, 0.0),
+    }
+
+    cmap = Colors::LinearSegmentedColormap.new("cubehelix", segmented_data)
+
+    x = Helper.linspace(light, dark, n_colors)
+    pal = cmap[x]
+    pal.reverse! if reverse
+    pal
   end
 
   def self.matplotlib_colors(name, n_colors=6)

data/lib/palette/version.rb

@@ -1,3 +1,3 @@
 class Palette
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/red-palette.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.files += Dir.glob("doc/text/*")
   spec.test_files += Dir.glob("test/**/*")
 
-  spec.add_dependency("red-colors")
+  spec.add_dependency("red-colors", ">= 0.2.0")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/test/palette_test.rb

@@ -122,8 +122,26 @@ class PaletteTest < Test::Unit::TestCase
     end
   end
 
-  test(".cubehelix_colors") do
-    omit("Not implemented yet")
+  sub_test_case(".cubehelix_colors") do
+    data do
+      expected = [
+        Colors::RGBA.new(0.9312692223325372r,  0.8201921796082118r,  0.7971480974663592r,  1.0r),
+        Colors::RGBA.new(0.8559578605899612r,  0.6418993116910497r,  0.6754191211563135r,  1.0r),
+        Colors::RGBA.new(0.739734329496642r,   0.4765280683170713r,  0.5959617419736206r,  1.0r),
+        Colors::RGBA.new(0.57916573903086r,    0.33934576125314425r, 0.5219003947563425r,  1.0r),
+        Colors::RGBA.new(0.37894937987024996r, 0.2224702044652721r,  0.41140014301575434r, 1.0r),
+        Colors::RGBA.new(0.1750865648952205r,  0.11840023306916837r, 0.24215989137836502r, 1.0r)
+      ]
+      expected.map.with_index { |color, i|
+        ["colors[#{i}]", {i: i, expected_color: color}]
+      }.to_h
+    end
+    test("default parameters") do |data|
+      i, expected_color = data.values_at(:i, :expected_color)
+      colors = Palette.cubehelix_colors()
+      assert_near(expected_color,
+                  colors[i])
+    end
   end
 
   sub_test_case(".matplotlib_colors") do
@@ -147,4 +165,20 @@ class PaletteTest < Test::Unit::TestCase
     assert_near(Colors::HSLA.new(120r, 0.8r, 0.5r, 0x99/255r).to_rgba,
                 desaturated_colors[1])
   end
+
+  test("to_colormap") do
+    cmap = Palette.new(["#ff0000", "#00ff00", "#0000ff"]).to_colormap
+    assert_equal([
+                   Colors::ListedColormap,
+                   "#ff0000ff",
+                   "#00ff00ff",
+                   "#0000ffff"
+                 ],
+                 [
+                   cmap.class,
+                   cmap[0].to_hex_string,
+                   cmap[1].to_hex_string,
+                   cmap[2].to_hex_string
+                 ])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-palette
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-colors
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement