weka 0.7.2-java → 0.7.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91160c33a52f390b636a257d66851a7fefce0ebee2e84f4b10a6b35f4134456
-  data.tar.gz: f3e10b30623765748d3a13e882d480e1666c713b54c0ee6eb953c99f805074bb
+  metadata.gz: c2dee943ecd6d4df29a0339de43d88b1d72171dcf84db300270fbc31cf4cedcf
+  data.tar.gz: d6bec02306fbccec16ac31089dfb65d544673c4c6ebec870bb8cfa19cdc9c486
 SHA512:
-  metadata.gz: 80de1d2db74c21ae47298e485dcf6206f9bdcdf796a916dab62b97f518344e4cd0410204b09f3d489d6a99bbf0d6221ab47f72822631c22e3e1b7e7bf7236cbb
-  data.tar.gz: f7ef2fe8706e5f48f967b241cf9795731b3fffa51a10c03e73f4759516a7b08afb0d72114ff1680dc9dfc0a39fcf0c5a8a0bdc9e178b3cb49abe50f27f641038
+  metadata.gz: 5b2f624be137dd9fe055d495f2fd356880d14da95ca8923f823f20f7a8cce4d54c09c6b173a4e7a17173f488a2c99b1cad73c8c86720a3c3eca80487a9413208
+  data.tar.gz: 7d33b187f59f8de850cf23909728a6154c30490cf329cea8b50c26407906f90bd07a232b295217a63567529a17ef1b980fcf6da1125f79b8d0d29aa12c793d87

data/.rubocop.yml

@@ -14,7 +14,10 @@ Style/Documentation:
   Enabled: false
 
 Metrics/LineLength:
-  Max: 80
+  Max: 105
+
+Metrics/ClassLength:
+  Max: 250
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
@@ -29,3 +32,28 @@ Metrics/ModuleLength:
 Metrics/BlockLength:
   Exclude:
     - "**/*_spec.rb"
+
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - "**/*_spec.rb"
+
+Layout/EmptyLineBetweenDefs:
+  Enabled: false
+
+Layout/HashAlignment:
+  Enabled: false
+
+Lint/BooleanSymbol:
+  Enabled: false
+
+Style/HashEachMethods:
+  Exclude:
+    - lib/weka/core/instances.rb
+    - spec/classifiers/evaluation_spec.rb
+
+Naming/PredicateName:
+  Exclude:
+    - lib/weka/core/instances.rb
+
+Metrics/CyclomaticComplexity:
+  Max: 8

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.7.3] – 2021-01-21
+### Changed
+- Update Weka Jar dependency to weka-dev v3.9.5  
+  Please also refer to the weka changelog for included updates & fixes:  
+  https://www.cs.waikato.ac.nz/~ml/weka/CHANGELOG-3-9-5
+- Update dev dependencies
+
 ## [0.7.2] – 2020-03-20
 ### Changed
 - Update Weka Jar dependency to weka-dev v3.9.4  
@@ -84,7 +91,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.1.0] – 2015-12-26
 Initial release
 
-[Unreleased]: https://github.com/paulgoetze/weka-jruby/compare/v0.7.2...HEAD
+[Unreleased]: https://github.com/paulgoetze/weka-jruby/compare/v0.7.3...HEAD
+[0.7.3]: https://github.com/paulgoetze/weka-jruby/compare/v0.7.2...v0.7.3
 [0.7.2]: https://github.com/paulgoetze/weka-jruby/compare/v0.7.1...v0.7.2
 [0.7.1]: https://github.com/paulgoetze/weka-jruby/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/paulgoetze/weka-jruby/compare/v0.6.0...v0.7.0

data/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2020 Paul Götze
+Copyright (c) 2015-2021 Paul Götze
 
 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

