fixing confusing not not

Author: iopq

src/board/mod.rs

@@ -624,21 +624,21 @@ impl Board {
         set.len() + 1 //plus the stone we're about to play
     }
 
-    pub fn new_chain_length_greater_than(&self, m: Move, limit: usize) -> bool {
+    pub fn new_chain_length_less_than(&self, m: Move, limit: usize) -> bool {
         let mut set: HashSet<&Coord> = HashSet::new();
 
         for &c in self.neighbours(m.coord()).iter() {
             if self.color(&c) == *m.color() {
                 for coord in self.get_chain(c).unwrap().coords().iter() {
                     set.insert(coord);
                     if set.len() + 1 > limit {
-                        return true;
+                        return false;
                     }
                 }
             }
         }
 
-        false
+        true
     }
 
     pub fn score(&self) -> Score {

src/board/test/hypotheticals.rs

@@ -116,7 +116,7 @@ fn two_stones_have_six_liberties() {
 
     let play = Play(Black, 10, 12);
     assert_eq!(2, board.new_chain_length(play));
-    assert!(board.new_chain_length_greater_than(play, 1));
+    assert!(board.new_chain_length_less_than(play, 3));
     assert_eq!(6, board.new_chain_liberties(play));
     assert!(board.new_chain_liberties_greater_than(play, 5));
 }
@@ -128,7 +128,7 @@ fn three_stones_have_eight_liberties() {
     let board  = game.board();
     let play = Play(Black, 10, 10);
     assert_eq!(3, board.new_chain_length(play));
-    assert!(board.new_chain_length_greater_than(play, 2));
+    assert!(board.new_chain_length_less_than(play, 4));
     assert_eq!(8, board.new_chain_liberties(play));
     assert!(board.new_chain_liberties_greater_than(play, 7));
 }
@@ -140,7 +140,7 @@ fn four_stones_have_eight_liberties() {
     let board  = game.board();
     let play = Play(Black, 10, 7);
     assert_eq!(4, board.new_chain_length(play));
-    assert!(board.new_chain_length_greater_than(play, 3));
+    assert!(board.new_chain_length_less_than(play, 5));
     assert_eq!(8, board.new_chain_liberties(play));
     assert!(board.new_chain_liberties_greater_than(play, 7));
 }
@@ -152,7 +152,7 @@ fn five_stones_have_eight_liberties() {
     let board  = game.board();
     let play = Play(Black, 10, 4);
     assert_eq!(5, board.new_chain_length(play));
-    assert!(board.new_chain_length_greater_than(play, 4));
+    assert!(board.new_chain_length_less_than(play, 6));
     assert_eq!(8, board.new_chain_liberties(play));
     assert!(board.new_chain_liberties_greater_than(play, 7));
 }
@@ -164,7 +164,7 @@ fn six_stones_have_nine_liberties() {
     let board  = game.board();
     let play = Play(Black, 15, 17);
     assert_eq!(6, board.new_chain_length(play));
-    assert!(board.new_chain_length_greater_than(play, 5));
+    assert!(board.new_chain_length_less_than(play, 7));
     assert_eq!(9, board.new_chain_liberties(play));
     assert!(board.new_chain_liberties_greater_than(play, 8));
 }
@@ -177,7 +177,7 @@ fn seven_stones_have_ten_liberties() {
     let play = Play(Black, 15, 13);
 
     assert_eq!(7, board.new_chain_length(play));
-    assert!(board.new_chain_length_greater_than(play, 6));
+    assert!(board.new_chain_length_less_than(play, 8));
     assert_eq!(10, board.new_chain_liberties(play));
     assert!(board.new_chain_liberties_greater_than(play, 9));
 }
@@ -189,7 +189,7 @@ fn nine_stones_have_twelve_liberties() {
     let board  = game.board();
     let play = Play(Black, 15, 9);
     assert_eq!(9, board.new_chain_length(play));
-    assert!(board.new_chain_length_greater_than(play, 8));
+    assert!(board.new_chain_length_less_than(play, 10));
     assert_eq!(12, board.new_chain_liberties(play));
     assert!(board.new_chain_liberties_greater_than(play, 11));
 }

src/playout/no_eyes.rs

@@ -45,19 +45,20 @@ impl Playout for NoSelfAtariPlayout {
 
     fn is_playable(&self, board: &Board, m: &Move) -> bool {
         !board.is_eye(&m.coord(), *m.color())
-        && (
-            board.liberty_count(m.coord()) > 1 ||
+        && {
+            let empty = board.liberty_count(m.coord());
+            empty > 1 ||
             {
                 let removed_enemies = board.removes_enemy_neighbouring_stones(*m);
 
-                removed_enemies > 1 ||
+                empty + removed_enemies > 1 ||
                 {
                 (removed_enemies > 0 && board.new_chain_liberties_greater_than(*m, 0)) ||
                 board.new_chain_liberties_greater_than(*m, 1)
                 }
-            } 
-            || !board.new_chain_length_greater_than(*m, 3) //don't suicide 3 stone groups in the playouts, only in the tree
-        )
+            }
+            || board.new_chain_length_less_than(*m, 3) //you can self-atari one or two stones in playouts
+        }
     }
 
     fn playout_type(&self) -> String {