Skip to content

Closing issue #33. #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JanBenisek merged 4 commits into from
Apr 1, 2021
Merged

Closing issue #33. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8442ef
Preventing floating point rounding issues on verifying equality of tr…
Mar 16, 2021
deaac39
Merge branch 'develop' into issue-#33-data-split-error
Apr 1, 2021
0f8320f
Merging new unit test in the existing one.
Apr 1, 2021
008de51
My initiative to slightly alter the error message broke a unit test. …
Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cobra/preprocessing/preprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import inspect
from datetime import datetime
import time
import math
import logging
from random import shuffle

Expand Down Expand Up @@ -361,9 +362,9 @@ def train_selection_validation_split(data: pd.DataFrame,
pd.DataFrame
DataFrame with additional split column
"""
if train_prop + selection_prop + validation_prop != 1.0:
if not math.isclose(train_prop + selection_prop + validation_prop, 1.0):
Copy link
Contributor

@JanBenisek JanBenisek Mar 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this solution, good idea!

raise ValueError("The sum of train_prop, selection_prop and "
"validation_prop cannot differ from 1.0")
"validation_prop must be 1.0.")

if train_prop == 0.0:
raise ValueError("train_prop cannot be zero!")
Expand Down
14 changes: 10 additions & 4 deletions tests/preprocessing/test_preprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@ def does_not_raise():

class TestPreProcessor:

@pytest.mark.parametrize(("train_prop, selection_prop, "
"validation_prop, expected_sizes"),
@pytest.mark.parametrize("train_prop, selection_prop, validation_prop, "
"expected_sizes",
[(0.6, 0.2, 0.2, {"train": 6,
"selection": 2,
"validation": 2}),
(0.7, 0.3, 0.0, {"train": 7,
"selection": 3})])
"selection": 3}),
# Error "The sum of train_prop, selection_prop and
# validation_prop must be 1.0." should not be
# raised:
(0.7, 0.2, 0.1, {"train": 7,
"selection": 2,
"validation": 1})])
def test_train_selection_validation_split(self, train_prop: float,
selection_prop: float,
validation_prop: float,
Expand Down Expand Up @@ -50,7 +56,7 @@ def test_train_selection_validation_split(self, train_prop: float,
def test_train_selection_validation_split_error_wrong_prop(self):

error_msg = ("The sum of train_prop, selection_prop and "
"validation_prop cannot differ from 1.0")
"validation_prop must be 1.0.")
train_prop = 0.7
selection_prop = 0.3

Expand Down