Merge pull request #119 from iopq/fixes

Fixes for performance

Author: ujh

src/board/chain/mod.rs

@@ -1,7 +1,7 @@
 /************************************************************************
  *                                                                      *
  * Copyright 2014 Thomas Poinsot                                        *
- * Copyright 2015 Urban Hafner                                          *
+ * Copyright 2015 Urban Hafner, Igor Polyakov                           *
  *                                                                      *
  * This file is part of Iomrascálaí.                                    *
  *                                                                      *
@@ -36,23 +36,25 @@ pub struct Chain {
 }
 
 impl Chain {
-    pub fn new(id: usize, color: Color, c: Coord, libs: Vec<Coord>) -> Chain {
+    pub fn new(id: usize, color: Color, c: Coord, libs: HashSet<Coord>) -> Chain {
         Chain {
             color:  color,
             coords: vec!(c),
             id:     id,
-            libs:   libs.into_iter().collect(),
+            libs:   libs,
         }
     }
 
     pub fn color(&self) -> Color {
         self.color
     }
 
+    #[inline(always)]
     pub fn coords<'a>(&'a self) -> &'a Vec<Coord> {
         &self.coords
     }
 
+    #[inline(always)]
     pub fn liberties(&self) -> &HashSet<Coord> {
         &self.libs
     }
@@ -65,18 +67,22 @@ impl Chain {
         self.id = id;
     }
 
+    #[inline(always)]
     pub fn add_liberty(&mut self, coord: Coord) {
         self.libs.insert(coord);
     }
 
+    #[inline(always)]
     pub fn remove_liberty(&mut self, coord: Coord) {
         self.libs.remove(&coord);
     }
 
+    #[inline(always)]
     pub fn add_coord(&mut self, coord: Coord) {
         self.coords.push(coord);
     }
 
+    #[inline(always)]
     pub fn is_captured(&self) -> bool {
         self.libs.len() == 0
     }

src/board/chain/test.rs

@@ -3,10 +3,13 @@
 use board::Black;
 use board::Chain;
 use board::Coord;
+use std::collections::HashSet;
 
 #[test]
 fn show_returns_a_legible_string_for_the_chain() {
-    let mut c = Chain::new(1, Black, Coord::new(7,7), vec!(Coord::new(1,1)));
+    let mut set = HashSet::new();
+    set.insert(Coord::new(1,1));
+    let mut c = Chain::new(1, Black, Coord::new(7,7), set);
 
     c.add_coord(Coord::new(7,8));
     c.add_coord(Coord::new(7,9));

src/board/coord/mod.rs

@@ -1,7 +1,7 @@
 /************************************************************************
  *                                                                      *
  * Copyright 2014 Urban Hafner, Thomas Poinsot                          *
- * Copyright 2015 Urban Hafner                                          *
+ * Copyright 2015 Urban Hafner, Igor Polyakov                           *
  *                                                                      *
  * This file is part of Iomrascálaí.                                    *
  *                                                                      *
@@ -76,10 +76,12 @@ impl Coord {
             .collect()
     }
 
+    #[inline(always)]
     pub fn to_index(&self, board_size: u8) -> usize {
         (self.col as usize-1 + (self.row as usize-1)*board_size as usize)
     }
 
+    #[inline(always)]
     pub fn is_inside(&self, board_size: u8) -> bool {
         1 <= self.col && self.col <= board_size && 1 <= self.row && self.row <= board_size
     }