eps 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf9b15abb922ed62bace8127413e9353d37364f7fe63218088278420655a2561
-  data.tar.gz: 9ae7077f18295a24daf682777106807eec96dfa75e6e4a9f6b595cb52981aec5
+  metadata.gz: ed82418a666490dc6683d0b1258c2dbc7451d86e9421bc5e1581a216e9b48a6f
+  data.tar.gz: d725f5e8f826f6e875aa06811a2d6cbf1fcbffd32073324eb43b32d6e99040eb
 SHA512:
-  metadata.gz: d37cec29c949a729f9581532902b595f4fca1817054243e7e6261b5167917144ba988bbea5fe2a069ef4b988f91fa2b5fd0ea5628059c328b4575d374eb952d7
-  data.tar.gz: 667afb1f383c0d2a8c45c281b7a2b88cc76c3b691704853feb03a8be5a95bfa3ba155ba3e82278c5993b638185c80a82fbbe852f5704ab6bed896af667dd3b76
+  metadata.gz: e3a8e472c998061e3a493ea2b2762a12747bac71d5544ca818bf69f50ac5e4c12cd7a2e0c5a8b767667c92238bbda54e7ef800f740210088fc982bfa84afa7a2
+  data.tar.gz: 2cdb0dda86b60c80a4a7fc4ad0fabafab71e57cfef8cdef349a190da4501e3105c1032b68f64c4196c99df1157da1a068d3bf6831b129b1544f925e371d924da

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.4.0 (2022-09-02)
+
+- Fixed `stack level too deep` error with many rows
+- Dropped support for `gsl` gem (use `gslr` instead)
+- Dropped support for Ruby < 2.7
+
+## 0.3.9 (2021-10-14)
+
+- Fixed error with `lessOrEqual` operator
+
+## 0.3.8 (2021-02-08)
+
+- Fixed error with categorical and text features
+
 ## 0.3.7 (2020-11-23)
 
 - Fixed error with LightGBM summary

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2019 Andrew Kane
+Copyright (c) 2018-2021 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -14,7 +14,7 @@ Check out [this post](https://ankane.org/rails-meet-data-science) for more info
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'eps'
+gem "eps"
 ```
 
 On Mac, also install OpenMP:
@@ -388,7 +388,7 @@ brew install gsl
 Then, add this line to your application’s Gemfile:
 
 ```ruby
-gem 'gslr', group: :development
+gem "gslr", group: :development
 ```
 
 It only needs to be available in environments used to build the model.

data/lib/eps/data_frame.rb

@@ -85,6 +85,8 @@ module Eps
           finish -= 1 if rows.exclude_end?
           rows = Range.new(rows.begin, size - 1) if finish >= size - 1
         end
+      elsif rows.is_a?(Integer)
+        rows = [rows]
       end
 
       if cols
@@ -118,10 +120,11 @@ module Eps
       cols.each do |c|
         raise "Undefined column: #{c}" unless columns.include?(c)
 
-        df.columns[c] = columns[c].values_at(*rows)
+        col = columns[c]
+        df.columns[c] = rows.map { |i| col[i] }
       end
-      df.label = label.values_at(*rows) if label
-      df.weight = weight.values_at(*rows) if weight
+      df.label = rows.map { |i| label[i] } if label
+      df.weight = rows.map { |i| weight[i] } if weight
 
       singular ? df.columns[cols[0]] : df
     end

data/lib/eps/lightgbm.rb

@@ -71,7 +71,7 @@ module Eps
       end
 
       # create datasets
-      categorical_idx = @features.values.map.with_index.select { |type, _| type == "categorical" }.map(&:last)
+      categorical_idx = train_set.columns.keys.map.with_index.select { |k, _| @features[k] == "categorical" }.map(&:last)
       train_ds = ::LightGBM::Dataset.new(train_set.map_rows(&:to_a), label: train_set.label, weight: train_set.weight, categorical_feature: categorical_idx, params: params)
       validation_ds = ::LightGBM::Dataset.new(validation_set.map_rows(&:to_a), label: validation_set.label, weight: validation_set.weight, categorical_feature: categorical_idx, params: params, reference: train_ds) if validation_set
 

data/lib/eps/linear_regression.rb

@@ -37,8 +37,7 @@ module Eps
       str
     end
 
-    # TODO use keyword arguments for gsl and intercept in 0.4.0
-    def _train(**options)
+    def _train(intercept: true, gsl: nil)
       raise "Target must be numeric" if @target_type != "numeric"
       check_missing_value(@train_set)
       check_missing_value(@validation_set) if @validation_set
@@ -51,26 +50,16 @@ module Eps
 
       x = data.map_rows(&:to_a)
 
-      gsl =
-        if options.key?(:gsl)
-          options[:gsl]
-        elsif defined?(GSL)
-          true
-        elsif defined?(GSLR)
-          :gslr
-        else
-          false
-        end
+      gsl = defined?(GSLR) if gsl.nil?
 
-      intercept = options.key?(:intercept) ? options[:intercept] : true
-      if intercept && gsl != :gslr
+      if intercept && !gsl
         data.size.times do |i|
           x[i].unshift(1)
         end
       end
 
       v3 =
-        if gsl == :gslr
+        if gsl
           model = GSLR::OLS.new(intercept: intercept)
           model.fit(x, data.label, weight: data.weight)
 
@@ -79,12 +68,6 @@ module Eps
           coefficients = model.coefficients.dup
           coefficients.unshift(model.intercept) if intercept
           coefficients
-        elsif gsl
-          x = GSL::Matrix.alloc(*x)
-          y = GSL::Vector.alloc(data.label)
-          w = GSL::Vector.alloc(data.weight) if data.weight
-          c, @covariance, _, _ = w ? GSL::MultiFit.wlinear(x, w, y) : GSL::MultiFit.linear(x, y)
-          c.to_a
         else
           x = Matrix.rows(x)
           y = Matrix.column_vector(data.label)
@@ -195,13 +178,7 @@ module Eps
     def p_value
       @p_value ||= begin
         Hash[@coefficients.map do |k, _|
-          tp =
-            if @gsl
-              GSL::Cdf.tdist_P(t_value[k].abs, degrees_of_freedom)
-            else
-              Eps::Statistics.tdist_p(t_value[k].abs, degrees_of_freedom)
-            end
-
+          tp = Eps::Statistics.tdist_p(t_value[k].abs, degrees_of_freedom)
           [k, 2 * (1 - tp)]
         end]
       end

data/lib/eps/pmml/loader.rb

@@ -222,7 +222,7 @@ module Eps
           else
             operator = xml_predicate.attribute("operator").value
             value = xml_predicate.attribute("value").value
-            value = value.to_f if operator == "greaterThan"
+            value = value.to_f if operator == "greaterThan" || operator == "lessOrEqual"
             field = xml_predicate.attribute("field").value
             field = derived_fields[field] if derived_fields[field]
             {

data/lib/eps/version.rb

@@ -1,3 +1,3 @@
 module Eps
-  VERSION = "0.3.7"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eps
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lightgbm
@@ -38,92 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !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: daru
-  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: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: numo-narray
-  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: rover-df
-  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'
 description:
-email: andrew@chartkick.com
+email: andrew@ankane.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -164,14 +80,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Machine learning for Ruby. Supports regression (linear regression) and classification