diff --git a/fastfiz_env/reward_functions/__init__.py b/fastfiz_env/reward_functions/__init__.py index e442984..7c53b23 100644 --- a/fastfiz_env/reward_functions/__init__.py +++ b/fastfiz_env/reward_functions/__init__.py @@ -7,7 +7,6 @@ from .combined_reward import CombinedReward from .default_reward import DefaultReward from .reward_function import RewardFunction, Weight -from .winning_reward import WinningReward __all__ = [ "RewardFunction", @@ -15,6 +14,5 @@ "CombinedReward", "BinaryReward", "DefaultReward", - "WinningReward", "common", ] diff --git a/fastfiz_env/reward_functions/common/balls_not_moved_reward.py b/fastfiz_env/reward_functions/common/balls_not_moved_reward.py index f492088..9649fa3 100644 --- a/fastfiz_env/reward_functions/common/balls_not_moved_reward.py +++ b/fastfiz_env/reward_functions/common/balls_not_moved_reward.py @@ -1,5 +1,5 @@ from ...utils.fastfiz import any_ball_has_moved, get_ball_positions -from .. import BinaryReward +from ..binary_reward import BinaryReward class BallsNotMovedReward(BinaryReward): diff --git a/fastfiz_env/reward_functions/common/cue_ball_not_moved_reward.py b/fastfiz_env/reward_functions/common/cue_ball_not_moved_reward.py index def554f..1ccf9a2 100644 --- a/fastfiz_env/reward_functions/common/cue_ball_not_moved_reward.py +++ b/fastfiz_env/reward_functions/common/cue_ball_not_moved_reward.py @@ -1,7 +1,7 @@ import fastfiz as ff import numpy as np -from .. import BinaryReward +from ..binary_reward import BinaryReward class CueBallNotMovedReward(BinaryReward): diff --git a/fastfiz_env/reward_functions/common/cue_ball_pocketed_reward.py b/fastfiz_env/reward_functions/common/cue_ball_pocketed_reward.py index b0f2bd7..a0534d7 100644 --- a/fastfiz_env/reward_functions/common/cue_ball_pocketed_reward.py +++ b/fastfiz_env/reward_functions/common/cue_ball_pocketed_reward.py @@ -1,7 +1,7 @@ import fastfiz as ff import numpy as np -from .. import BinaryReward +from ..binary_reward import BinaryReward class CueBallPocketedReward(BinaryReward): diff --git a/fastfiz_env/reward_functions/common/game_won_reward.py b/fastfiz_env/reward_functions/common/game_won_reward.py index 6c1839f..ec591db 100644 --- a/fastfiz_env/reward_functions/common/game_won_reward.py +++ b/fastfiz_env/reward_functions/common/game_won_reward.py @@ -1,7 +1,7 @@ import fastfiz as ff import numpy as np -from .. import BinaryReward +from ..binary_reward import BinaryReward class GameWonReward(BinaryReward): diff --git a/fastfiz_env/reward_functions/common/impossible_shot_reward.py b/fastfiz_env/reward_functions/common/impossible_shot_reward.py index a9c5ba9..2815add 100644 --- a/fastfiz_env/reward_functions/common/impossible_shot_reward.py +++ b/fastfiz_env/reward_functions/common/impossible_shot_reward.py @@ -1,7 +1,7 @@ import fastfiz as ff import numpy as np -from .. import BinaryReward +from ..binary_reward import BinaryReward class ImpossibleShotReward(BinaryReward): diff --git a/fastfiz_env/reward_functions/common/step_no_balls_pocketed_reward.py b/fastfiz_env/reward_functions/common/step_no_balls_pocketed_reward.py index 273cb22..5223943 100644 --- a/fastfiz_env/reward_functions/common/step_no_balls_pocketed_reward.py +++ b/fastfiz_env/reward_functions/common/step_no_balls_pocketed_reward.py @@ -1,8 +1,8 @@ import fastfiz as ff import numpy as np -from ...reward_functions import BinaryReward from ...utils.fastfiz.fastfiz import num_balls_pocketed +from ..binary_reward import BinaryReward class StepNoBallsPocketedReward(BinaryReward): diff --git a/fastfiz_env/reward_functions/default_reward.py b/fastfiz_env/reward_functions/default_reward.py index 32fbfb3..824f289 100644 --- a/fastfiz_env/reward_functions/default_reward.py +++ b/fastfiz_env/reward_functions/default_reward.py @@ -1,6 +1,5 @@ from .combined_reward import CombinedReward from .common import ( - # ExponentialVelocityReward, BallsNotMovedReward, ConstantReward, ConstantWeight, diff --git a/fastfiz_env/reward_functions/winning_reward.py b/fastfiz_env/reward_functions/winning_reward.py deleted file mode 100644 index 9b29699..0000000 --- a/fastfiz_env/reward_functions/winning_reward.py +++ /dev/null @@ -1,38 +0,0 @@ -from .combined_reward import CombinedReward -from .common import ( - ConstantReward, - ConstantWeight, - ConstantWeightBalls, - CueBallPocketedReward, - ExponentialVelocityReward, - GameWonReward, - NegativeConstantWeight, - NegativeConstantWeightMaxSteps, - StepNoBallsPocketedReward, - StepPocketedReward, -) - -rewards = [ - GameWonReward(ConstantWeight), - CueBallPocketedReward(NegativeConstantWeight), - StepNoBallsPocketedReward(NegativeConstantWeight), - ConstantReward(NegativeConstantWeightMaxSteps), - StepPocketedReward(ConstantWeightBalls), - ExponentialVelocityReward(NegativeConstantWeight), -] - -WinningReward = CombinedReward(reward_functions=rewards, short_circuit=True) -""" -Winning reward function. - -Uses the following weighted reward functions: -- GameWonReward: 1 -- CueBallPocketedReward: -1 -- StepNoBallsPocketedReward: -1 -- ConstantReward: -1 / max_episode_steps -- StepPocketedReward: 1 / (num_balls - 1) -- ExponentialVelocityReward: -1 - -Returns: - CombinedReward: The default reward function. -"""