hybridforest 0.13.0 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -1
- data/Gemfile.lock +1 -1
- data/lib/hybridforest/forests/forest_growers/hybrid_grower.rb +19 -15
- data/lib/hybridforest/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4311342fccd332cd6f98b2b6a30f32acc01f2f3090490e452e9bfe8981730f07
|
|
4
|
+
data.tar.gz: 2a4461a04ac9232d5506271ddbf8b9f9b49b7397a06c00aea894711c3ce0586f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9708316bfa685c814afbffea2d2ea238dd8736ac929bd782a365d6ab65dbe2d1987df7a66750db3d9108071279a99cb1206f179163f1383494c0ebcda704fab6
|
|
7
|
+
data.tar.gz: efbd6db6210d02830734bb7e3411f8b9553ed8b6172df59f1180e801884057d34edd85a67cd6c63e6b09c8531cf434ccdf265e14f4d8d26e035b333a5805c48d
|
data/CHANGELOG.md
CHANGED
data/Gemfile.lock
CHANGED
|
@@ -11,8 +11,9 @@ module HybridForest
|
|
|
11
11
|
def grow_forest(instances, number_of_trees)
|
|
12
12
|
forest = []
|
|
13
13
|
number_of_trees.times do
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
iob_data, oob_data, oob_labels = HybridForest::Utils.train_test_bootstrap_split(instances)
|
|
15
|
+
trees = grow_trees(TREE_TYPES, iob_data)
|
|
16
|
+
tree_results = predict_evaluate_trees(trees, oob_data, oob_labels)
|
|
16
17
|
best_tree = select_best_tree(tree_results)
|
|
17
18
|
forest << best_tree
|
|
18
19
|
end
|
|
@@ -21,25 +22,28 @@ module HybridForest
|
|
|
21
22
|
|
|
22
23
|
private
|
|
23
24
|
|
|
24
|
-
def
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
def grow_trees(tree_types, iob_data)
|
|
26
|
+
tree_types.collect do |tree_type|
|
|
27
|
+
tree_type.new.fit(iob_data)
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
def predict_evaluate_trees(trees, oob_data, oob_labels)
|
|
32
|
+
trees.collect do |tree|
|
|
33
|
+
predict_evaluate(tree, oob_data, oob_labels)
|
|
34
|
+
end
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
def predict_evaluate(tree, data, actual_labels)
|
|
38
|
+
predicted_labels = tree.predict(data)
|
|
39
|
+
accuracy = HybridForest::Utils.accuracy(predicted_labels, actual_labels)
|
|
40
|
+
{tree: tree, oob_accuracy: accuracy}
|
|
29
41
|
end
|
|
30
42
|
|
|
31
43
|
def select_best_tree(tree_results)
|
|
32
44
|
best_result = tree_results.max_by(1) { |result| result[:oob_accuracy] }.first
|
|
33
45
|
best_result[:tree]
|
|
34
46
|
end
|
|
35
|
-
|
|
36
|
-
def grow_trees(tree_types, in_of_bag, out_of_bag, out_of_bag_labels)
|
|
37
|
-
tree_results = []
|
|
38
|
-
tree_types.each do |tree_type|
|
|
39
|
-
tree_results << fit_and_predict(tree_type, in_of_bag, out_of_bag, out_of_bag_labels)
|
|
40
|
-
end
|
|
41
|
-
tree_results
|
|
42
|
-
end
|
|
43
47
|
end
|
|
44
48
|
end
|
|
45
49
|
end
|
data/lib/hybridforest/version.rb
CHANGED