diff --git a/Jenkinsfile b/Jenkinsfile index 681857e0..6e9defb3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ def setGithubCommitStatus(state, description) { pipeline { options { - timeout(time: 4, unit: 'HOURS') + timeout(time: 5, unit: 'HOURS') } agent { node { diff --git a/dislib/trees/decision_tree.py b/dislib/trees/decision_tree.py index 2ab4d5a3..9ac3e4c7 100644 --- a/dislib/trees/decision_tree.py +++ b/dislib/trees/decision_tree.py @@ -148,7 +148,8 @@ def predict(self, x_row): ) branch_predictions.append(pred) return _merge_branches( - None, *branch_predictions, classification=self.n_classes is None + None, *branch_predictions, + classification=self.n_classes is not None )