weka 0.3.0-java → 0.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 949c1294da4acebd35a534c14a8ddd7ebc7ac126
-  data.tar.gz: de345d42f452a2846dbbbaded9bb0fbfd6fdd7b7
+  metadata.gz: 24673716e3c980b803c2c77172efbed98a8d7de6
+  data.tar.gz: 9c611dba1492b943ceaea2ca9c375bbbe95ada85
 SHA512:
-  metadata.gz: 359199eb33e50e51f673468271386d7668f661e495a75efc3b1afeeae9f7c52be5d19d5457106412f5131b2f237c41867c7c08c152553af18a7dbe017187edca
-  data.tar.gz: 7a0e3b343960027d9156b03c885f733f9e50aaf1cbbf9905dedd55ff51113add5e5212ba9dfb1f5b15907951316b5d61546fbe92e9cde37d7da708736e424ad8
+  metadata.gz: 54236c07fa7110a5260a587cd2a1e57016705275ea6eba8b624ad7a5bc8ed58c7e878cf4b61913368f27c9286ccdde777323e34278917d0b05ed185b87fbdbb2
+  data.tar.gz: 245cc55a7abf2751ddea7a2f4dda479eab73b3aff2852fe915705944a2a0290a26b4bb1d8188e97009168c72c12775bf464d724ca84473a359685a9df7f13ae9

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--order rand

data/.travis.yml

@@ -8,8 +8,8 @@ cache:
   - bundler
 
 before_install:
-  - gem install bundler
   - rvm get head
   - rvm use jruby-9.0.1.0 --install
+  - gem install bundler
 
 script: bundle exec rake spec

data/README.md

