trianglengin 2.0.1__cp310-cp310-musllinux_1_2_x86_64.whl → 2.0.3__cp310-cp310-musllinux_1_2_x86_64.whl

trianglengin/cpp/game_state.cpp

@@ -4,7 +4,7 @@
 #include "shape_logic.h"
 #include <stdexcept>
 #include <numeric>
-#include <iostream>
+#include <iostream>  // <--- Add iostream
 #include <algorithm> // For std::min
 
 namespace trianglengin::cpp
@@ -37,10 +37,12 @@ namespace trianglengin::cpp
 
   void GameStateCpp::check_initial_state_game_over()
   {
-    get_valid_actions(true);
+    get_valid_actions(true); // This calls calculate_valid_actions_internal
     if (!game_over_ && valid_actions_cache_ && valid_actions_cache_->empty())
     {
       force_game_over("No valid actions available at start.");
+      // Log the reason for immediate game over
+      std::cerr << "[GameStateCpp::check_initial_state_game_over] Forced game over: No valid actions at start." << std::endl;
     }
   }
 
@@ -168,9 +170,15 @@ namespace trianglengin::cpp
   {
     if (game_over_)
       return true;
+    // If cache exists, use it. Otherwise, calculate.
     if (valid_actions_cache_.has_value())
       return valid_actions_cache_->empty();
-    calculate_valid_actions_internal();
+    // Need to remove const to calculate and potentially set game_over_
+    const_cast<GameStateCpp *>(this)->calculate_valid_actions_internal();
+    // Check game_over_ again as calculate might have set it
+    if (game_over_)
+      return true;
+    // Now the cache should exist
     return valid_actions_cache_->empty();
   }
 
@@ -210,6 +218,8 @@ namespace trianglengin::cpp
     if (!game_over_ && valid_actions_cache_->empty())
     {
       force_game_over("No valid actions available.");
+      // Log the reason for game over after calculation
+      std::cerr << "[GameStateCpp::get_valid_actions] Forced game over: No valid actions found after calculation." << std::endl;
     }
     return *valid_actions_cache_;
   }
@@ -219,14 +229,20 @@ namespace trianglengin::cpp
     valid_actions_cache_ = std::nullopt;
   }
 
-  void GameStateCpp::calculate_valid_actions_internal() const
+  // Make this non-const so it can modify the cache
+  void GameStateCpp::calculate_valid_actions_internal() const // Keep const for now, use mutable cache
   {
     if (game_over_)
     {
       valid_actions_cache_ = std::set<Action>();
+      // Add logging for this case too
+      std::cerr << "[GameStateCpp::calculate_valid_actions_internal] Game already over. Returning empty set." << std::endl;
       return;
     }
     std::set<Action> valid_actions;
+    int can_place_true_count = 0; // Counter for debugging
+    int attempts_count = 0;       // Counter for total placement checks
+
     for (int shape_idx = 0; shape_idx < static_cast<int>(shapes_.size()); ++shape_idx)
     {
       if (!shapes_[shape_idx].has_value())
@@ -237,13 +253,28 @@ namespace trianglengin::cpp
         const auto &[start_c, end_c] = config_.playable_range_per_row[r];
         for (int c = start_c; c < end_c; ++c)
         {
-          if (grid_logic::can_place(grid_data_, shape, r, c))
+          attempts_count++;                                                       // Increment attempt counter
+          bool can_place_result = grid_logic::can_place(grid_data_, shape, r, c); // Store result
+          if (can_place_result)
           {
             valid_actions.insert(encode_action(shape_idx, r, c));
+            can_place_true_count++; // Increment counter
           }
+          // Optional: Log failed attempts if needed for deep debugging
+          // else {
+          //     std::cerr << "[Debug] can_place failed for shape " << shape_idx << " at (" << r << "," << c << ")" << std::endl;
+          // }
         }
       }
     }
+    // Add logging here
+    std::cerr << "[GameStateCpp::calculate_valid_actions_internal] Step: " << current_step_
+              << ", Attempts: " << attempts_count
+              << ", CanPlaceTrue: " << can_place_true_count
+              << ", ValidActionsFound: " << valid_actions.size()
+              << std::endl;
+
+    // Use mutable cache
     valid_actions_cache_ = std::move(valid_actions);
   }
 
@@ -253,6 +284,7 @@ namespace trianglengin::cpp
   GameStateCpp GameStateCpp::copy() const
   {
     GameStateCpp newState = *this;
+    // Copy the cache state explicitly
     if (this->valid_actions_cache_.has_value())
     {
       newState.valid_actions_cache_ = this->valid_actions_cache_;
@@ -275,9 +307,10 @@ namespace trianglengin::cpp
       color_grid[r][c] = was_occupied ? NO_COLOR_ID : DEBUG_COLOR_ID;
       if (!was_occupied)
       {
+        // Check for line clears only if a cell becomes occupied
         grid_logic::check_and_clear_lines(grid_data_, {{r, c}});
       }
-      invalidate_action_cache();
+      invalidate_action_cache(); // Always invalidate after manual change
     }
   }
 

