red-colors 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c144d5d89c917428d99401b92513852896b2ff109228d85b2ddac5dd40b89fb4
-  data.tar.gz: 8e99f5fadc2068211a0ec92d12ad754ae777efedd23048867c0ad91824fe7a35
+  metadata.gz: 4f5bd8e883bdf940ae77ece7135e3667a5d953534fda4780e344fd9413b59fa7
+  data.tar.gz: c275f21b6223f399f50b4265b32d652753d9a6d5297d1bdff1597aa9c2956371
 SHA512:
-  metadata.gz: 53491ee2e2c97a99c624d5e4d2fc73d9939f68ee9b27f24f54bcf1f3831f87f8cf2d115d4c8b0499e73e2623ad6e045c714f254a4dc33da55dfdf84213b45903
-  data.tar.gz: 1d783343d7536ca570bdbd049d83d92a107450341e03a8f4a390f88abc891d92d67404e198b87ee7555b6abea05610e13f4afcd9421d417c20f1ef3e38be002c
+  metadata.gz: a1dbc251a4dda958ada6163601b876ab7572f6aa2a71bb84e728f6b1bd180ef90a6937ef5db3ca3724951be8a329f2abc655f162d8849a4f2868be9d78eb4c73
+  data.tar.gz: b0d5952ff67aa28147f85105ea7d89f59a526cfa856d5ab1b6826eec35f50d60dde5a69d1f28b1c73720b4edcd8eff948c656880feda2e1e943f7decbc9c0859

data/lib/colors/convert.rb

@@ -1,3 +1,5 @@
+require "matrix"
+
 module Colors
   module Convert
     module_function
@@ -16,6 +18,11 @@ module Colors
       end
     end
 
+    private def matrix_inv(matrix)
+      matrix = Matrix[*matrix]
+      matrix.inv.to_a
+    end
+
     def max_chroma(l, h)
       h_rad = degree_to_radian(h)
       sin_h = Math.sin(h_rad).to_r
@@ -35,9 +42,9 @@ module Colors
 
       bounds = Array.new(6) { [0r, 0r] }
       0.upto(2) do |ch|
-        m1 = XYZ2RGB[ch][0].to_r
-        m2 = XYZ2RGB[ch][1].to_r
-        m3 = XYZ2RGB[ch][2].to_r
+        m1 = M_XYZ_RGB[ch][0].to_r
+        m2 = M_XYZ_RGB[ch][1].to_r
+        m3 = M_XYZ_RGB[ch][2].to_r
 
         [0, 1].each do |t|
           top1 = (284517r * m1 - 94839r * m3) * sub2
@@ -109,14 +116,9 @@ module Colors
 
     def luv_to_lch(l, u, v)
       c = Math.sqrt(u*u + v*v).to_r
-
-      if c < 1e-8
-        h = 0r
-      else
-        h = Math.atan2(v, u).to_r * 180/Math::PI.to_r
-        h += 360r if h < 0
-      end
-
+      hard = Math.atan2(v, u).to_r
+      h = hard * 180 / Math::PI.to_r
+      h += 360r if h < 0
       [l, c, h]
     end
 
@@ -195,26 +197,68 @@ module Colors
 
     # sRGB -> ???
 
+    def srgb_from_linear_srgb(r, g, b)
+      a = 0.055r
+      [r, g, b].map do |v|
+        if v < 0.0031308
+          12.92r * v
+        else
+          (1 + a) * v**(1/2.4r) - a
+        end
+      end
+    end
+
     def srgb_to_linear_srgb(r, g, b)
+      a = 0.055r
       [r, g, b].map do |v|
         if v > 0.04045
-          ((v + 0.055r) / 1.055r) ** 2.4r
+          ((v + a) / (1 + a)) ** 2.4r
         else
           v / 12.92r
         end
       end
     end
 
+    # xyY -> ???
+
+    def xyy_to_xyz(x, y, large_y)
+      large_x = large_y*x/y
+      large_z = large_y*(1 - x - y)/y
+      [large_x, large_y, large_z]
+    end
+
     # XYZ -> ???
 