@@ -33,7 +33,7 @@ The weka gem tries to carry over the namespaces defined in Weka and enhances som
 
 The idea behind keeping the namespaces is, that you can also use the [Weka documentation](http://weka.sourceforge.net/doc.dev/) for looking up functionality and classes.
 
-Please refer to [the gem‘s Wiki](https://github.com/paulgoetze/weka-jruby/wiki) for
+Please refer to [the gem’s Wiki](https://github.com/paulgoetze/weka-jruby/wiki) for
 detailed information about how to use weka with JRuby and some examplary code snippets.
 
 ## Development
@@ -49,7 +49,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/paulgo
 
 For development we use the [git branching model](http://nvie.com/posts/a-successful-git-branching-model/) described by [nvie](https://github.com/nvie).
 
-Here's how to contribute:
+Here’s how to contribute:
 
 1. Fork it ( https://github.com/paulgoetze/weka-jruby/fork )
 2. Create your feature branch (`git checkout -b feature/my-new-feature develop`)
@@ -59,6 +59,9 @@ Here's how to contribute:
 
 Please try to add RSpec tests along with your new features. This will ensure that your code does not break existing functionality and that your feature is working as expected.
 
+We use [Rubocop](https://github.com/bbatsov/rubocop) for code style recommendations.
+Please make sure your contributions comply with the default config of Rubocop.
+
 ## Acknowledgement
 
 The original ideas for wrapping Weka in JRuby come from [@arrigonialberto86](https://github.com/arrigonialberto86) and his [ruby-band](https://github.com/arrigonialberto86/ruby-band) gem. Great thanks!

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :prepare
-task :install => :prepare
+task default: :prepare
+task install: :prepare
 
 desc 'Install weka jars & dependencies'
 task :prepare do
@@ -15,7 +15,7 @@ task :prepare do
   LockJar.install('Jarfile.lock', local_repo: jars_dir)
 end
 
-desc "Start an irb session with the gem loaded"
+desc 'Start an irb session with the gem loaded'
 task :irb do
   sh 'irb -I ./lib -r weka'
 end

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "weka"
+require 'bundler/setup'
+require 'weka'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/lib/weka/attribute_selection/attribute_selection.rb

@@ -3,9 +3,8 @@ module Weka
     java_import 'weka.attributeSelection.AttributeSelection'
 
     class AttributeSelection
-
-      alias :summary :to_results_string
-      alias :selected_attributes_count :number_attributes_selected
+      alias summary to_results_string
+      alias selected_attributes_count number_attributes_selected
     end
   end
 end

data/lib/weka/class_builder.rb

@@ -1,14 +1,12 @@
-require 'active_support/concern'
-require 'active_support/core_ext/string'
-require 'active_support/core_ext/module'
 require 'weka/concerns'
 
 module Weka
   module ClassBuilder
-    extend ActiveSupport::Concern
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     module ClassMethods
-
       def build_class(class_name, weka_module: nil, include_concerns: true)
         java_import java_class_path(class_name, weka_module)
         define_class(class_name, weka_module, include_concerns: include_concerns)
@@ -37,7 +35,11 @@ module Weka
       end
 
       def super_modules
-        toplevel_module? ? self.name : self.name.deconstantize
+        toplevel_module? ? name : deconstantize(name)
+      end
+
+      def deconstantize(name)
+        name.split('::')[0...-1].join('::')
       end
 
       def java_including_module
@@ -45,11 +47,15 @@ module Weka
       end
 
       def including_module
-        self.name.demodulize unless toplevel_module?
+        demodulize(name) unless toplevel_module?
+      end
+
+      def demodulize(name)
+        name.split('::').last
       end
 
       def toplevel_module?
-        self.name.scan('::').count == 1
+        name.scan('::').count == 1
       end
 
       def define_class(class_name, weka_module, include_concerns: true)
@@ -66,7 +72,7 @@ module Weka
         class_path   = java_class_path(class_name, weka_module)
         serializable = Weka::Core::SerializationHelper.serializable?(class_path)
 
-        "include Weka::Concerns::Serializable" if serializable
+        'include Weka::Concerns::Serializable' if serializable
       end
 
       def include_utils
@@ -75,7 +81,11 @@ module Weka
       end
 
       def utils_defined?
-        utils_super_modules.constantize.const_defined?(:Utils)
+        constantize(utils_super_modules).const_defined?(:Utils)
+      end
+
+      def constantize(module_names)
+        Object.module_eval("::#{module_names}")
       end
 
       def utils
@@ -87,10 +97,9 @@ module Weka
       end
 
       def downcase_first_char(string)
-        return if string.blank?
+        return if string.nil? || string.empty?
         string[0].downcase + string[1..-1]
       end
     end
-
   end
 end

data/lib/weka/classifiers/evaluation.rb

@@ -3,35 +3,34 @@ module Weka
     java_import 'weka.classifiers.Evaluation'
 
     class Evaluation
-
       # Use both nomenclatures f_measure and fmeasure for consistency
       # due to jruby's auto method generation of 'fMeasure' to 'f_measure' and
       # 'weightedFMeasure' to 'weighted_fmeasure'.
-      alias :weighted_f_measure       :weighted_fmeasure
-      alias :fmeasure                 :f_measure
+      alias weighted_f_measure      weighted_fmeasure
+      alias fmeasure                f_measure
 
-      alias :summary                  :to_summary_string
-      alias :class_details            :to_class_details_string
+      alias summary                 to_summary_string
+      alias class_details           to_class_details_string
+      alias confusion_matrix        to_matrix_string
 
-      alias :instance_count           :num_instances
-      alias :correct_count            :correct
-      alias :incorrect_count          :incorrect
-      alias :unclassified_count       :unclassified
+      alias instance_count          num_instances
+      alias correct_count           correct
+      alias incorrect_count         incorrect
+      alias unclassified_count      unclassified
 
-      alias :correct_percentage       :pct_correct
-      alias :incorrect_percentage     :pct_incorrect
-      alias :unclassified_percentage  :pct_unclassified
+      alias correct_percentage      pct_correct
+      alias incorrect_percentage    pct_incorrect
+      alias unclassified_percentage pct_unclassified
 
-      alias :true_negative_count      :num_true_negatives
-      alias :false_negative_count     :num_false_negatives
-      alias :true_positive_count      :num_true_positives
-      alias :false_positive_count     :num_false_positives
-      alias :average_cost             :avg_cost
+      alias true_negative_count     num_true_negatives
+      alias false_negative_count    num_false_negatives
+      alias true_positive_count     num_true_positives
+      alias false_positive_count    num_false_positives
+      alias average_cost            avg_cost
 
-      alias :cumulative_margin_distribution :to_cumulative_margin_distribution_string
+      alias cumulative_margin_distribution to_cumulative_margin_distribution_string
     end
 
     Java::WekaClassifiers::Evaluation.__persistent__ = true
-
   end
 end

data/lib/weka/classifiers/utils.rb

@@ -1,138 +1,135 @@
-require 'active_support/concern'
-require 'active_support/core_ext/hash'
 require 'weka/classifiers/evaluation'
 require 'weka/core/instances'
 
 module Weka
   module Classifiers
     module Utils
-      extend ActiveSupport::Concern
+      def self.included(base)
+        base.class_eval do
+          java_import 'java.util.Random'
 
-      included do
-        java_import 'java.util.Random'
+          if instance_methods.include?(:build_classifier)
+            attr_reader :training_instances
 
-        if instance_methods.include?(:build_classifier)
-          attr_reader :training_instances
+            def train_with_instances(instances)
+              ensure_class_attribute_assigned!(instances)
 
-          def train_with_instances(instances)
-            ensure_class_attribute_assigned!(instances)
+              @training_instances = instances
+              build_classifier(instances)
 
-            @training_instances = instances
-            build_classifier(instances)
+              self
+            end
 
-            self
-          end
-
-          def cross_validate(folds: 3)
-            ensure_trained_with_instances!
+            def cross_validate(folds: 3)
+              ensure_trained_with_instances!
 
-            evaluation = Evaluation.new(training_instances)
-            random     = Java::JavaUtil::Random.new(1)
+              evaluation = Evaluation.new(training_instances)
+              random     = Java::JavaUtil::Random.new(1)
 
-            evaluation.cross_validate_model(self, training_instances, folds.to_i, random)
-            evaluation
-          end
+              evaluation.cross_validate_model(self, training_instances, folds.to_i, random)
+              evaluation
+            end
 
-          def evaluate(test_instances)
-            ensure_trained_with_instances!
-            ensure_class_attribute_assigned!(test_instances)
+            def evaluate(test_instances)
+              ensure_trained_with_instances!
+              ensure_class_attribute_assigned!(test_instances)
 
-            evaluation = Evaluation.new(training_instances)
-            evaluation.evaluate_model(self, test_instances)
-            evaluation
+              evaluation = Evaluation.new(training_instances)
+              evaluation.evaluate_model(self, test_instances)
+              evaluation
+            end
           end
-        end
 
-        if instance_methods.include?(:classify_instance)
-          def classify(instance_or_values)
-            ensure_trained_with_instances!
+          if instance_methods.include?(:classify_instance)
+            def classify(instance_or_values)
+              ensure_trained_with_instances!
 
-            instance = classifiable_instance_from(instance_or_values)
-            index    = classify_instance(instance)
+              instance = classifiable_instance_from(instance_or_values)
+              index    = classify_instance(instance)
 
-            class_value_of_index(index)
+              class_value_of_index(index)
+            end
           end
-        end
 
-        if instance_methods.include?(:update_classifier)
-          def add_training_instance(instance)
-            training_instances.add(instance)
-            update_classifier(instance)
+          if instance_methods.include?(:update_classifier)
+            def add_training_instance(instance)
+              training_instances.add(instance)
+              update_classifier(instance)
 
-            self
-          end
+              self
+            end
 
-          def add_training_data(data)
-            values   = self.training_instances.internal_values_of(data)
-            instance = Weka::Core::DenseInstance.new(values)
-            add_training_instance(instance)
+            def add_training_data(data)
+              values   = training_instances.internal_values_of(data)
+              instance = Weka::Core::DenseInstance.new(values)
+              add_training_instance(instance)
+            end
           end
-        end
 
-        if instance_methods.include?(:distribution_for_instance)
-          def distribution_for(instance_or_values)
-            ensure_trained_with_instances!
+          if instance_methods.include?(:distribution_for_instance)
+            def distribution_for(instance_or_values)
+              ensure_trained_with_instances!
 
-            instance      = classifiable_instance_from(instance_or_values)
-            distributions = distribution_for_instance(instance)
+              instance      = classifiable_instance_from(instance_or_values)
+              distributions = distribution_for_instance(instance)
 
-            class_distributions_from(distributions).with_indifferent_access
+              class_distributions_from(distributions)
+            end
           end
-        end
 
-        private
+          private
 
-        def ensure_class_attribute_assigned!(instances)
-          return if instances.class_attribute_defined?
+          def ensure_class_attribute_assigned!(instances)
+            return if instances.class_attribute_defined?
 
-          error   = 'Class attribute is not assigned for Instances.'
-          hint    = 'You can assign a class attribute with #class_attribute=.'
-          message = "#{error} #{hint}"
+            error   = 'Class attribute is not assigned for Instances.'
+            hint    = 'You can assign a class attribute with #class_attribute=.'
+            message = "#{error} #{hint}"
 
-          raise UnassignedClassError, message
-        end
+            raise UnassignedClassError, message
+          end
 
-        def ensure_trained_with_instances!
-          return unless training_instances.nil?
+          def ensure_trained_with_instances!
+            return unless training_instances.nil?
 
-          error   = 'Classifier is not trained with Instances.'
-          hint    = 'You can set the training instances with #train_with_instances.'
-          message = "#{error} #{hint}"
+            error   = 'Classifier is not trained with Instances.'
+            hint    = 'You can set the training instances with #train_with_instances.'
+            message = "#{error} #{hint}"
 
-          raise UnassignedTrainingInstancesError, message
-        end
+            raise UnassignedTrainingInstancesError, message
+          end
 
-        def classifiable_instance_from(instance_or_values)
-          attributes = training_instances.attributes
-          instances  = Weka::Core::Instances.new(attributes: attributes)
+          def classifiable_instance_from(instance_or_values)
+            attributes = training_instances.attributes
+            instances  = Weka::Core::Instances.new(attributes: attributes)
 
-          class_attribute = training_instances.class_attribute
-          class_index     = training_instances.class_index
-          instances.insert_attribute_at(class_attribute, class_index)
+            class_attribute = training_instances.class_attribute
+            class_index     = training_instances.class_index
+            instances.insert_attribute_at(class_attribute, class_index)
 
-          instances.class_index = training_instances.class_index
-          instances.add_instance(instance_or_values)
+            instances.class_index = training_instances.class_index
+            instances.add_instance(instance_or_values)
 
-          instance = instances.first
-          instance.set_class_missing
-          instance
-        end
+            instance = instances.first
+            instance.set_class_missing
+            instance
+          end
 
-        def class_value_of_index(index)
-          training_instances.class_attribute.value(index)
-        end
+          def class_value_of_index(index)
+            training_instances.class_attribute.value(index)
+          end
 
-        def class_distributions_from(distributions)
-          class_values = training_instances.class_attribute.values
+          def class_distributions_from(distributions)
+            class_values = training_instances.class_attribute.values
 
-          distributions.each_with_index.reduce({}) do |result, (distribution, index)|
-            class_value = class_values[index].to_sym
-            result[class_value] = distribution
-            result
+            distributions.each_with_index.reduce({}) do |result, (distribution, index)|
+              class_value = class_values[index]
+              result[class_value] = distribution
+              result
+            end
           end
         end
       end
-
     end
   end
 end