charty 0.2.5 → 0.2.6

data/lib/charty/util.rb

@@ -16,5 +16,13 @@ module Charty
         end
       end
     end
+
+    module_function def missing?(val)
+      val.nil? || nan?(val)
+    end
+
+    module_function def nan?(val)
+      val.respond_to?(:nan?) && val.nan?
+    end
   end
 end

data/lib/charty/vector_adapters.rb

@@ -22,7 +22,6 @@ module Charty
     class BaseAdapter
       extend Forwardable
       include Enumerable
-      include MissingValueSupport
 
       def self.adapter_name
         name[/:?(\w+)Adapter\z/, 1]
@@ -61,6 +60,11 @@ module Charty
       def_delegators :data, :[], :[]=
       def_delegators :data, :each, :to_a, :empty?
 
+      # Take values at the given positional indices (without indexing)
+      def values_at(*indices)
+        indices.map {|i| data[i] }
+      end
+
       def where_in_array(mask)
         mask = check_mask_vector(mask)
         masked_data = []

data/lib/charty/vector_adapters/array_adapter.rb

@@ -30,7 +30,6 @@ module Charty
       include NameSupport
       include IndexSupport
 
-      # TODO: Reconsider the return value type of values_at
       def_delegators :data, :values_at
 
       def where(mask)
@@ -80,14 +79,7 @@ module Charty
 
       def drop_na
         if numeric?
-          Charty::Vector.new(data.reject { |x|
-            case x
-            when Float
-              x.nan?
-            else
-              x.nil?
-            end
-          })
+          Charty::Vector.new(data.reject { |x| Util.missing?(x) })
         else
           Charty::Vector.new(data.compact)
         end
@@ -100,7 +92,7 @@ module Charty
       end
 
       def notnull
-        Charty::Vector.new(data.map {|x| ! missing_value?(x) },
+        Charty::Vector.new(data.map {|x| ! Util.missing?(x) },
                            index: index,
                            name: name)
       end

data/lib/charty/vector_adapters/daru_adapter.rb

@@ -55,7 +55,7 @@ module Charty
       def_delegators :data, :[]=, :to_a
 
       def values_at(*indices)
-        indices.map {|i| data[i] }
+        indices.map {|i| data.at(i) }
       end
 
       def where(mask)
@@ -130,15 +130,7 @@ module Charty
       end
 
       def drop_na
-        values = data.reject do |x|
-          case
-          when x.nil?,
-               x.respond_to?(:nan?) && x.nan?
-            true
-          else
-            false
-          end
-        end
+        values = data.reject {|x| Util.missing?(x) }
         Charty::Vector.new(Daru::Vector.new(values))
       end
 
@@ -149,7 +141,7 @@ module Charty
       end
 
       def notnull
-        notnull_data = data.map {|x| ! missing_value?(x) }
+        notnull_data = data.map {|x| ! Util.missing?(x) }
         Charty::Vector.new(notnull_data, index: data.index.to_a, name: name)
       end
 

data/lib/charty/vector_adapters/narray_adapter.rb

@@ -29,11 +29,6 @@ module Charty
       include NameSupport
       include IndexSupport
 
-      # TODO: Reconsider the return value type of values_at
-      def values_at(*indices)
-        data[indices].to_a
-      end
-
       def where(mask)
         mask = check_mask_vector(mask)
         case mask.data
@@ -157,7 +152,7 @@ module Charty
           i, n = 0, length
           notnull_data = Numo::Bit.zeros(n)
           while i < n
-            notnull_data[i] = ! missing_value?(data[i])
+            notnull_data[i] = ! Util.missing?(data[i])
             i += 1
           end
         when ->(x) { x.respond_to?(:isnan) }

data/lib/charty/vector_adapters/numpy_adapter.rb

@@ -147,7 +147,7 @@ module Charty
           i, n = 0, length
           notnull_data = Numpy::NDArray.new(n, dtype: :bool)
           while i < n
-            notnull_data[i] = ! missing_value?(data[i])
+            notnull_data[i] = ! Util.missing?(data[i])
             i += 1
           end
         else

data/lib/charty/vector_adapters/pandas_adapter.rb

@@ -86,7 +86,6 @@ module Charty
         data.size == 0
       end
 
-      # TODO: Reconsider the return value type of values_at
       def values_at(*indices)
         data.take(indices).to_a
       end

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charty
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - youchan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-colors
@@ -18,28 +18,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: red-palette
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: matplotlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: pandas
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: playwright-ruby-client
+  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.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +130,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: daru
   requirement: !ruby/object:Gem::Requirement
@@ -152,34 +194,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: playwright-ruby-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: iruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 description: Visualizing your data in a simple way.
 email:
 - youchan01@gmail.com
@@ -262,10 +290,10 @@ files:
 - lib/charty/backends/pyplot.rb
 - lib/charty/backends/rubyplot.rb
 - lib/charty/backends/unicode_plot.rb
+- lib/charty/dash_pattern_generator.rb
 - lib/charty/index.rb
 - lib/charty/layout.rb
 - lib/charty/linspace.rb
-- lib/charty/missing_value_support.rb
 - lib/charty/plot_methods.rb
 - lib/charty/plotter.rb
 - lib/charty/plotters.rb
@@ -275,6 +303,7 @@ files:
 - lib/charty/plotters/categorical_plotter.rb
 - lib/charty/plotters/count_plotter.rb
 - lib/charty/plotters/estimation_support.rb
+- lib/charty/plotters/line_plotter.rb
 - lib/charty/plotters/random_support.rb
 - lib/charty/plotters/relational_plotter.rb
 - lib/charty/plotters/scatter_plotter.rb

data/lib/charty/missing_value_support.rb

@@ -1,14 +0,0 @@
-module Charty
-  module MissingValueSupport
-    def missing_value?(val)
-      case
-      when val.nil?
-        true
-      when val.respond_to?(:nan?) && val.nan?
-        true
-      else
-        false
-      end
-    end
-  end
-end