work/smartcore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clippy::or_fun_call

Browse Source
This commit is contained in:
Luis Moreno
2020-11-08 23:15:50 -04:00
parent 4d75af6703
commit 43584e14e5
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tree/decision_tree_classifier.rs
+3 -2
View File
@@ -376,7 +376,8 @@ impl<T: RealNumber> DecisionTreeClassifier<T> {
let node = &self.nodes[node_id];
if node.true_child == None && node.false_child == None {
result = node.output;
} else if x.get(row, node.split_feature) <= node.split_value.unwrap_or(T::nan())
} else if x.get(row, node.split_feature)
<= node.split_value.unwrap_or_else(T::nan)
{
queue.push_back(node.true_child.unwrap());
} else {
@@ -529,7 +530,7 @@ impl<T: RealNumber> DecisionTreeClassifier<T> {
for i in 0..n {
if visitor.samples[i] > 0 {
if visitor.x.get(i, self.nodes[visitor.node].split_feature)
<= self.nodes[visitor.node].split_value.unwrap_or(T::nan())
<= self.nodes[visitor.node].split_value.unwrap_or_else(T::nan)
{
true_samples[i] = visitor.samples[i];
tc += true_samples[i];
src/tree/decision_tree_regressor.rs
+3 -2
View File
@@ -282,7 +282,8 @@ impl<T: RealNumber> DecisionTreeRegressor<T> {
let node = &self.nodes[node_id];
if node.true_child == None && node.false_child == None {
result = node.output;
} else if x.get(row, node.split_feature) <= node.split_value.unwrap_or(T::nan())
} else if x.get(row, node.split_feature)
<= node.split_value.unwrap_or_else(T::nan)
{
queue.push_back(node.true_child.unwrap());
} else {
@@ -401,7 +402,7 @@ impl<T: RealNumber> DecisionTreeRegressor<T> {
for i in 0..n {
if visitor.samples[i] > 0 {
if visitor.x.get(i, self.nodes[visitor.node].split_feature)
<= self.nodes[visitor.node].split_value.unwrap_or(T::nan())
<= self.nodes[visitor.node].split_value.unwrap_or_else(T::nan)
{
true_samples[i] = visitor.samples[i];
tc += true_samples[i];