Update chess-gpt-eval/mainvs.py

chess-gpt-eval/mainvs.py

@@ -501,8 +501,10 @@ def play_games(
     while games_saved < max_games:
         print(f"\nGame {games_saved} of {max_games}\n")
     
-        with open("gpt_inputs/prompt.txt", "r") as f:
-            game_state = f.read()
+        #with open("gpt_inputs/prompt.txt", "r") as f:
+        #    game_state = f.read()
+        game_state_with_move_num = ""
+        game_state_without_move_num = ""
         board = chess.Board()
 
         if book_opening:
@@ -538,7 +540,6 @@ def play_games(
 
             with open("game.txt", "w") as f:
                 f.write(game_state)
-            current_move_num = f"{board.fullmove_number if move_num_in_gamestate else ''}."
             total_moves += 1
             # I increment legal moves here so player_two isn't penalized for the game ending before its turn
             player_one_legal_moves += 1
@@ -546,8 +547,10 @@ def play_games(
 
             # this if statement may be overkill, just trying to get format to exactly match PGN notation
             if board.fullmove_number != 1:
-                game_state += " "
-            game_state += current_move_num
+                game_state_with_move_num += " "
+                game_state_without_move_num += " "
+            game_state_with_move_num += f"{board.fullmove_number}."
+            game_state_without_move_num += "."
             #print(f"|{game_state}|")
             #print(f"{current_move_num}", end=" ")
 
@@ -556,7 +559,7 @@ def play_games(
                 player_one_resignation,
                 player_one_failed_to_find_legal_move,
                 illegal_moves_one,
-            ) = play_turn(player_one, board, game_state, player_one=True)
+            ) = play_turn(player_one, board, game_state_with_move_num if player_one_move_num_in_gamestate else game_state_without_move_num, player_one=True)
             player_one_illegal_moves  += 1 if illegal_moves_one > 0 else 0
             player_one_illegal_attempts += illegal_moves_one
             if illegal_moves_one != 0:
@@ -574,7 +577,7 @@ def play_games(
                 player_two_resignation,
                 player_two_failed_to_find_legal_move,
                 illegal_moves_two,
-            ) = play_turn(player_two, board, game_state, player_one=False)
+            ) = play_turn(player_two, board, game_state_with_move_num if player_two_move_num_in_gamestate else game_state_without_move_num, player_one=False)
             player_two_illegal_moves  += 1 if illegal_moves_two > 0 else 0
             player_two_illegal_attempts += illegal_moves_two
             if illegal_moves_two != 0:
@@ -655,7 +658,8 @@ MAX_MOVES = 999 # Due to nanogpt max input length of 1024
 recording_file = "logs/determine.csv" # default recording file. Because we are using list [player_ones], recording_file is overwritten
 player_ones = ["50M/adams.pt"]
 player_two_recording_name = "lc0_sweep" #"stockfish_sweep"
-move_num_in_gamestate = False
+player_one_move_num_in_gamestate = False
+player_two_move_num_in_gamestate = True
 book_opening = True
 random_opening = False
 random_opening_moves = 20
@@ -673,11 +677,11 @@ if __name__ == "__main__":
   #          player_one = NanoGptPlayer(model_name=player_one_recording_name, move_num_in_gamestate=move_num_in_gamestate)
 #            player_one_recording_name = "xformer_" + nanogpt_player
             player_one_recording_name = "mamba"
-            player_one = MambaPlayer(model_name="50M/anneal/anneal_complete_round3.pt", move_num_in_gamestate=move_num_in_gamestate)
+            player_one = MambaPlayer(model_name="50M/anneal/anneal_complete_round3.pt", move_num_in_gamestate=player_one_move_num_in_gamestate)
             #player_two = StockfishPlayer(skill_level=i, play_time=0.1)
 #            player_two = LC0PLayer(skill=i)
             
-            player_two = NanoGptPlayer(model_name="50M/stockfish_16layers_ckpt_with_optimizer.pt", move_num_in_gamestate=True)
+            player_two = NanoGptPlayer(model_name="50M/stockfish_16layers_ckpt_with_optimizer.pt", move_num_in_gamestate=player_two_move_num_in_gamestate)
             player_two_recording_name = "adam"
             # player_two = GPTPlayer(model="gpt-4")
             # player_two = GPTPlayer(model="gpt-3.5-turbo-instruct")