From 3bdddf380eb1d9a9f441942adb1e3d51f402ef7e Mon Sep 17 00:00:00 2001 From: Chris Bethune Date: Thu, 24 Jun 2021 00:27:42 -0400 Subject: [PATCH 1/2] updates router to recognize regression as remote sensing task --- processing/router.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/processing/router.py b/processing/router.py index 59d6716..e9dd2cd 100644 --- a/processing/router.py +++ b/processing/router.py @@ -138,12 +138,13 @@ def is_remote_sensing_pretrained(dataset_doc: dict, problem: dict) -> bool: classification = ( _problem.TaskKeyword.CLASSIFICATION in problem["problem"]["task_keywords"] ) + regression = _problem.TaskKeyword.REGRESSION in problem["problem"]["task_keywords"] remote_sensing = ( _problem.TaskKeyword.REMOTE_SENSING in problem["problem"]["task_keywords"] ) return ( "image" not in get_resource_types(dataset_doc) - and classification + and (classification or regression) and remote_sensing and _problem.TaskKeyword.SEMISUPERVISED not in problem["problem"]["task_keywords"] ) From 57029df3dde75b73a26440384f05d3409d9f29bb Mon Sep 17 00:00:00 2001 From: Chris Bethune Date: Thu, 24 Jun 2021 00:28:11 -0400 Subject: [PATCH 2/2] black code reformat --- processing/router.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/processing/router.py b/processing/router.py index e9dd2cd..d6df873 100644 --- a/processing/router.py +++ b/processing/router.py @@ -146,7 +146,8 @@ def is_remote_sensing_pretrained(dataset_doc: dict, problem: dict) -> bool: "image" not in get_resource_types(dataset_doc) and (classification or regression) and remote_sensing - and _problem.TaskKeyword.SEMISUPERVISED not in problem["problem"]["task_keywords"] + and _problem.TaskKeyword.SEMISUPERVISED + not in problem["problem"]["task_keywords"] ) @@ -162,7 +163,8 @@ def is_remote_sensing(dataset_doc: dict, problem: dict) -> bool: "image" in get_resource_types(dataset_doc) and (classification or regression) and remote_sensing - and _problem.TaskKeyword.SEMISUPERVISED not in problem["problem"]["task_keywords"] + and _problem.TaskKeyword.SEMISUPERVISED + not in problem["problem"]["task_keywords"] ) @@ -211,13 +213,23 @@ def is_text(dataset_doc: dict) -> bool: def is_semisupervised_tabular(problem: dict) -> bool: - remote_sensing = _problem.TaskKeyword.REMOTE_SENSING in problem["problem"]["task_keywords"] - return not remote_sensing and _problem.TaskKeyword.SEMISUPERVISED in problem["problem"]["task_keywords"] + remote_sensing = ( + _problem.TaskKeyword.REMOTE_SENSING in problem["problem"]["task_keywords"] + ) + return ( + not remote_sensing + and _problem.TaskKeyword.SEMISUPERVISED in problem["problem"]["task_keywords"] + ) def is_semisupervised_remote_sensing_pretrained(problem: dict) -> bool: - remote_sensing = _problem.TaskKeyword.REMOTE_SENSING in problem["problem"]["task_keywords"] - return remote_sensing and _problem.TaskKeyword.SEMISUPERVISED in problem["problem"]["task_keywords"] + remote_sensing = ( + _problem.TaskKeyword.REMOTE_SENSING in problem["problem"]["task_keywords"] + ) + return ( + remote_sensing + and _problem.TaskKeyword.SEMISUPERVISED in problem["problem"]["task_keywords"] + ) # --