Fix circular imports

P6-Pool · May 23, 2024 · f3b454e · f3b454e
1 parent 522e605
commit f3b454e
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 47 deletions.
diff --git a/fastfiz_env/reward_functions/__init__.py b/fastfiz_env/reward_functions/__init__.py
@@ -7,14 +7,12 @@
 from .combined_reward import CombinedReward
 from .default_reward import DefaultReward
 from .reward_function import RewardFunction, Weight
-from .winning_reward import WinningReward
 
 __all__ = [
     "RewardFunction",
     "Weight",
     "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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