yomise 0.1.3.1 → 0.1.5

data/lib/to_csv.rb

@@ -1,120 +1,159 @@
-require "daru"
-require "rover"
-
-class Daru::DataFrame
-	def to_csv()
-		a = self.to_a.transpose
-		
-		ans = self.map(&:name).join ","
-		self.to_a[0].each do |item|
-			ans += "\n"
-			ans += item.map{|k, v| "\"#{v}\""}.join(",")
-		end
-		
-		return ans
-	end
-	
-	def write_csv(path, encoding: nil, alt: false)
-		if alt
-			# Experimental: faster algorithm
-			# ""付加を先にDaru上でやってあげる案
-			
-			#今はとりあえず
-			self.to_daru.write_csv path, encoding: encoding
-		else
-			enc = encoding.nil? ? "" : ":#{encoding}"
-			open(path, "w#{enc}") { _1.write to_csv }
-		end
-	end
-
-	# To avoid bug about adding column to Daru::DataFrame
-	def add_vector(vecname, vec)
-		self[vecname] = vec
-		self.rename_vectors({vecname => vecname})
-	end
-
-	### エンコード関連 ###
-	# vector_i番目のヘッダー名を読めるようにエンコード
-	def encode_vector_name(vector_i)
-		if self.vectors.to_a[vector_i].is_a?(String)
-			self.vectors.to_a[vector_i].encode Encoding::UTF_8, Encoding::Windows_31J
-		end
-	end
-  
-	# すべての列に対し上記を実施
-	def encode_vectors!
-		self.vectors = Daru::Index.new(Range.new(0, self.vectors.size-1).map {|i| encode_vector_name i })
-	end
-
-	# ver.0.3.8~ Convert Daru::DF encoding
-	def convert_enc!(from: "cp932", to: "utf-8")
-		self.vectors.each do |col|
-			self[col] = self[col].each {|val| val.encode!(to, from_encoding: from) if val.is_a?(String)}
-		end
-		
-		self.encode_vectors!
-	end
-	#####################
-
-	# rover not suppoted yet about indexing
-	def set_index!(indexcolumn)
-		self.index = self[indexcolumn]
-	end
-
-	# To revice pivot index
-	def simplify_multi_index(vector_names_ary)
-		self.vectors = Daru::Index.new(vector_names_ary)
-		self.index = Daru::Vector.new(self.index.to_a.map{_1[0]})
-	end
-	
-	def simple_pivot(index, vectors, values, agg: :mean, index_name: nil)
-		
-		# index, vectors are Arrays. 'values' is String or Array.
-		## 文字列データなどで最初のデータだけ欲しければ agg: :first
-		piv = self.pivot_table index: index, vectors: vectors, agg: agg, values: values
-		piv.vectors = Daru::Index.new( piv.vectors.to_a.map { _1.join("-") } )
-		piv.index = Daru::Vector.new( piv.index.to_a.map { _1.join("-") } )
-		
-		# indexを新しく追加
-		index_name ||= "Pivot_Index"
-		piv[index_name] = piv.index
-		
-		# 順番変更
-		piv.order = [piv.vectors.to_a[-1]] + piv.vectors.to_a[0..-2]
-		
-		return piv
-		
-	end
-	
-	def to_rover
-		Rover::DataFrame.new(self.to_a[0])
-	end
-
-	alias_method :addvec, :add_vector
-end
-
-class Rover::DataFrame
-	# Rover#to_csv is already exist.
-
-	def write_csv(path, encoding: nil)
-		enc = encoding.nil? ? "" : ":#{encoding}"
-		open(path, "w#{enc}") {|f| f.write self.to_csv}
-	end
-	
-	def to_daru
-		Daru::DataFrame.new(self.to_a)
-	end
-	
-	def simple_pivot(index, vectors, ...)
-		ddr = self.to_daru
-		piv = ddr.simple_pivot(index, vectors, ...)
-		return piv.to_rover
-	end
-	
-	def outer_join
-		ddr = self.to_daru
-		# j = ddr.join  ## 外部結合 
-		return j.to_rover
-	end
-	
-end
+require "daru"
+require "rover"
+
+class Daru::DataFrame
+	def to_csv()
+		a = self.to_a.transpose
+		
+		ans = self.map(&:name).join ","
+		self.to_a[0].each do |item|
+			ans += "\n"
+			ans += item.map{|k, v| "\"#{v}\""}.join(",")
+		end
+		
+		return ans
+	end
+	
+	def write_csv(path, encoding: nil, alt: false)
+		if alt
+			# Experimental: faster algorithm
+			# ""付加を先にDaru上でやってあげる案
+			
+			#今はとりあえず
+			self.to_daru.write_csv path, encoding: encoding
+		else
+			enc = encoding.nil? ? "" : ":#{encoding}"
+			open(path, "w#{enc}") { _1.write to_csv }
+		end
+	end
+
+	# To avoid bug about adding column to Daru::DataFrame
+	def add_vector(vecname, vec)
+		self[vecname] = vec
+		self.rename_vectors({vecname => vecname})
+	end
+
+	### エンコード関連 ###
+	# vector_i番目のヘッダー名を読めるようにエンコード
+	def encode_vector_name(vector_i)
+		if self.vectors.to_a[vector_i].is_a?(String)
+			self.vectors.to_a[vector_i].encode Encoding::UTF_8, Encoding::Windows_31J
+		end
+	end
+  
+	# すべての列に対し上記を実施
+	def encode_vectors!
+		self.vectors = Daru::Index.new(Range.new(0, self.vectors.size-1).map {|i| encode_vector_name i })
+	end
+
+	# ver.0.3.8~ Convert Daru::DF encoding
+	def convert_enc!(from: "cp932", to: "utf-8")
+		self.vectors.each do |col|
+			self[col] = self[col].each {|val| val.encode!(to, from_encoding: from) if val.is_a?(String)}
+		end
+		
+		self.encode_vectors!
+	end
+	#####################
+
+	# rover not suppoted yet about indexing
+	def set_index!(indexcolumn)
+		self.index = self[indexcolumn]
+	end
+
+	# To revice pivot index
+	def simplify_multi_index(vector_names_ary)
+		self.vectors = Daru::Index.new(vector_names_ary)
+		self.index = Daru::Vector.new(self.index.to_a.map{_1[0]})
+	end
+	
+	def simple_pivot(index, vectors, values, agg: :mean, index_name: nil)
+		
+		# index, vectors are Arrays. 'values' is String or Array.
+		## 文字列データなどで最初のデータだけ欲しければ agg: :first
+		piv = self.pivot_table index: index, vectors: vectors, agg: agg, values: values
+		piv.vectors = Daru::Index.new( piv.vectors.to_a.map { _1.join("-") } )
+		piv.index = Daru::Vector.new( piv.index.to_a.map { _1.join("-") } )
+		
+		# indexを新しく追加
+		index_name ||= "Pivot_Index"
+		piv[index_name] = piv.index
+		
+		# 順番変更
+		piv.order = [piv.vectors.to_a[-1]] + piv.vectors.to_a[0..-2]
+		
+		return piv
+		
+	end
+
+	def to_rover
+		Rover::DataFrame.new(self.to_a[0])
+	end
+
+	alias_method :addvec, :add_vector
+end
+
+class Rover::DataFrame
+	# Rover#to_csv is already exist.
+
+	def write_csv(path, encoding: nil)
+		enc = encoding.nil? ? "" : ":#{encoding}"
+		open(path, "w#{enc}") {|f| f.write self.to_csv}
+	end
+	
+	def to_daru
+		Daru::DataFrame.new(self.to_a)
+	end
+	
+	def simple_pivot(index, vectors, ...)
+		ddr = self.to_daru
+		piv = ddr.simple_pivot(index, vectors, ...)
+		return piv.to_rover
+	end
+	
+	def outer_join(other, **kwargs)
+		ddr = self.to_daru
+		odr = self.to_daru
+		j = ddr.join(how: :outer, **kwargs)  ## 外部結合 
+		return j.to_rover
+	end
+
+	def categorize(col)
+		if col.is_a?(Array)
+			self[col].to_a.uniq
+		else
+			self[[col]].to_a.uniq
+		end
+	end
+
+	def get_category(categ)
+		a = self[categ.each_key.to_a].to_a
+		mask = a.filter_map.with_index {|v, i|  i if v == categ }
+		return self[mask] 
+	end
+
+	## Roverのleft_joinをエラー回避
+	def left_join_rev(other, on:)
+		left_rows = self.to_a
+		right_rows = other.to_a
+		
+		right_map = right_rows.each_with_object({}) do |row, map|
+			map[row[on]] = row
+		end
+		
+		result_rows = []
+		
+		left_rows.each do |l_row|
+			key = l_row[on]
+			r_row = right_map[key]
+			
+			if r_row
+				result_rows << l_row.merge(r_row)
+			else
+				result_rows << l_row
+			end
+		end
+			
+		Rover::DataFrame.new(result_rows)
+	end
+end

data/lib/yomise/version.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
-module Yomise
-  VERSION = "0.1.3.1"
-end
+# frozen_string_literal: true
+
+module Yomise
+  VERSION = "0.1.5"
+end