@@ -51,7 +51,7 @@ Then, run `rake spec` to run the tests. You can also run `bin/console` or `rake
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/paulgoetze/weka-jruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant Code of Conduct](https://github.com/paulgoetze/weka-jruby/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/paulgoetze/weka-jruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant Code of Conduct](https://github.com/paulgoetze/weka-jruby/blob/main/CODE_OF_CONDUCT.md).
 
 For development we use the [git branching model](http://nvie.com/posts/a-successful-git-branching-model/) described by [nvie](https://github.com/nvie).
 
@@ -74,4 +74,4 @@ The original ideas for wrapping Weka in JRuby come from [@arrigonialberto86](htt
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://github.com/paulgoetze/weka-jruby/blob/master/MIT-LICENSE.txt).
+The gem is available as open source under the terms of the [MIT License](https://github.com/paulgoetze/weka-jruby/blob/main/MIT-LICENSE.txt).

data/lib/weka/class_builder.rb

@@ -88,6 +88,7 @@ module Weka
 
       def include_utils
         return unless utils_defined?
+
         "include #{utils}"
       end
 
@@ -116,6 +117,7 @@ module Weka
 
       def downcase_first_char(string)
         return if string.nil? || string.empty?
+
         string[0].downcase + string[1..-1]
       end
     end

data/lib/weka/classifiers/utils.rb

@@ -81,8 +81,7 @@ module Weka
         java_import 'java.util.Random'
         include Checks
 
-        attr_reader :training_instances
-        attr_reader :instances_structure
+        attr_reader :training_instances, :instances_structure
 
         def train_with_instances(instances)
           ensure_class_attribute_assigned!(instances)

data/lib/weka/clusterers/utils.rb

@@ -66,8 +66,7 @@ module Weka
       module Buildable
         include Checks
 
-        attr_reader :training_instances
-        attr_reader :instances_structure
+        attr_reader :training_instances, :instances_structure
 
         def train_with_instances(instances)
           @training_instances = instances

data/lib/weka/core/dense_instance.rb

@@ -18,17 +18,19 @@ module Weka
         enumerate_attributes.to_a
       end
 
-      def each_attribute
+      def each_attribute(&block)
         if block_given?
-          enumerate_attributes.each { |attribute| yield(attribute) }
+          enumerate_attributes.each(&block)
         else
           enumerate_attributes
         end
       end
 
-      def each_attribute_with_index
-        enumerate_attributes.each_with_index do |attribute, index|
-          yield(attribute, index) if block_given?
+      def each_attribute_with_index(&block)
+        if block_given?
+          enumerate_attributes.each_with_index(&block)
+        else
+          enumerate_attributes
         end
       end
 

data/lib/weka/core/instances.rb

@@ -59,9 +59,8 @@ module Weka
       def attributes(include_class_attribute: false)
         attrs = enumerate_attributes.to_a
 
-        if include_class_attribute && class_attribute_defined?
-          attrs.insert(class_index, class_attribute)
-        end
+        class_available = include_class_attribute && class_attribute_defined?
+        attrs.insert(class_index, class_attribute) if class_available
 
         attrs
       end
@@ -99,31 +98,35 @@ module Weka
         check_for_attribute_type(type)
       end
 
-      def each
+      def each(&block)
         if block_given?
-          enumerate_instances.each { |instance| yield(instance) }
+          enumerate_instances.each(&block)
         else
           enumerate_instances
         end
       end
 
-      def each_with_index
-        enumerate_instances.each_with_index do |instance, index|
-          yield(instance, index) if block_given?
+      def each_with_index(&block)
+        if block_given?
+          enumerate_instances.each_with_index(&block)
+        else
+          enumerate_instances
         end
       end
 
-      def each_attribute
+      def each_attribute(&block)
         if block_given?
-          enumerate_attributes.each { |attribute| yield(attribute) }
+          enumerate_attributes.each(&block)
         else
           enumerate_attributes
         end
       end
 
-      def each_attribute_with_index
-        enumerate_attributes.each_with_index do |attribute, index|
-          yield(attribute, index) if block_given?
+      def each_attribute_with_index(&block)
+        if block_given?
+          enumerate_attributes.each_with_index(&block)
+        else
+          enumerate_attributes
         end
       end
 
@@ -306,9 +309,7 @@ module Weka
       end
 
       def ensure_attribute_defined!(name)
-        if attribute_names(include_class_attribute: true).include?(name.to_s)
-          return
-        end
+        return if attribute_names(include_class_attribute: true).include?(name.to_s)
 
         error   = "\"#{name}\" is not defined."
         hint    = 'Only defined attributes can be used as class attribute!'
@@ -325,6 +326,7 @@ module Weka
 
       def map_attribute_type(type)
         return -1 unless Attribute::TYPES.include?(type.downcase.to_sym)
+
         Attribute.const_get(type.upcase)
       end
 

data/lib/weka/version.rb

@@ -1,3 +1,3 @@
 module Weka
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.3'.freeze
 end

data/weka.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler',          '~> 2.0'
   spec.add_development_dependency 'rake',             '~> 13.0'
-  spec.add_development_dependency 'rspec',            '~> 3.0'
+  spec.add_development_dependency 'rspec',            '~> 3.10'
 
-  spec.add_runtime_dependency 'jar-dependencies', '~> 0.4'
-  spec.requirements << 'jar nz.ac.waikato.cms.weka, weka-dev, 3.9.4'
+  spec.add_runtime_dependency 'jar-dependencies', '~> 0.4.1'
+  spec.requirements << 'jar nz.ac.waikato.cms.weka, weka-dev, 3.9.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weka
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: java
 authors:
 - Paul Götze
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   name: rspec
   type: :development
   prerelease: false
@@ -51,13 +51,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.1
   name: jar-dependencies
   type: :runtime
   prerelease: false
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.1
 description: A JRuby wrapper for the Weka library (http://www.cs.waikato.ac.nz/ml/weka/)
 email:
 - paul.christoph.goetze@gmail.com
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar nz.ac.waikato.cms.weka, weka-dev, 3.9.4
+- jar nz.ac.waikato.cms.weka, weka-dev, 3.9.5
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4