yannitor 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33815ccc8c6230b3771c7835c86af1d696ad94eb393bd7e484115c66c96f0941
-  data.tar.gz: 46af372d5553ba1450dfc050740e5eac53a669015e5dac36ea3023503f4385f1
+  metadata.gz: 33f5cfc511f104f0db28db5560043cb36c7908d3c4d52a34d81bca2ee796f9da
+  data.tar.gz: 0a8fbfd8ee32f9349639aa34ca4ab430cdbe2f85f0d9b026e4f3cf2f3b79218a
 SHA512:
-  metadata.gz: 5c3456caf06b11ed44aa3d440241e4a286e6fa5cba44813bd796b28c968f7c846aa70a4f935b8dbe033916f8d1c957238802c4aa64fc3539464df93a0569a1d2
-  data.tar.gz: e2db3ff0c1ff27664aa54f2bbf9bb1f51915cbb2ecc97a0a96d9f11b99969b8c63a1148a594ac2dcee04e24576d1ddf4d835b75d4ffb3ec157b0cd0fe6725fc8
+  metadata.gz: 9776ff46e3ca3080f5449a9369c37898666f492aa1eb20ac474ee54099ed7a5d257e7385b6f5de579719010c8f69adbbd944de077195ed2ff6192c845b15aa57
+  data.tar.gz: cd485253ee2b1ae4a3446c82011f24c174af12b989cf9c720a062b9f2caa0a60839ace0a0e841375ce8b85783b3d938bb52d71a6638368639124d77c6689f85b

data/lib/yannitor/cleaner.rb

@@ -6,18 +6,11 @@ module Yannitor
   module Broom
     attr_accessor :yannitor_features
 
-    def yannitor_is_cleaning(feats = {})
-      self.yannitor_features = feats
+    def yannitor_is_cleaning(features = {})
+      self.yannitor_features = features
     end
 
     def to_one_hot(target_column, type = 'text')
-      sorted_value_array = pluck("distinct(#{target_column})").join("'), ('")
-
-      table_name = self.table_name
-      values_select = %(
-        SELECT value FROM (values ('#{sorted_value_array}')) s(value)
-      )
-
       self.select(%(
         #{table_name}.id,
         ARRAY_AGG(CASE
@@ -27,10 +20,15 @@ module Yannitor
           END
         ) AS o#{target_column}
       )).joins(%(
-        LEFT JOIN (#{values_select}) AS sorted_value_table ON 1=1
+        LEFT JOIN (#{values_for_select(target_column)}) AS sorted_value_table ON 1=1
       )).group("#{table_name}.id")
     end
 
+    def values_for_select(target_column)
+      sorted_values = pluck("distinct(#{target_column})").join("'), ('")
+      "SELECT value FROM (values ('#{sorted_values}')) s(value)"
+    end
+
     def vectorize
       select('*, ' + linear_feature_select).build_linear_features
     end
@@ -45,17 +43,19 @@ module Yannitor
 
     def linear_feature_select
       yannitor_features[:linear].map do |feature|
-        min = all.minimum(feature)
-        max = all.maximum(feature)
-        "CAST((#{table_name}.#{feature}::float - #{min}::float) / (#{max}::float - #{min}::float) AS float) as n#{feature}"
+        "CAST(#{min_max(feature)} AS float) as n#{feature}"
       end.join(', ')
     end
 
-    def nelect(feature)
+    def min_val(feature)
       min = all.minimum(feature)
       max = all.maximum(feature)
 
-      select("*, (#{table_name}.#{feature}::float - #{min}::float) / (#{max}::float - #{min}::float)::float as n#{feature}")
+      "(#{table_name}.#{feature}::float - #{min}::float) / (#{max}::float - #{min}::float)"
+    end
+
+    def nelect(feature)
+      select("*, #{min_max(feature)}::float as n#{feature}")
     end
 
     def normalize(feature)
@@ -72,8 +72,6 @@ module Yannitor
       CSV.open(file_name, 'wb', col_sep: separator) do |csv|
         all.vectorize.each { |v| csv << v }
       end
-
-      nil
     end
   end
 end

data/lib/yannitor/version.rb

@@ -1,3 +1,3 @@
 module Yannitor
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yannitor
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Danielius Visockas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord