fix import and some error

rl/ac.py

@@ -3,7 +3,8 @@ import torch
 import torch.optim as optim
 
 from tugo import encoders
-from tugo.game_logic import goboard
+# from tugo.game_logic import goboard
+from tugo.game_logic import goboard_fast as goboard
 from tugo.agents import Agent
 from tugo.agents.helpers import is_point_an_eye
 

rl/ac_pass.py

@@ -2,7 +2,8 @@ import torch
 import numpy as np
 
 from tugo import encoders
-from tugo.game_logic import goboard
+# from tugo.game_logic import goboard
+from tugo.game_logic import goboard_fast as goboard
 from tugo.agents import Agent
 
 

rl/q.py

@@ -4,7 +4,8 @@ import torch.optim as optim
 from torch.distributions import Categorical
 
 from tugo import encoders
-from tugo.game_logic import goboard
+# from tugo.game_logic import goboard
+from tugo.game_logic import goboard_fast as goboard
 from tugo.agents import Agent
 from tugo.agents.helpers import is_point_an_eye
 

rl/simulate.py

@@ -1,4 +1,4 @@
-from tugo import rl
+from tugo.rl import experience
 from tugo.game_logic import scoring
 from tugo.game_logic import goboard_fast as goboard
 from tugo.game_logic.gotypes import Player
@@ -32,8 +32,8 @@ def simulate_game(black_player, white_player):
     )
 
 
-def experience_simulation(num_games, agent1, agent2):
-    collectors = [rl.ExperienceCollector() for _ in range(2)]
+def experience_simulation(num_games, agent1, agent2, progress_callback=None):
+    collectors = [experience.ExperienceCollector() for _ in range(2)]
     agents = [agent1, agent2]
 
     color1 = Player.black
@@ -55,4 +55,7 @@ def experience_simulation(num_games, agent1, agent2):
 
         color1 = color1.other
 
-    return rl.combine_experience(collectors)
+        if progress_callback:
+            progress_callback()
+
+    return experience.combine_experience(collectors)

rl/value.py

@@ -4,7 +4,8 @@ import torch.optim as optim
 from torch.distributions import Categorical
 
 from tugo import encoders
-from tugo import goboard
+# from tugo.game_logic import goboard
+from tugo.game_logic import goboard_fast as goboard
 from tugo.agents import Agent
 from tugo.agents.helpers import is_point_an_eye