Skip to content

Commit

Permalink
Reduce duplicate code
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 602224484
  • Loading branch information
xingyousong authored and copybara-github committed Jan 28, 2024
1 parent 7c7b02c commit f3839e7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 25 deletions.
24 changes: 0 additions & 24 deletions vizier/_src/pyvizier/oss/study_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,6 @@ class ObservationNoise(enum.Enum):
class StudyConfig(base_study_config.ProblemStatement):
"""A builder and wrapper for study_pb2.StudySpec proto."""

search_space: parameter_config.SearchSpace = attr.field(
init=True,
factory=parameter_config.SearchSpace,
validator=attr.validators.instance_of(parameter_config.SearchSpace),
on_setattr=attr.setters.validate,
)

algorithm: str = attr.field(
init=True,
validator=attr.validators.instance_of((Algorithm, str)),
Expand All @@ -158,15 +151,6 @@ class StudyConfig(base_study_config.ProblemStatement):
default=None,
kw_only=True)

# TODO: This name/type combo is confusing.
metric_information: base_study_config.MetricsConfig = attr.field(
init=True,
factory=base_study_config.MetricsConfig,
converter=base_study_config.MetricsConfig,
validator=attr.validators.instance_of(base_study_config.MetricsConfig),
kw_only=True,
)

observation_noise: ObservationNoise = attr.field(
init=True,
validator=attr.validators.instance_of(ObservationNoise),
Expand All @@ -184,14 +168,6 @@ class StudyConfig(base_study_config.ProblemStatement):
on_setattr=attr.setters.validate,
kw_only=True)

metadata: common.Metadata = attr.field(
init=True,
kw_only=True,
factory=common.Metadata,
validator=attr.validators.instance_of(common.Metadata),
on_setattr=[attr.setters.convert, attr.setters.validate],
)

# An internal representation as a StudyConfig proto.
# If this object was created from a StudyConfig proto, a copy of the original
# proto is kept, to make sure that unknown proto fields are preserved in
Expand Down
2 changes: 1 addition & 1 deletion vizier/_src/pyvizier/shared/base_study_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ class ProblemStatement:
validator=attr.validators.instance_of(parameter_config.SearchSpace),
on_setattr=[attr.setters.convert, attr.setters.validate],
)

# TODO: This name/type combo is confusing.
metric_information: MetricsConfig = attr.ib(
init=True,
factory=MetricsConfig,
Expand Down

0 comments on commit f3839e7

Please sign in to comment.