hybridforest 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa4457c9f58fde0edfa9fd8af0a4ac5ef23db54892f75a50a8f62ac1f8652631
-  data.tar.gz: a8f0afc4b58d067388f3c5986521609a5ede0816643f73235b8517265c6b72c7
+  metadata.gz: 4311342fccd332cd6f98b2b6a30f32acc01f2f3090490e452e9bfe8981730f07
+  data.tar.gz: 2a4461a04ac9232d5506271ddbf8b9f9b49b7397a06c00aea894711c3ce0586f
 SHA512:
-  metadata.gz: 9261b0cc8fa086e8b91f910f8b852f2369a1eac0e76ee4b01f1db3dddf9bb7f8f9947cbcaca2f81d6db6a9c734ed516a0848f29b7735661ea5be428b8e720392
-  data.tar.gz: 5d8a886b98ca5e735b4173fb51e114d313c28ef480bd8cae32cf339634e49384a44d4fdb53548afb82228bd368960ef002d55bbd1292dd8313706b2458bf543c
+  metadata.gz: 9708316bfa685c814afbffea2d2ea238dd8736ac929bd782a365d6ab65dbe2d1987df7a66750db3d9108071279a99cb1206f179163f1383494c0ebcda704fab6
+  data.tar.gz: efbd6db6210d02830734bb7e3411f8b9553ed8b6172df59f1180e801884057d34edd85a67cd6c63e6b09c8531cf434ccdf265e14f4d8d26e035b333a5805c48d

data/CHANGELOG.md

@@ -48,4 +48,9 @@
 
 ## [0.13.0] - 2022-01-09
 
-- Refactor forest growers
+- Refactor forest growers
+
+
+## [0.14.0] - 2022-01-09
+
+- Refactor hybrid forest grower

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hybridforest (0.12.0)
+    hybridforest (0.13.0)
       activesupport (~> 6.1)
       rake (~> 13.0)
       require_all

data/lib/hybridforest/forests/forest_growers/hybrid_grower.rb

@@ -11,8 +11,9 @@ module HybridForest
         def grow_forest(instances, number_of_trees)
           forest = []
           number_of_trees.times do
-            in_of_bag, out_of_bag, out_of_bag_labels = HybridForest::Utils.train_test_bootstrap_split(instances)
-            tree_results = grow_trees(TREE_TYPES, in_of_bag, out_of_bag, out_of_bag_labels)
+            iob_data, oob_data, oob_labels = HybridForest::Utils.train_test_bootstrap_split(instances)
+            trees = grow_trees(TREE_TYPES, iob_data)
+            tree_results = predict_evaluate_trees(trees, oob_data, oob_labels)
             best_tree = select_best_tree(tree_results)
             forest << best_tree
           end
@@ -21,25 +22,28 @@ module HybridForest
 
         private
 
-        def fit_and_predict(tree_class, in_of_bag, out_of_bag, out_of_bag_labels)
-          tree = tree_class.new.fit(in_of_bag)
-          tree_predictions = tree.predict(out_of_bag)
-          tree_accuracy = HybridForest::Utils.accuracy(tree_predictions, out_of_bag_labels)
-          {tree: tree, oob_accuracy: tree_accuracy}
+        def grow_trees(tree_types, iob_data)
+          tree_types.collect do |tree_type|
+            tree_type.new.fit(iob_data)
+          end
+        end
+
+        def predict_evaluate_trees(trees, oob_data, oob_labels)
+          trees.collect do |tree|
+            predict_evaluate(tree, oob_data, oob_labels)
+          end
+        end
+
+        def predict_evaluate(tree, data, actual_labels)
+          predicted_labels = tree.predict(data)
+          accuracy = HybridForest::Utils.accuracy(predicted_labels, actual_labels)
+          {tree: tree, oob_accuracy: accuracy}
         end
 
         def select_best_tree(tree_results)
           best_result = tree_results.max_by(1) { |result| result[:oob_accuracy] }.first
           best_result[:tree]
         end
-
-        def grow_trees(tree_types, in_of_bag, out_of_bag, out_of_bag_labels)
-          tree_results = []
-          tree_types.each do |tree_type|
-            tree_results << fit_and_predict(tree_type, in_of_bag, out_of_bag, out_of_bag_labels)
-          end
-          tree_results
-        end
       end
     end
   end

data/lib/hybridforest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HybridForest
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybridforest
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - hi-tech-jazz