Compare commits

...

2 commits

Author SHA1 Message Date
Henri Bourcereau 3d01e8fe06 fix: handle bot errors 2025-05-13 17:46:06 +02:00
Henri Bourcereau 4fd1f00af0 fix: use default maturin python lib name 2025-05-13 16:04:44 +02:00
4 changed files with 21 additions and 9 deletions

View file

@ -58,12 +58,17 @@ impl GameRunner {
} }
pub fn handle_event(&mut self, event: &GameEvent) -> Option<GameEvent> { pub fn handle_event(&mut self, event: &GameEvent) -> Option<GameEvent> {
if !self.state.validate(event) { if event == &GameEvent::PlayError {
println!("event not valid : {:?}", event);
return None; return None;
} }
// println!("consuming {:?}", event); let valid_event = if self.state.validate(event) {
self.state.consume(event); self.state.consume(event);
event
} else {
println!("{}", self.state);
println!("event not valid : {:?}", event);
&GameEvent::PlayError
};
// chain all successive bot actions // chain all successive bot actions
if self.bots.is_empty() { if self.bots.is_empty() {
@ -74,7 +79,7 @@ impl GameRunner {
let bot_events: Vec<GameEvent> = self let bot_events: Vec<GameEvent> = self
.bots .bots
.iter_mut() .iter_mut()
.filter_map(|bot| bot.handle_event(event)) .filter_map(|bot| bot.handle_event(valid_event))
.collect(); .collect();
// if bot_events.len() > 1 { // if bot_events.len() > 1 {

View file

@ -1,6 +1,7 @@
import trictrac import store
# import trictrac
game = trictrac.TricTrac() game = store.TricTrac()
print(game.get_state()) # "Initial state" print(game.get_state()) # "Initial state"
moves = game.get_available_moves() moves = game.get_available_moves()

View file

@ -1,7 +1,8 @@
import gymnasium as gym import gymnasium as gym
import numpy as np import numpy as np
from gymnasium import spaces from gymnasium import spaces
import trictrac # module Rust exposé via PyO3 # import trictrac # module Rust exposé via PyO3
import store # module Rust exposé via PyO3
from typing import Dict, List, Tuple, Optional, Any, Union from typing import Dict, List, Tuple, Optional, Any, Union
class TricTracEnv(gym.Env): class TricTracEnv(gym.Env):
@ -13,7 +14,7 @@ class TricTracEnv(gym.Env):
super(TricTracEnv, self).__init__() super(TricTracEnv, self).__init__()
# Instancier le jeu # Instancier le jeu
self.game = trictrac.TricTrac() self.game = store.TricTrac()
# Stratégie de l'adversaire # Stratégie de l'adversaire
self.opponent_strategy = opponent_strategy self.opponent_strategy = opponent_strategy

View file

@ -331,6 +331,9 @@ impl GameState {
return false; return false;
} }
} }
PlayError => {
return true;
}
} }
// We couldn't find anything wrong with the event so it must be good // We couldn't find anything wrong with the event so it must be good
@ -479,6 +482,7 @@ impl GameState {
TurnStage::RollDice TurnStage::RollDice
}; };
} }
PlayError => {}
} }
self.history.push(valid_event.clone()); self.history.push(valid_event.clone());
} }
@ -620,6 +624,7 @@ pub enum GameEvent {
player_id: PlayerId, player_id: PlayerId,
moves: (CheckerMove, CheckerMove), moves: (CheckerMove, CheckerMove),
}, },
PlayError,
} }
impl GameEvent { impl GameEvent {