rover-df 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c750c49e4cb313565a3b52a273c4820ae406471a1007ddb8e83742f3f2640f1
-  data.tar.gz: 2a7469abd672a87c9b4c874469baf07f42b22067ac2281c424eeb7b60841bbfe
+  metadata.gz: 0452f4e042fe699042ceebd158a63957b2c2aad0c6fb5652b5e1bb0c49b39f5f
+  data.tar.gz: 81eca93e309798632b1192b12d50a44828a07c82b84b1f58da9406968761960f
 SHA512:
-  metadata.gz: 24e7874a67e498cadb8c2b4773f00c5cf53ab76e8231b7c762b8f403c2d4783809beb44ba3b37cb50b801032c3a3a9c140b18e1a10967eb331c517b5dd5251aa
-  data.tar.gz: b62f4bfd7591e9c4869ab13e4e6efeba5c4e121c92470bc81d517ec85045a2fdc080a7a6ca3f61a15e7c98335543fcb11893d00d374cb5a3cf1294e12ed65130
+  metadata.gz: feb735bbf9fd17006b2a66416527cd280241082db0bb61b3c1a16317833baa96392b0d5fe70f15ceb8878247747ee966da5fdea607600620e6aa806103c5547c
+  data.tar.gz: f56e61bb2869beddf953eaf64e3759ab3987b6c53f918d6c52be6d8efcb22a16a9aba8bff727ab6d477e1981cabe76be70ce5e875a5de2db5298dd2f6654163c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.2 (2021-01-01)
+
+- Added line, pie, area, and bar charts
+- Added `|` and `^` for vectors
+- Fixed typecasting with `map`
+
 ## 0.2.1 (2020-11-23)
 
 - Added `plot` method to data frames

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Andrew Kane
+Copyright (c) 2020-2021 Andrew Kane
 
 MIT License
 

data/README.md

@@ -128,19 +128,34 @@ df[[1, 4, 5]]
 Filter on a condition
 
 ```ruby
+df[df[:a] == 100]
+df[df[:a] != 100]
 df[df[:a] > 100]
+df[df[:a] >= 100]
+df[df[:a] < 100]
+df[df[:a] <= 100]
 ```
 
-And
+In
 
 ```ruby
-df[df[:a] > 100 & df[:b] == "one"]
+df[df[:a].in?([1, 2, 3])]
+df[df[:a].in?(1..3)]
+df[df[:a].in?(["a", "b", "c"])]
 ```
 
-Or
+Not in
+
+```ruby
+df[!df[:a].in?([1, 2, 3])]
+```
+
+And, or, and exclusive or
 
 ```ruby
-df[df[:a] > 100 | df[:b] == "one"]
+df[(df[:a] > 100) & (df[:b] == "one")] # and
+df[(df[:a] > 100) | (df[:b] == "one")] # or
+df[(df[:a] > 100) ^ (df[:b] == "one")] # xor
 ```
 
 ## Operations
@@ -200,7 +215,7 @@ Multiple groups
 df.group([:a, :b]).count
 ```
 
-## Visualization [master]
+## Visualization
 
 Add [Vega](https://github.com/ankane/vega) to your application’s Gemfile:
 
@@ -214,6 +229,12 @@ And use:
 df.plot(:a, :b)
 ```
 
+Specify the chart type (`line`, `pie`, `column`, `bar`, `area`, or `scatter`)
+
+```ruby
+df.plot(:a, :b, type: "pie")
+```
+
 ## Updating Data
 
 Add a new column

data/lib/rover/data_frame.rb

@@ -72,6 +72,7 @@ module Rover
         # multiple columns
         df = DataFrame.new
         where.each do |k|
+          check_column(k, true)
           df[k] = @vectors[k]
         end
         df
@@ -374,22 +375,41 @@ module Rover
         elsif types[x] == :object && self[y].numeric?
           "column"
         else
-          raise "Cannot determine type"
+          raise "Cannot determine type. Use the type option."
         end
       end
       data = self[[x, y]]
 
       case type
