red-palette 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72542b2d2b866247433dcdd20f7dcd233e7c5cc8c55b16c13079f370a9092d3a
-  data.tar.gz: 9cf3c3427e80a3a25b33f6a880f009c5a039f30d2b573a7cfd50d322eec3c260
+  metadata.gz: 7a79f4c5d1a76337bf252b00c1aea0f776dd1ee1678a5050d4c37b87e02bde3e
+  data.tar.gz: 9417c77ce946dda675e26c8269d7b054e2864a327758568b1f92dd8b0c52358b
 SHA512:
-  metadata.gz: 3914868d96a9f88a85c7e22bcde72596db87998a45f3e44bacda5c1ff635046302709711719b53ab912b87dd2569ba8e5b20b32f9a5b5960ac68697fbf56eee5
-  data.tar.gz: 60c4a27bdce6bb0bf5e1455ddbdbc1437857e8fb7ed799a6e62e8c2cc486579ac51bb38f32235c50fc49e853d64fa6ab245bde1a9aea6d8bd6fc54d3b1523e7e
+  metadata.gz: ad8687cd9af527240704a8b35c865a048b5b0c1fc4f6683ea8546403646e8378f281811ef5d3c70e25f24c5a5d954b7ea2e9bc429f6d442ad63aa82844383683
+  data.tar.gz: a72e57186ab666533bbfb86ab5fdd589f8450fa4fc730c5e86c4d743f46ec45b84cc741e5960891c591e393db24d605244de0187b0cc511a7ff50b7c32eb2724

data/Gemfile

@@ -1,3 +1,8 @@
 source "https://rubygems.org/"
 
 gemspec
+
+group :c_ext do
+  gem 'numo-narray'
+  gem 'enumerable-statistics'
+end

data/lib/palette.rb

@@ -1,5 +1,4 @@
 require "colors"
-require "numo/narray"
 
 require_relative "palette/constants"
 require_relative "palette/colors"
@@ -40,7 +39,7 @@ class Palette
         # Use all colors in a qualitative palette or 6 of another kind
         n_colors ||= QUAL_PALETTE_SIZES.fetch(palette, 6)
         case @name
-        when SEABORN_PALETTES.method(:has_key?)
+        when SEABORN_PALETTES.method(:has_key?).to_proc # NOTE: to_proc needs for Ruby 2.4
           palette = self.class.seaborn_colors(@name)
         when "hls", "HLS", "hsl", "HSL"
           palette = self.class.hsl_colors(n_colors)

data/lib/palette/colors.rb

@@ -1,3 +1,5 @@
+require_relative "helper"
+
 class Palette
   def self.seaborn_colors(name)
     SEABORN_PALETTES[name].map do |hex_string|
@@ -19,10 +21,12 @@ class Palette
   # @return [Array<Colors::HSL>]
   #   The array of colors
   def self.hsl_colors(n_colors=6, h: 3.6r, s: 0.65r, l: 0.6r)
-    hues = Numo::DFloat.linspace(0, 1, n_colors + 1)[0...-1]
-    hues.inplace + (h/360r).to_f
-    hues.inplace % 1
-    hues.inplace - Numo::Int32.cast(hues)
+    hues = Helper.linspace(0, 1, n_colors + 1)[0...-1]
+    hues.each_index do |i|
+      hues[i] += (h/360r).to_f
+      hues[i] %= 1
+      hues[i] -= hues[i].to_i
+    end
     (0...n_colors).map {|i| Colors::HSL.new(hues[i]*360r, s, l) }
   end
 
@@ -40,10 +44,12 @@ class Palette
   # @return [Array<Colors::HSL>]
   #   The array of colors
   def self.husl_colors(n_colors=6, h: 3.6r, s: 0.9r, l: 0.65r)
-    hues = Numo::DFloat.linspace(0, 1, n_colors + 1)[0...-1]
-    hues.inplace + (h/360r).to_f
-    hues.inplace % 1
-    hues.inplace * 359
+    hues = Helper.linspace(0, 1, n_colors + 1)[0...-1]
+    hues.each_index do |i|
+      hues[i] += (h/360r).to_f
+      hues[i] %= 1
+      hues[i] *= 359
+    end
     (0...n_colors).map {|i| Colors::HUSL.new(hues[i], s, l) }
   end
 

data/lib/palette/helper.rb

@@ -0,0 +1,26 @@
+class Palette
+  module Helper
+    module Fallback
+      module_function def linspace(x1, x2, n=100)
+        d = x2 - x1
+        step = d / (n-1).to_f
+        n.times.map {|i| x1 + i*step }
+      end
+    end
+
+    begin
+      require 'numo/narray'
+    rescue LoadError
+    end
+
+    if defined?(Numo)
+      module_function def linspace(x1, x2, *rest)
+        Numo::DFloat.linspace(x1, x2, *rest).to_a
+      end
+    else
+      module_function def linspace(x1, x2, *rest)
+        Fallback.linspace(x1, x2, *rest)
+      end
+    end
+  end
+end

data/lib/palette/version.rb

@@ -1,3 +1,3 @@
 class Palette
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/red-palette.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.test_files += Dir.glob("test/**/*")
 
   spec.add_dependency("red-colors")
-  spec.add_dependency("numo-narray")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-palette
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-colors
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: numo-narray
-  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
@@ -123,6 +109,7 @@ files:
 - lib/palette.rb
 - lib/palette/colors.rb
 - lib/palette/constants.rb
+- lib/palette/helper.rb
 - lib/palette/statistics.rb
 - lib/palette/version.rb
 - red-palette.gemspec