rover-df 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a96f5fa610232beb50eb2d22cd87b52627dfda44139e618fb0fa5d82f4d90fa
-  data.tar.gz: 899ae175705f7195a994c0bfd19fd021334404d07440f05153c08be5fa08c11b
+  metadata.gz: ca39a558c3c12103f03fed4cb8f007fbd00a1f8e84b839916fd0010aae4613ba
+  data.tar.gz: 43df8cdc415cc036ac383f30b7c91a35b644067a3cb8ea199abd7452b98298d5
 SHA512:
-  metadata.gz: dc61f769ce5bac5fcda65dcc25fb940f7bf9f81ac168029748b5ccf8bfb896008f0836f9523ca3785e22782dff3f4d8dccc19ae823f944391c47df41fd88b3ec
-  data.tar.gz: 5a0c7e5e77233ef8bf7b4df23d711ec22a2e85165715ca330344a0b6cd5bef99e571256496e9c6f6037bf0fc0c771b4e951d91f0a85c17211127649d6e246878
+  metadata.gz: 2724c7e85ee7921f277be833cf89be638c14cbb37a44411bba86c42cacffe7c0e4b82ea04d4dfb3d694c6429ba41bc8e8c10f7cb40e5d34bf59d14755858735f
+  data.tar.gz: fa860158decbca0a0b35ccb82e6f73d9a513c37b483eca52d140842d5dd255899a2e1ded3ec4375a492b86d3ec09ffa53d4871e05f1fdad39f3d2630215417dc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.5 (2021-09-25)
+
+- Fixed column types with joins
+
 ## 0.2.4 (2021-06-03)
 
 - Added grouping for `std` and `var`

data/README.md

@@ -20,7 +20,7 @@ gem 'rover-df'
 
 A data frame is an in-memory table. It’s a useful data structure for data analysis and machine learning. It uses columnar storage for fast operations on columns.
 
-Try it out for forecasting by clicking the button below:
+Try it out for forecasting by clicking the button below (it can take a few minutes to start):
 
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ankane/ml-stack/master?filepath=Forecasting.ipynb)
 

data/lib/rover/data_frame.rb

@@ -475,10 +475,12 @@ module Rover
 
       left = how == "left"
 
+      types = {}
       vectors = {}
       keys = (self.keys + other.keys).uniq
       keys.each do |k|
         vectors[k] = []
+        types[k] = join_type(self.types[k], other.types[k])
       end
 
       each_row do |r|
@@ -498,7 +500,7 @@ module Rover
         end
       end
 
-      DataFrame.new(vectors)
+      DataFrame.new(vectors, types: types)
     end
 
     def check_join_keys(df, keys)
@@ -523,6 +525,19 @@ module Rover
       end
     end
 
+    def join_type(a, b)
+      if a.nil?
+        b
+      elsif b.nil?
+        a
+      elsif a == b
+        a
+      else
+        # TODO specify
+        nil
+      end
+    end
+
     def to_vector(v, size: nil, type: nil)
       if v.is_a?(Vector)
         v = v.to(type) if type && v.type != type

data/lib/rover/version.rb

@@ -1,3 +1,3 @@
 module Rover
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rover-df
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Simple, powerful data frames for Ruby