-      when "scatter"
+      when "line", "area"
+        x_type =
+          if data[x].numeric?
+            "quantitative"
+          elsif data[x].all? { |v| v.is_a?(Date) || v.is_a?(Time) }
+            "temporal"
+          else
+            "nominal"
+          end
+
+        scale = x_type == "temporal" ? {type: "utc"} : {}
+
         Vega.lite
           .data(data)
-          .mark(type: "circle", tooltip: true)
+          .mark(type: type, tooltip: true, interpolate: "cardinal", point: {size: 60})
           .encoding(
-            x: {field: x, type: "quantitative", scale: {zero: false}},
-            y: {field: y, type: "quantitative", scale: {zero: false}},
-            size: {value: 60}
+            x: {field: x, type: x_type, scale: scale},
+            y: {field: y, type: "quantitative"}
+          )
+          .config(axis: {labelFontSize: 12})
+      when "pie"
+        Vega.lite
+          .data(data)
+          .mark(type: "arc", tooltip: true)
+          .encoding(
+            color: {field: x, type: "nominal", sort: "none", axis: {title: nil}, legend: {labelFontSize: 12}},
+            theta: {field: y, type: "quantitative"}
           )
-          .config(axis: {title: nil, labelFontSize: 12})
+          .view(stroke: nil)
       when "column"
         Vega.lite
           .data(data)
@@ -399,7 +419,27 @@ module Rover
             x: {field: x, type: "nominal", sort: "none", axis: {labelAngle: 0}},
             y: {field: y, type: "quantitative"}
           )
-          .config(axis: {title: nil, labelFontSize: 12})
+          .config(axis: {labelFontSize: 12})
+      when "bar"
+        Vega.lite
+          .data(data)
+          .mark(type: "bar", tooltip: true)
+          .encoding(
+            # TODO determine label angle
+            y: {field: x, type: "nominal", sort: "none", axis: {labelAngle: 0}},
+            x: {field: y, type: "quantitative"}
+          )
+          .config(axis: {labelFontSize: 12})
+      when "scatter"
+        Vega.lite
+          .data(data)
+          .mark(type: "circle", tooltip: true)
+          .encoding(
+            x: {field: x, type: "quantitative", scale: {zero: false}},
+            y: {field: y, type: "quantitative", scale: {zero: false}},
+            size: {value: 60}
+          )
+          .config(axis: {labelFontSize: 12})
       else
         raise ArgumentError, "Invalid type: #{type}"
       end
@@ -467,8 +507,20 @@ module Rover
       raise ArgumentError, "Missing keys: #{missing_keys.join(", ")}" if missing_keys.any?
     end
 
-    def check_column(key)
-      raise ArgumentError, "Missing column: #{key}" unless include?(key)
+    # TODO in 0.3.0
+    # always use did_you_mean
+    def check_column(key, did_you_mean = false)
+      unless include?(key)
+        if did_you_mean
+          if RUBY_VERSION.to_f >= 2.6
+            raise KeyError.new("Missing column: #{key}", receiver: self, key: key)
+          else
+            raise KeyError.new("Missing column: #{key}")
+          end
+        else
+          raise ArgumentError, "Missing column: #{key}"
+        end
+      end
     end
 
     def to_vector(v, size: nil, type: nil)

data/lib/rover/vector.rb

@@ -91,7 +91,7 @@ module Rover
       @data[k] = v
     end
 
-    %w(+ - * / % ** &).each do |op|
+    %w(+ - * / % ** & | ^).each do |op|
       define_method(op) do |other|
         other = other.to_numo if other.is_a?(Vector)
         # TODO better logic
@@ -161,9 +161,9 @@ module Rover
     end
 
     def map(&block)
-      mapped = @data.map(&block)
-      mapped = mapped.to_a if mapped.is_a?(Numo::RObject) # re-evaluate cast
-      Vector.new(mapped)
+      # convert to Ruby first to cast properly
+      # https://github.com/ruby-numo/numo-narray/issues/181
+      Vector.new(@data.to_a.map(&block))
     end
 
     def tally

data/lib/rover/version.rb

@@ -1,3 +1,3 @@
 module Rover
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rover-df
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -16,98 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1.7
+        version: 0.9.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1.7
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: rake
-  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: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1.9
 description:
 email: andrew@chartkick.com
 executables: []
@@ -142,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Simple, powerful data frames for Ruby