trianglengin/game_interface.py

@@ -8,6 +8,7 @@ import numpy as np
 from .config import EnvConfig
 
 try:
+    # Keep the alias for clarity within this file
     import trianglengin.trianglengin_cpp as cpp_module
 except ImportError as e:
     raise ImportError(
@@ -127,6 +128,19 @@ class GameState:
         # C++ returns double, cast might be redundant but safe for mypy
         return cast("float", self._cpp_state.get_score())
 
+    def get_outcome(self) -> float:
+        """
+        Returns the final outcome of the game if it's over, otherwise 0.0.
+        Required by MCTS implementations like trimcts.
+        """
+        if self.is_over():
+            # In this game, the final score is the outcome.
+            # Adjust if a different outcome definition is needed (e.g., +1 win, -1 loss).
+            return self.game_score()
+        else:
+            # MCTS typically expects 0 for non-terminal states during simulation.
+            return 0.0
+
     def valid_actions(self, force_recalculate: bool = False) -> set[int]:
         """
         Returns a set of valid encoded action indices for the current state.

{trianglengin-2.0.1.dist-info → trianglengin-2.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trianglengin
-Version: 2.0.1
+Version: 2.0.3
 Summary: High-performance C++/Python engine for a triangle puzzle game.
 Author-email: "Luis Guilherme P. M." <lgpelin92@gmail.com>
 License-Expression: MIT
@@ -40,7 +40,7 @@ Dynamic: license-file
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python Version](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 
-# Triangle Engine (`trianglengin`) v2
+# Triangle Engine (`trianglengin`) v2.0.3
 <img src="bitmap.png" alt="trianglengin logo" width="300"/>
 
 **Version 2 introduces a high-performance C++ core for the game logic.**
@@ -78,7 +78,7 @@ The primary goal is to provide a self-contained, installable library with a high
 
 ```bash
 # For standard use (once published or built):
-pip install trianglengin
+pip install trianglengin>=2.0.3
 
 # Building from source (requires compiler and CMake):
 git clone https://github.com/lguibr/trianglengin.git
@@ -233,7 +233,7 @@ trianglengin/
 ## Core Components (v2)
 
 - **`trianglengin.cpp` (C++ Core)**: Implements the high-performance game logic (state, grid, shapes, rules). Not directly imported in Python.
-- **`trianglengin.game_interface.GameState` (Python Wrapper)**: The primary Python class for interacting with the game engine. It holds a reference to the C++ game state object and provides methods like `step`, `reset`, `is_over`, `valid_actions`, `get_shapes`, `get_grid_data_np`.
+- **`trianglengin.game_interface.GameState` (Python Wrapper)**: The primary Python class for interacting with the game engine. It holds a reference to the C++ game state object and provides methods like `step`, `reset`, `is_over`, `valid_actions`, `get_shapes`, `get_grid_data_np`, **`get_outcome`**.
 - **`trianglengin.config.EnvConfig`**: Python Pydantic model for core environment configuration. Passed to C++ core during initialization.
 - **`trianglengin.utils`**: General Python utility functions and types. ([`src/trianglengin/utils/README.md`](src/trianglengin/utils/README.md))
 

{trianglengin-2.0.1.dist-info → trianglengin-2.0.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 trianglengin.libs/libstdc++-496613c0.so.6.0.32,sha256=AwZhL5WFT99I2Q6vIxXOhW7qddfuOZ1xecxiP9QTVY4,3494361
 trianglengin.libs/libgcc_s-a3a07607.so.1,sha256=5ptIUeAzZweNZrFehN0_Bb5B0FcJgux7NbAFoU8vwwo,148041
-trianglengin/game_interface.py,sha256=0aCePxmhLJOdlPGHU_JOuu-lsBZVfOs0vK5eke-bxv0,8730
+trianglengin/game_interface.py,sha256=ijfBH08DU2sHyMH6XZmQbFQZDPGsKlkk3gk3AUt3fmU,9304
 trianglengin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trianglengin/trianglengin_cpp.cpython-310-x86_64-linux-gnu.so,sha256=UWH4yF8fOnL9Iu6550q8d_OmrGXUbsxtVSDud3p1JRE,297897
+trianglengin/trianglengin_cpp.cpython-310-x86_64-linux-gnu.so,sha256=n333E_YNFGXnHoxKNI7VIeiwHA1YJeKNxbk4dLYhLGM,302201
 trianglengin/__init__.py,sha256=4INnGvOYIjzOyCew7lhX6Irc8_H7QVxWc5jopt9TCZ4,919
-trianglengin/trianglengin_cpp.cpython-37m-x86_64-linux-gnu.so,sha256=UWH4yF8fOnL9Iu6550q8d_OmrGXUbsxtVSDud3p1JRE,297897
+trianglengin/trianglengin_cpp.cpython-37m-x86_64-linux-gnu.so,sha256=n333E_YNFGXnHoxKNI7VIeiwHA1YJeKNxbk4dLYhLGM,302201
 trianglengin/config/README.md,sha256=PKm6HMVMZkA1KB22s2lP-jh5jwB7XIDiFgoShz_xj0s,1506
 trianglengin/config/env_config.py,sha256=IMjbOrAZxgVzLjod9tmFhv964E30paG4zI1eUS8Nvy8,2359
 trianglengin/config/display_config.py,sha256=FHY9iKuuk7L5h-xWtDTthHUlvyme4AJeA5kOk-zZJFg,1815
 trianglengin/config/__init__.py,sha256=wKb-lRhguEAJCxcPHG1qyW-AmUherzMbUfi3SZ6IEao,160
-trianglengin/cpp/game_state.cpp,sha256=ec_tLqySZTcEx7I01tLchLi5T90ep8l_oyRSZbUsu-U,10260
+trianglengin/cpp/game_state.cpp,sha256=WRYA_alYDZs2zR7NU1LMnZ9reKF8YvXGzF7KubQU0ys,12333
 trianglengin/cpp/structs.h,sha256=v_aL5O5gwXH_qRPGUIkNplr167rgf7gCVlWIJKOLV1U,993
 trianglengin/cpp/grid_data.cpp,sha256=KH9BbLuhi-_fmKgnT2oPuzHRDo87xFDHiBfpXCwgYsw,6904
 trianglengin/cpp/grid_logic.h,sha256=O6roOE_U7nbKgAkaMkC8LrEjGDvnL3QiVzOnXunXy9s,781
@@ -53,9 +53,9 @@ trianglengin/ui/visualization/core/__init__.py,sha256=26XCOn_jywwQ0YszGP6rEgFJIq
 trianglengin/ui/visualization/core/fonts.py,sha256=d9kQqdilPK0pTvXhv2oVJAbVT4pmWfjKxXfEir7Avdg,2016
 trianglengin/ui/visualization/core/visualizer.py,sha256=gWY4_vZGEzTokl6Z7xMeGvdrpJMl4YdZnfoT4bgBYW4,8860
 trianglengin/core/__init__.py,sha256=zMo_rn4wzVGzrevzZM4u4rkLwicZQeDqmXbnk9fI008,460
-trianglengin-2.0.1.dist-info/WHEEL,sha256=3TeHk7pe6VGhv1bN7RiItoCgoQBaHJ4uJWzlI0j8tM4,112
-trianglengin-2.0.1.dist-info/RECORD,,
-trianglengin-2.0.1.dist-info/top_level.txt,sha256=YsSWmp_2zM23wRc5TRERHpVCgQuVYieYHDTpnwVQC7Y,13
-trianglengin-2.0.1.dist-info/entry_points.txt,sha256=kQEqO_U-MEpMEC0xwOPSucBzQIq2Ny7XwCtFSruZhvY,57
-trianglengin-2.0.1.dist-info/METADATA,sha256=g8tEo09YNK3qFb45tFv8A_176S_oUHS-jHRl5UIq3Ws,12036
-trianglengin-2.0.1.dist-info/licenses/LICENSE,sha256=So3rgoJp-HgoxkclxZLIBC3pmmTwshN4tUO8KiQ6akc,1077
+trianglengin-2.0.3.dist-info/WHEEL,sha256=3TeHk7pe6VGhv1bN7RiItoCgoQBaHJ4uJWzlI0j8tM4,112
+trianglengin-2.0.3.dist-info/RECORD,,
+trianglengin-2.0.3.dist-info/top_level.txt,sha256=YsSWmp_2zM23wRc5TRERHpVCgQuVYieYHDTpnwVQC7Y,13
+trianglengin-2.0.3.dist-info/entry_points.txt,sha256=kQEqO_U-MEpMEC0xwOPSucBzQIq2Ny7XwCtFSruZhvY,57
+trianglengin-2.0.3.dist-info/METADATA,sha256=JQjjqC7xfHqrYAoSZx-07pFzVN4hb1SmyDFPvHG_Lvo,12066
+trianglengin-2.0.3.dist-info/licenses/LICENSE,sha256=So3rgoJp-HgoxkclxZLIBC3pmmTwshN4tUO8KiQ6akc,1077