From 3e8a32b89e7c8dcc5964306bfc23bd573ef1a2d7 Mon Sep 17 00:00:00 2001 From: adityarg Date: Sat, 25 Dec 2021 16:53:46 +0530 Subject: [PATCH 1/2] Added error checks for invalid combination of and --- sklearn/utils/validation.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sklearn/utils/validation.py b/sklearn/utils/validation.py index 5936415c776b8..6b3fc1b7494a8 100644 --- a/sklearn/utils/validation.py +++ b/sklearn/utils/validation.py @@ -1418,6 +1418,15 @@ def check_scalar( f"Possible values are: {expected_include_boundaries}." ) + if include_boundaries in ("left","both") and min_val==None: + raise ValueError( + f"Invalid combination of `include_boundaries` and `min_val`" + ) + if include_boundaries in ("right","both") and max_val==None: + raise ValueError( + f"Invalid combination of `include_boundaries` and `min_val`" + ) + comparison_operator = ( operator.lt if include_boundaries in ("left", "both") else operator.le ) From acc2eecf5f33fb0b7269db76ace7e3993f13f63c Mon Sep 17 00:00:00 2001 From: adityarg Date: Mon, 10 Jan 2022 22:26:08 +0530 Subject: [PATCH 2/2] Added error checks for invalid combination of boundaries --- sklearn/utils/validation.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sklearn/utils/validation.py b/sklearn/utils/validation.py index 6b3fc1b7494a8..1983a9c4d19ff 100644 --- a/sklearn/utils/validation.py +++ b/sklearn/utils/validation.py @@ -1418,13 +1418,13 @@ def check_scalar( f"Possible values are: {expected_include_boundaries}." ) - if include_boundaries in ("left","both") and min_val==None: + if include_boundaries in ("left", "both") and min_val is None: raise ValueError( - f"Invalid combination of `include_boundaries` and `min_val`" + f"Invalid combination of `{include_boundaries}` and `{min_val}`" ) - if include_boundaries in ("right","both") and max_val==None: + if include_boundaries in ("right", "both") and max_val is None: raise ValueError( - f"Invalid combination of `include_boundaries` and `min_val`" + f"Invalid combination of `{include_boundaries}` and `{max_val}`" ) comparison_operator = (