wassname/optuna-dashboard
1
0
Fork 0
mirror of https://github.com/wassname/optuna-dashboard.git synced 2026-09-12 12:40:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #367 from c-bata/remove-todo-cached-extra-study-property

Browse Source 
Remove TODOs in CachedExtraStudyProperty
This commit is contained in:
Masashi Shibata
2023-01-13 21:42:37 +09:00
committed by GitHub
parent c91bd21036 63ac92a95d
commit af8f4555b8
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
optuna_dashboard/_cached_extra_study_property.py
+13 -15
View File
@@ -33,8 +33,8 @@ def get_cached_extra_study_property(
cached_extra_study_property.update(trials)
cached_extra_study_property_cache[study_id] = cached_extra_study_property
return (
cached_extra_study_property.intersection,
cached_extra_study_property.union,
cached_extra_study_property.intersection_search_space,
cached_extra_study_property.union_search_space,
cached_extra_study_property.union_user_attrs,
cached_extra_study_property.has_intermediate_values,
)
@@ -43,24 +43,22 @@ def get_cached_extra_study_property(
class _CachedExtraStudyProperty:
def __init__(self) -> None:
self._cursor: int = -1
# TODO: intersection_search_space and union_search_space look more clear since now we have
# union_user_attrs.
self._intersection: Optional[SearchSpaceSetT] = None
self._union: SearchSpaceSetT = set()
self._intersection_search_space: Optional[SearchSpaceSetT] = None
self._union_search_space: SearchSpaceSetT = set()
self._union_user_attrs: dict[str, bool] = {} # attr_name: is_sortable (= is_number)
self.has_intermediate_values: bool = False
@property
def intersection(self) -> SearchSpaceListT:
if self._intersection is None:
def intersection_search_space(self) -> SearchSpaceListT:
if self._intersection_search_space is None:
return []
intersection = list(self._intersection)
intersection = list(self._intersection_search_space)
intersection.sort(key=lambda x: x[0])
return intersection
@property
def union(self) -> SearchSpaceListT:
union = list(self._union)
def union_search_space(self) -> SearchSpaceListT:
union = list(self._union_search_space)
union.sort(key=lambda x: x[0])
return union
@@ -105,9 +103,9 @@ class _CachedExtraStudyProperty:
def _update_search_space(self, trial: FrozenTrial) -> None:
current = set([(n, d) for n, d in trial.distributions.items()])
self._union = self._union.union(current)
self._union_search_space = self._union_search_space.union(current)
if self._intersection is None:
self._intersection = copy.copy(current)
if self._intersection_search_space is None:
self._intersection_search_space = copy.copy(current)
else:
self._intersection = self._intersection.intersection(current)
self._intersection_search_space = self._intersection_search_space.intersection(current)
python_tests/test_cached_extra_study_property.py
+8 -8
View File
@@ -46,8 +46,8 @@ class _CachedExtraStudyPropertySearchSpaceTestCase(TestCase):
cached_extra_study_property = _CachedExtraStudyProperty()
cached_extra_study_property.update(trials)
self.assertEqual(len(cached_extra_study_property.intersection), 2)
self.assertEqual(len(cached_extra_study_property.union), 2)
self.assertEqual(len(cached_extra_study_property.intersection_search_space), 2)
self.assertEqual(len(cached_extra_study_property.union_search_space), 2)
def test_different_distributions(self) -> None:
distributions: list[dict[str, BaseDistribution]] = [
@@ -77,8 +77,8 @@ class _CachedExtraStudyPropertySearchSpaceTestCase(TestCase):
cached_extra_study_property = _CachedExtraStudyProperty()
cached_extra_study_property.update(trials)
self.assertEqual(len(cached_extra_study_property.intersection), 1)
self.assertEqual(len(cached_extra_study_property.union), 3)
self.assertEqual(len(cached_extra_study_property.intersection_search_space), 1)
self.assertEqual(len(cached_extra_study_property.union_search_space), 3)
def test_dynamic_search_space(self) -> None:
distributions: list[dict[str, BaseDistribution]] = [
@@ -115,8 +115,8 @@ class _CachedExtraStudyPropertySearchSpaceTestCase(TestCase):
cached_extra_study_property = _CachedExtraStudyProperty()
cached_extra_study_property.update(trials)
self.assertEqual(len(cached_extra_study_property.intersection), 0)
self.assertEqual(len(cached_extra_study_property.union), 3)
self.assertEqual(len(cached_extra_study_property.intersection_search_space), 0)
self.assertEqual(len(cached_extra_study_property.union_search_space), 3)
def test_contains_failed_trials(self) -> None:
distributions: dict[str, BaseDistribution] = {
@@ -139,8 +139,8 @@ class _CachedExtraStudyPropertySearchSpaceTestCase(TestCase):
cached_extra_study_property = _CachedExtraStudyProperty()
cached_extra_study_property.update(trials)
self.assertEqual(len(cached_extra_study_property.intersection), 2)
self.assertEqual(len(cached_extra_study_property.union), 2)
self.assertEqual(len(cached_extra_study_property.intersection_search_space), 2)
self.assertEqual(len(cached_extra_study_property.union_search_space), 2)
class _CachedExtraStudyPropertyIntermediateTestCase(TestCase):