More tidy up

chris-moreton · May 7, 2023 · 2b4ad21 · 2b4ad21
1 parent 84c5753
commit 2b4ad21
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/fen.rs b/src/fen.rs
@@ -314,7 +314,7 @@ pub fn get_fen(position: &Position) -> String {
     fen
 }
 
-pub fn fen_move_to_algebraic(fen: &str, move_str: &str) -> Option<String> {
+pub fn simple_algebraic_to_pretty_algebraic(fen: &str, move_str: String) -> Option<String> {
     let pieces = "RNBQKPrnbqkp";
     let mut piece_to_algebraic: HashMap<char, String> = HashMap::new();
     for ch in pieces.chars() {

diff --git a/src/scan.rs b/src/scan.rs
@@ -5,7 +5,7 @@ use std::time::{Duration, Instant};
 use opencv::core::{Point, Rect, count_non_zero, Size_, min_max_loc};
 use std::ops::{Add};
 use std::process::{Command};
-use crate::fen::{algebraic_move_from_move, get_position};
+use crate::fen::{algebraic_move_from_move, get_position, simple_algebraic_to_pretty_algebraic};
 use crate::moves::is_check;
 use crate::search::iterative_deepening;
 use crate::types::{BLACK, default_search_state, WHITE};
@@ -86,17 +86,19 @@ pub fn screen_scan(flipped_board: bool) -> Result<()> {
                     if !is_check(&position, BLACK) {
                         if !flipped_board {
                             let mv = iterative_deepening(&position, 100_u8, &mut search_state);
+                            let mv_text = simple_algebraic_to_pretty_algebraic(&*fen, algebraic_move_from_move(mv)).unwrap();
                             ticker += 1;
-                            show_move_text(algebraic_move_from_move(mv), ticker);
+                            show_move_text(mv_text, ticker);
                         }
                     }
                     let fen = fen.replace(" w ", " b ");
                     let position = get_position(&fen);
                     if !is_check(&position, WHITE) {
                         if flipped_board {
                             let mv = iterative_deepening(&position, 100_u8, &mut search_state);
+                            let mv_text = simple_algebraic_to_pretty_algebraic(&*fen, algebraic_move_from_move(mv)).unwrap();
                             ticker += 1;
-                            show_move_text(algebraic_move_from_move(mv), ticker);
+                            show_move_text(mv_text, ticker);
                         }
                     }
 

diff --git a/tests/fen.rs b/tests/fen.rs
@@ -1,5 +1,5 @@
 use rusty_rival::bitboards::{B2_BIT, C8_BIT, D8_BIT, E1_BIT, E2_BIT, F3_BIT, F4_BIT};
-use rusty_rival::fen::{algebraic_move_from_move, algebraic_squareref_from_bitref, bit_array_to_decimal, bitref_from_algebraic_squareref, board_bits, char_as_num, fen_board_part, fen_move_to_algebraic, get_fen, get_fen_ranks, get_piece_on_square, get_position, move_from_algebraic_move, piece_bitboard, rank_bits};
+use rusty_rival::fen::{algebraic_move_from_move, algebraic_squareref_from_bitref, bit_array_to_decimal, bitref_from_algebraic_squareref, board_bits, char_as_num, fen_board_part, simple_algebraic_to_pretty_algebraic, get_fen, get_fen_ranks, get_piece_on_square, get_position, move_from_algebraic_move, piece_bitboard, rank_bits};
 use rusty_rival::move_constants::{EN_PASSANT_NOT_AVAILABLE, START_POS};
 use rusty_rival::types::{is_bk_castle_available, is_bq_castle_available, is_wk_castle_available, is_wq_castle_available, BLACK, WHITE};
 
@@ -186,9 +186,9 @@ fn it_creates_a_position_from_a_fen_2() {
 #[test]
 fn it_converts_a_simple_move_to_an_algebraic_move() {
     let fen = "6k1/P5p1/1pq1N2p/1p5P/1P3RP1/2PK1B2/1r2N3/7N w - - 0 1";
-    assert_eq!(fen_move_to_algebraic(fen, "f3a8"), Some(String::from("Ba8")));
-    assert_eq!(fen_move_to_algebraic(fen, "c3c4"), Some(String::from("c4")));
-    assert_eq!(fen_move_to_algebraic(fen, "a7a8q"), Some(String::from("a8q")));
-    assert_eq!(fen_move_to_algebraic(fen, "e2d4"), Some(String::from("N2d4")));
-    assert_eq!(fen_move_to_algebraic(fen, "h1g3"), Some(String::from("Nhg3")));
+    assert_eq!(simple_algebraic_to_pretty_algebraic(fen, "f3a8".to_string()), Some(String::from("Ba8")));
+    assert_eq!(simple_algebraic_to_pretty_algebraic(fen, "c3c4".to_string()), Some(String::from("c4")));
+    assert_eq!(simple_algebraic_to_pretty_algebraic(fen, "a7a8q".to_string()), Some(String::from("a8q")));
+    assert_eq!(simple_algebraic_to_pretty_algebraic(fen, "e2d4".to_string()), Some(String::from("N2d4")));
+    assert_eq!(simple_algebraic_to_pretty_algebraic(fen, "h1g3".to_string()), Some(String::from("Nhg3")));
 }