From 12c92136cfdb1cb46752b045d583abc3f06f803f Mon Sep 17 00:00:00 2001 From: Andre Anjos <andre.dos.anjos@gmail.com> Date: Tue, 12 May 2020 22:56:57 +0200 Subject: [PATCH] [configs.datasets.*.covd] Fix validation set --- .../binseg/configs/datasets/chasedb1/covd.py | 1 + bob/ip/binseg/configs/datasets/drive/covd.py | 1 + bob/ip/binseg/configs/datasets/hrf/covd.py | 24 +++++++++---------- bob/ip/binseg/configs/datasets/iostar/covd.py | 24 +++++++++---------- bob/ip/binseg/configs/datasets/stare/covd.py | 1 + 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/bob/ip/binseg/configs/datasets/chasedb1/covd.py b/bob/ip/binseg/configs/datasets/chasedb1/covd.py index 52f55ffd..970caf2f 100644 --- a/bob/ip/binseg/configs/datasets/chasedb1/covd.py +++ b/bob/ip/binseg/configs/datasets/chasedb1/covd.py @@ -36,3 +36,4 @@ dataset["__train__"] = ConcatDataset( dataset["train"] = ConcatDataset( [_mtest["drive"], _mtest["stare"], _mtest["hrf"], _mtest["iostar"],] ) +dataset["__valid__"] = dataset["train"] diff --git a/bob/ip/binseg/configs/datasets/drive/covd.py b/bob/ip/binseg/configs/datasets/drive/covd.py index 2a97ac4c..5010b35d 100644 --- a/bob/ip/binseg/configs/datasets/drive/covd.py +++ b/bob/ip/binseg/configs/datasets/drive/covd.py @@ -36,3 +36,4 @@ dataset["__train__"] = ConcatDataset( dataset["train"] = ConcatDataset( [_mtest["stare"], _mtest["chasedb1"], _mtest["hrf"], _mtest["iostar"],] ) +dataset["__valid__"] = dataset["train"] diff --git a/bob/ip/binseg/configs/datasets/hrf/covd.py b/bob/ip/binseg/configs/datasets/hrf/covd.py index 21b1c36e..4eeb7093 100644 --- a/bob/ip/binseg/configs/datasets/hrf/covd.py +++ b/bob/ip/binseg/configs/datasets/hrf/covd.py @@ -22,15 +22,15 @@ from bob.ip.binseg.configs.datasets.hrf.mtest import dataset as _mtest from bob.ip.binseg.configs.datasets.hrf.default import dataset as _baseline dataset = dict(**_baseline) -dataset["__train__"] = ConcatDataset([ - _augment(_mtest["drive"], rotation_before=True), - _augment(_mtest["stare"], rotation_before=True), - _augment(_mtest["chasedb1"], rotation_before=True), - _augment(_mtest["iostar"], rotation_before=True), - ]) -dataset["train"] = ConcatDataset([ - _mtest["drive"], - _mtest["stare"], - _mtest["chasedb1"], - _mtest["iostar"], - ]) +dataset["__train__"] = ConcatDataset( + [ + _augment(_mtest["drive"], rotation_before=True), + _augment(_mtest["stare"], rotation_before=True), + _augment(_mtest["chasedb1"], rotation_before=True), + _augment(_mtest["iostar"], rotation_before=True), + ] +) +dataset["train"] = ConcatDataset( + [_mtest["drive"], _mtest["stare"], _mtest["chasedb1"], _mtest["iostar"],] +) +dataset["__valid__"] = dataset["train"] diff --git a/bob/ip/binseg/configs/datasets/iostar/covd.py b/bob/ip/binseg/configs/datasets/iostar/covd.py index c7096c30..9b253e3a 100644 --- a/bob/ip/binseg/configs/datasets/iostar/covd.py +++ b/bob/ip/binseg/configs/datasets/iostar/covd.py @@ -22,15 +22,15 @@ from bob.ip.binseg.configs.datasets.iostar.vessel_mtest import dataset as _mtest from bob.ip.binseg.configs.datasets.iostar.vessel import dataset as _baseline dataset = dict(**_baseline) -dataset["__train__"] = ConcatDataset([ - _augment(_mtest["drive"], rotation_before=True), - _augment(_mtest["stare"], rotation_before=True), - _augment(_mtest["chasedb1"], rotation_before=True), - _augment(_mtest["hrf"], rotation_before=False), - ]) -dataset["train"] = ConcatDataset([ - _mtest["drive"], - _mtest["stare"], - _mtest["chasedb1"], - _mtest["hrf"], - ]) +dataset["__train__"] = ConcatDataset( + [ + _augment(_mtest["drive"], rotation_before=True), + _augment(_mtest["stare"], rotation_before=True), + _augment(_mtest["chasedb1"], rotation_before=True), + _augment(_mtest["hrf"], rotation_before=False), + ] +) +dataset["train"] = ConcatDataset( + [_mtest["drive"], _mtest["stare"], _mtest["chasedb1"], _mtest["hrf"],] +) +dataset["__valid__"] = dataset["train"] diff --git a/bob/ip/binseg/configs/datasets/stare/covd.py b/bob/ip/binseg/configs/datasets/stare/covd.py index 74668055..ad1c2aa1 100644 --- a/bob/ip/binseg/configs/datasets/stare/covd.py +++ b/bob/ip/binseg/configs/datasets/stare/covd.py @@ -36,3 +36,4 @@ dataset["__train__"] = ConcatDataset( dataset["train"] = ConcatDataset( [_mtest["drive"], _mtest["chasedb1"], _mtest["hrf"], _mtest["iostar"],] ) +dataset["__valid__"] = dataset["train"] -- GitLab