Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
14 changes: 10 additions & 4 deletions ml-agents/mlagents/trainers/environment_parameter_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,11 @@ def update_lessons(
lesson_num = GlobalTrainingStatus.get_parameter_state(
param_name, StatusType.LESSON_NUM
)
next_lesson_num = lesson_num + 1
lesson = settings.curriculum[lesson_num]
if (
lesson.completion_criteria is not None
and len(settings.curriculum) > lesson_num + 1
and len(settings.curriculum) > next_lesson_num
):
behavior_to_consider = lesson.completion_criteria.behavior
if behavior_to_consider in trainer_steps:
Expand All @@ -144,11 +145,16 @@ def update_lessons(
self._smoothed_values[param_name] = new_smoothing
if must_increment:
GlobalTrainingStatus.set_parameter_state(
param_name, StatusType.LESSON_NUM, lesson_num + 1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

lesson_num + 1 occurred in 2-3 places

param_name, StatusType.LESSON_NUM, next_lesson_num
)
new_lesson_name = settings.curriculum[lesson_num + 1].name
new_lesson_name = settings.curriculum[next_lesson_num].name
new_lesson_value = settings.curriculum[
next_lesson_num
].value.to_string()

logger.info(
f"Parameter '{param_name}' has changed. Now in lesson '{new_lesson_name}'"
f"Parameter '{param_name}' has been updated with {new_lesson_value}."
+ f" Now in lesson '{new_lesson_name}'"
)
updated = True
if lesson.completion_criteria.require_reset:
Expand Down
31 changes: 31 additions & 0 deletions ml-agents/mlagents/trainers/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,13 @@ def apply(self, key: str, env_channel: EnvironmentParametersChannel) -> None:
"""
pass

@abc.abstractmethod
def to_string(self) -> str:
"""
Helper method to output sampler stats to console.
"""
pass


@attr.s(auto_attribs=True)
class ConstantSettings(ParameterRandomizationSettings):
Expand All @@ -306,6 +313,12 @@ def apply(self, key: str, env_channel: EnvironmentParametersChannel) -> None:
"""
env_channel.set_float_parameter(key, self.value)

def to_string(self) -> str:
"""
Helper method to output sampler stats to console.
"""
return f"Float: value={self.value}"


@attr.s(auto_attribs=True)
class UniformSettings(ParameterRandomizationSettings):
Expand Down Expand Up @@ -334,6 +347,12 @@ def apply(self, key: str, env_channel: EnvironmentParametersChannel) -> None:
key, self.min_value, self.max_value, self.seed
)

def to_string(self) -> str:
"""
Helper method to output sampler stats to console.
"""
return f"Uniform sampler: min={self.min_value}, max={self.max_value}"


@attr.s(auto_attribs=True)
class GaussianSettings(ParameterRandomizationSettings):
Expand All @@ -351,6 +370,12 @@ def apply(self, key: str, env_channel: EnvironmentParametersChannel) -> None:
key, self.mean, self.st_dev, self.seed
)

def to_string(self) -> str:
"""
Helper method to output sampler stats to console.
"""
return f"Gaussian sampler: mean={self.mean}, stddev={self.st_dev}"


@attr.s(auto_attribs=True)
class MultiRangeUniformSettings(ParameterRandomizationSettings):
Expand Down Expand Up @@ -384,6 +409,12 @@ def apply(self, key: str, env_channel: EnvironmentParametersChannel) -> None:
key, self.intervals, self.seed
)

def to_string(self) -> str:
"""
Helper method to output sampler stats to console.
"""
return f"MultiRangeUniform sampler: intervals={self.intervals}"


# ENVIRONMENT PARAMETERS ###############################################################
@attr.s(auto_attribs=True)
Expand Down