-    XYZ2RGB = [
-      [  3.24096994190452134377, -1.53738317757009345794, -0.49861076029300328366 ],
-      [ -0.96924363628087982613,  1.87596750150772066772,  0.04155505740717561247 ],
-      [  0.05563007969699360846, -0.20397695888897656435,  1.05697151424287856072 ]
+    # sRGB reference points
+    R_xyY = [0.64r, 0.33r, 1r]
+    G_xyY = [0.30r, 0.60r, 1r]
+    B_xyY = [0.15r, 0.06r, 1r]
+    D65_xyY = [0.3127r, 0.3290r, 1r]
+
+    R_XYZ = xyy_to_xyz(*R_xyY)
+    G_XYZ = xyy_to_xyz(*G_xyY)
+    B_XYZ = xyy_to_xyz(*B_xyY)
+    D65_XYZ = xyy_to_xyz(*D65_xyY)
+
+    M_P = [
+      [R_XYZ[0], G_XYZ[0], B_XYZ[0]],
+      [R_XYZ[1], G_XYZ[1], B_XYZ[1]],
+      [R_XYZ[2], G_XYZ[2], B_XYZ[2]]
     ]
+
+    M_S = dot_product(matrix_inv(M_P), D65_XYZ)
+
+    M_RGB_XYZ = (0 ... 3).map do |i|
+      (0 ... 3).map {|j| (M_S[j] * M_P[i][j]).round(4) }
+    end
+
+    M_XYZ_RGB = matrix_inv(M_RGB_XYZ).map do |row|
+      row.map {|v| v.round(4) }
+    end
+
     def xyz_to_rgb(x, y, z)
-      r, g, b = dot_product(XYZ2RGB, [x, y, z])
-      r, g, b = srgb_to_linear_srgb(r, g, b)
+      r, g, b = dot_product(M_XYZ_RGB, [x, y, z])
+      r, g, b = srgb_from_linear_srgb(r, g, b)
       [
         r.clamp(0r, 1r),
         g.clamp(0r, 1r),

data/lib/colors/rgb.rb

@@ -118,7 +118,7 @@ module Colors
       c = RGB.new(r, g, b).to_xyz
       l, u, v = c.luv_components(WHITE_POINT_D65)
       h, s, l = Convert.luv_to_husl(l, u, v)
-      HUSL.new(h, s.to_r.clamp(0r, 1r), l.to_r.clamp(0r, 1r))
+      HUSL.new(h, s.clamp(0r, 1r).to_r, l.clamp(0r, 1r).to_r)
     end
 
     def to_xyz

data/lib/colors/version.rb

@@ -1,3 +1,3 @@
 module Colors
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/colors/xyy.rb

@@ -34,9 +34,7 @@ module Colors
     end
 
     def to_xyz
-      large_x = large_y*x/y
-      large_z = large_y*(1 - x - y)/y
-      XYZ.new(large_x, large_y, large_z)
+      XYZ.new(*Convert.xyy_to_xyz(*components))
     end
 
     private def canonicalize(x, y, large_y)

data/red-colors.gemspec

@@ -32,6 +32,8 @@ Gem::Specification.new do |spec|
   spec.files += Dir.glob("doc/text/*")
   spec.test_files += Dir.glob("test/**/*")
 
+  spec.add_runtime_dependency("matrix")
+
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")
   spec.add_development_dependency("test-unit")

data/test/test-husl.rb

@@ -177,7 +177,7 @@ class ColorsHUSLTest < Test::Unit::TestCase
   test("#desaturate") do
     c = Colors::RGB.new(1r, 1r, 0r).to_husl.desaturate(0.8)
     assert_instance_of(Colors::HUSL, c)
-    assert_near(Colors::HUSL.new(85.87432021817473r, 0.9838589961976354r, 0.8850923805142681r), c)
+    assert_near(Colors::HUSL.new(85.87432021817473r, 0.9838589961976354r, 0.8850923805142681r), c, 0.01)
   end
 
   test("#to_husl") do
@@ -185,30 +185,49 @@ class ColorsHUSLTest < Test::Unit::TestCase
     assert_same(black, black.to_hsl)
   end
 
-  test("#to_rgb") do
-    # black
-    assert_equal(Colors::RGB.new(0, 0, 0),
-                 Colors::HUSL.new(0, 0, 0).to_rgb)
-    # red
-    assert_near(Colors::RGB.new(1r, 0, 0),
-                Colors::HUSL.new(12.177050630061776r, 1r, 0.5323711559542933r).to_rgb)
-    # yellow
-    assert_near(Colors::RGB.new(1r, 1r, 0),
-                Colors::HUSL.new(85.87432021817473r, 1r, 0.9713855934179674r).to_rgb)
-    # green
-    assert_near(Colors::RGB.new(0r, 1r, 0),
-                Colors::HUSL.new(127.71501294924047r, 1r, 0.8773551910965973r).to_rgb)
-    # cyan
-    assert_near(Colors::RGB.new(0r, 1r, 1r),
-                Colors::HUSL.new(192.17705063006116r, 1r, 0.9111475231670507r).to_rgb)
-    # blue
-    assert_near(Colors::RGB.new(0r, 0r, 1r),
-                Colors::HUSL.new(265.8743202181779r, 1r, 0.3230087290398002r).to_rgb)
-    # magenta
-    assert_near(Colors::RGB.new(1r, 0r, 1r),
-                Colors::HUSL.new(307.7150129492436r, 1r, 0.60322731354551294r).to_rgb)
-    # white
-    assert_near(Colors::RGB.new(1r, 1r, 1r),
-                Colors::HUSL.new(0r, 1r, 1r).to_rgb)
+  sub_test_case("basic colors") do
+    colors = [
+      { rgb: "#ff0000", husl: [ 12.16, 1.0, 0.532], name: "red" },
+      { rgb: "#ffff00", husl: [ 85.90, 1.0, 0.971], name: "yellow" },
+      { rgb: "#00ff00", husl: [127.72, 1.0, 0.877], name: "green" },
+      { rgb: "#00ffff", husl: [192.20, 1.0, 0.911], name: "cyan" },
+      { rgb: "#0000ff", husl: [265.87, 1.0, 0.323], name: "blue" },
+      { rgb: "#ff00ff", husl: [307.71, 1.0, 0.603], name: "magenta" },
+    ]
+    data(colors.map {|r| [r[:name], r] }.to_h)
+    def test_husl_to_rgb(data)
+      husl, rgb = data.values_at(:husl, :rgb)
+      assert_equal(rgb,
+                   Colors::HUSL.new(*husl).to_rgb.to_hex_string)
+    end
+  end
+
+  sub_test_case("reproducing color conversion in seaborn") do
+    s = 0.9 * 99/100r
+    l = 0.65 * 99/100r
+    palette = [
+      { rgb: "#f77189", husl: [  3.590,            s, l] },
+      { rgb: "#e68332", husl: [ 33.50666666666666, s, l] },
+      { rgb: "#bb9832", husl: [ 63.42333333333333, s, l] },
+      { rgb: "#97a431", husl: [ 93.3400,           s, l] },
+      { rgb: "#50b131", husl: [123.25666666666666, s, l] },
+      { rgb: "#34af84", husl: [153.17333333333332, s, l] },
+      { rgb: "#36ada4", husl: [183.0900,           s, l] },
+      { rgb: "#38aabf", husl: [213.00666666666663, s, l] },
+      { rgb: "#3ba3ec", husl: [242.92333333333332, s, l] },
+      { rgb: "#a48cf4", husl: [272.8400,           s, l] },
+      { rgb: "#e867f4", husl: [302.75666666666666, s, l] }, # TODO: #e866f4 is the best
+      { rgb: "#f668c2", husl: [332.67333333333335, s, l] }
+    ]
+    data(palette.map {|r|
+      name = r[:name] || "husl(#{r[:husl]}) => #{r[:rgb]}"
+      [name, r]
+    }.to_h)
+    def test_husl_to_rgb(data)
+      husl_components, hex_string = data.values_at(:husl, :rgb)
+      husl = Colors::HUSL.new(*husl_components)
+      assert_equal(hex_string,
+                   husl.to_rgb.to_hex_string)
+    end
   end
 end

data/test/test-rgb.rb

@@ -292,31 +292,19 @@ class ColorsRGBTest < Test::Unit::TestCase
                  Colors::RGB.new(1r, 1r, 1r).to_hsl)
   end
 
-  test("#to_husl") do
-    # black
-    assert_equal(Colors::HUSL.new(0, 0, 0),
-                 Colors::RGB.new(0, 0, 0).to_husl)
-    # red
-    assert_near(Colors::HUSL.new(12.177050630061776r, 1r, 0.5323711559542933r),
-                Colors::RGB.new(1r, 0, 0).to_husl)
-    # yellow
-    assert_near(Colors::HUSL.new(85.87432021817473r, 1r, 0.9713855934179674r),
-                Colors::RGB.new(1r, 1r, 0).to_husl)
-    # green
-    assert_near(Colors::HUSL.new(127.71501294924047r, 1r, 0.8773551910965973r),
-                Colors::RGB.new(0r, 1r, 0).to_husl)
-    # cyan
-    assert_near(Colors::HUSL.new(192.17705063006116r, 1r, 0.9111475231670507r),
-                Colors::RGB.new(0r, 1r, 1r).to_husl)
-    # blue
-    assert_near(Colors::HUSL.new(265.8743202181779r, 1r, 0.3230087290398002r),
-                Colors::RGB.new(0r, 0r, 1r).to_husl)
-    # magenta
-    assert_near(Colors::HUSL.new(307.7150129492436r, 1r, 0.60322731354551294r),
-                Colors::RGB.new(1r, 0r, 1r).to_husl)
-    # white
-    assert_near(Colors::HUSL.new(0r, 0r, 1r),
-                Colors::RGB.new(1r, 1r, 1r).to_husl)
+  data(
+    "red"     => { rgb: "#ff0000", husl: [ 12.16, 1.0, 0.532] },
+    "yellow"  => { rgb: "#ffff00", husl: [ 85.90, 1.0, 0.971] },
+    "green"   => { rgb: "#00ff00", husl: [127.72, 1.0, 0.877] },
+    "cyan"    => { rgb: "#00ffff", husl: [192.20, 1.0, 0.911] },
+    "blue"    => { rgb: "#0000ff", husl: [265.87, 1.0, 0.323] },
+    "magenta" => { rgb: "#ff00ff", husl: [307.71, 1.0, 0.603] }
+  )
+  def test_to_husl(data)
+      husl_components, hex_string = data.values_at(:husl, :rgb)
+      husl = Colors::HUSL.new(*husl_components)
+      rgb = Colors::RGB.parse(hex_string)
+      assert_near(husl, rgb.to_husl, 0.03)
   end
 
   data do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: red-colors
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement