Review fixes

gyrdym · May 6, 2020 · 26b5c38 · 26b5c38
1 parent 53d734a
commit 26b5c38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/src/tree_trainer/decision_tree_trainer.dart b/lib/src/tree_trainer/decision_tree_trainer.dart
@@ -31,14 +31,14 @@ class DecisionTreeTrainer implements TreeTrainer {
       Matrix samples,
       num splittingValue,
       int splittingIdx,
-      TreeNodeSplittingPredicateType splittingClauseType,
+      TreeNodeSplittingPredicateType splittingPredicateType,
       Iterable<int> featuresColumnIdxs,
       int level,
   ) {
     if (_leafDetector.isLeaf(samples, _targetIdx, featuresColumnIdxs, level)) {
       final label = _leafLabelFactory.create(samples, _targetIdx);
       return TreeNode(
-        splittingClauseType,
+        splittingPredicateType,
         splittingValue,
         splittingIdx,
         null,
@@ -78,7 +78,7 @@ class DecisionTreeTrainer implements TreeTrainer {
     });
 
     return TreeNode(
-        splittingClauseType,
+        splittingPredicateType,
         splittingValue,
         splittingIdx,
         childNodes.toList(growable: false),

diff --git a/lib/src/tree_trainer/splitter/nominal_splitter/nominal_splitter_impl.dart b/lib/src/tree_trainer/splitter/nominal_splitter/nominal_splitter_impl.dart
@@ -13,12 +13,12 @@ class NominalTreeSplitterImpl implements NominalTreeSplitter {
 
       Map.fromEntries(uniqueValues.map((value) {
         final splittingClauseType = TreeNodeSplittingPredicateType.equalTo;
-        final splittingClause = getTreeNodeSplittingPredicateByType(
+        final splittingPredicate = getTreeNodeSplittingPredicateByType(
             splittingClauseType);
 
         final foundRows = samples
             .rows
-            .where((row) => splittingClause(row, splittingIdx, value))
+            .where((row) => splittingPredicate(row, splittingIdx, value))
             .toList(growable: false);
 
         final node = TreeNode(

diff --git a/lib/src/tree_trainer/tree_node/_helper/from_tree_nodes_json.dart b/lib/src/tree_trainer/tree_node/_helper/from_tree_nodes_json.dart
@@ -1,6 +1,5 @@
 import 'package:ml_algo/src/tree_trainer/tree_node/tree_node.dart';
 
-// TODO: find a way to use Iterable here instead of List (Iterable is not accepted by json serializable)
 List<TreeNode> fromTreeNodesJson(Iterable collection) =>
     collection
         ?.map(