pymodule board generate all encode step

netcan · Jun 20, 2020 · 3e75488 · 3e75488
1 parent d6bba08
commit 3e75488
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/pymodule/benches/core_benmark.py b/pymodule/benches/core_benmark.py
diff --git a/pymodule/src/lib.rs b/pymodule/src/lib.rs
@@ -7,8 +7,10 @@
     > Created Time: 2020-06-20 19:24
 ************************************************************************/
 
-use animal_chess_core::board::Board as Brd;
-use animal_chess_core::board::{MOVE, ROW_NUM, COL_NUM, to_pos, RED_DEN, BLACK_DEN, TRAP};
+use animal_chess_core::board::{
+    Board as Brd, MOVE, ROW_NUM, COL_NUM,
+    get_move, to_pos, RED_DEN, BLACK_DEN, TRAP
+};
 use animal_chess_core::chess::{*, ChessKind::*};
 use pyo3::class::basic::PyObjectProtocol;
 use pyo3::prelude::*;
@@ -51,26 +53,24 @@ impl Board {
         }
     }
 
-    fn generate_all_steps(&self) -> Vec<MOVE> {
-        self.board.generate_all_steps()
+    /// generate_all_steps, each step be encoded to [0, 252)
+    fn generate_all_steps(&self) -> Vec<u8> {
+        self.board.generate_all_steps().into_iter().map(|mv| {
+            self.board.encode_move(mv)
+        }).collect()
     }
 
-    fn move_chess(&mut self, mv: MOVE) {
-        self.board.move_chess(mv)
+    fn move_chess(&mut self, mv: u8) {
+        self.board.move_chess(self.board.decode_move(mv))
     }
 
     fn undo_move(&mut self) {
         self.board.undo_move()
     }
 
-    /// encode move at current status, range [0, 252)
-    fn encode_move(&self, mv: MOVE) -> u8 {
-        self.board.encode_move(mv)
-    }
-
     /// decode move at current status
-    fn decode_move(&self, idx: u8) -> MOVE {
-        self.board.decode_move(idx)
+    fn decode_move(&self, idx: u8) -> ((usize, usize), (usize, usize))  {
+        get_move(self.board.decode_move(idx))
     }
 
     /// encode board by 2-value matrix: (16, 9, 7)
@@ -79,7 +79,6 @@ impl Board {
     }
 }
 
-
 #[pyproto]
 impl<'a> PyObjectProtocol<'a> for Board {
     fn __repr__(&'a self) -> PyResult<String>