Merge pull request #133 from ujh/release-0.2.0

Release 0.2.0

Author: ujh

Diff for: CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.0 [☰](https://github.com/ujh/iomrascalai/compare/0.1.7...0.2.0)
+
+* UCT engine
+* A new playout policy that doesn't put large strings into self atari
+
 ## 0.1.7 [☰](https://github.com/ujh/iomrascalai/compare/0.1.6...0.1.7)
 
 * Improvements of the playout speeds

Diff for: Cargo.lock

@@ -2,7 +2,7 @@
 
 description = "An AI for the game of Go"
 name = "iomrascalai"
-version = "0.2.0-rc3"
+version = "0.2.0"
 authors = ["Urban Hafner <[email protected]>",
         "Thomas Poinsot <[email protected]>",
         "Igor Polyakov <[email protected]>"]

Diff for: Cargo.toml

@@ -49,11 +49,11 @@ pub fn factory(opt: Option<String>, config: Arc<Config>) -> Box<Engine> {
             match s.as_ref() {
                 "random" => Box::new(RandomEngine::new()),
                 "mc"     => Box::new(SimpleMcEngine::new(config.clone())),
-                "uct"    => Box::new(UctEngine::new(config.clone())),
-                _        => Box::new(AmafMcEngine::new(config.clone())),
+                "amaf"   => Box::new(AmafMcEngine::new(config.clone())),
+                _        => Box::new(UctEngine::new(config.clone())),
             }
         },
-        None => Box::new(AmafMcEngine::new(config.clone()))
+        None => Box::new(UctEngine::new(config.clone()))
     }
 }
 

Diff for: src/engine/mod.rs

@@ -26,9 +26,9 @@ use config::Config;
 use std::sync::Arc;
 
 #[test]
-fn factory_returns_amaf_by_default() {
+fn factory_returns_uct_by_default() {
     let engine = super::factory(None, Arc::new(Config::default()));
-    assert_eq!("amaf", engine.engine_type());
+    assert_eq!("uct", engine.engine_type());
 }
 
 #[test]
@@ -44,7 +44,13 @@ fn factory_returns_simple_mc_when_given_mc() {
 }
 
 #[test]
-fn factory_rutuyrns_amaf_for_any_other_string() {
-    let engine = super::factory(Some(String::from_str("foo")), Arc::new(Config::default()));
+fn factory_returns_amaf_when_given_amaf() {
+    let engine = super::factory(Some(String::from_str("amaf")), Arc::new(Config::default()));
     assert_eq!("amaf", engine.engine_type());
 }
+
+#[test]
+fn factory_returns_uct_for_any_other_string() {
+    let engine = super::factory(Some(String::from_str("foo")), Arc::new(Config::default()));
+    assert_eq!("uct", engine.engine_type());
+}

Diff for: src/engine/test.rs

@@ -71,10 +71,10 @@ mod version;
 pub fn main() {
     let mut opts = Options::new();
     let args : Vec<String> = args().collect();
-    opts.optopt("e", "engine", "select an engine (defaults to amaf)", "amaf|mc|random|uct");
+    opts.optopt("e", "engine", "select an engine (defaults to uct)", "amaf|mc|random|uct");
     opts.optopt("r", "ruleset", "select the ruleset (defaults to chinese)", "cgos|chinese|tromp-taylor|minimal");
     opts.optopt("t", "threads", "number of threads to use (defaults to 1)", "NUM");
-    opts.optopt("p", "playout", "type of playout to use (defaults to light)", "light|no-self-atari");
+    opts.optopt("p", "playout", "type of playout to use (defaults to no-self-atari)", "light|no-self-atari");
     opts.optflag("h", "help", "print this help menu");
     opts.optflag("v", "version", "print the version number");
     opts.optflag("l", "log", "log to stderr (defaults to false)");

Diff for: src/main.rs

@@ -34,16 +34,16 @@ mod test;
 
 pub fn factory(opt: Option<String>) -> Box<Playout> {
     match opt.as_ref().map(::std::ops::Deref::deref) {
-        Some("no-self-atari") => Box::new(NoSelfAtariPlayout),
-        _ => Box::new(NoEyesPlayout),
+        Some("light") => Box::new(NoEyesPlayout),
+        _             => Box::new(NoSelfAtariPlayout),
     }
 }
 
 pub trait Playout: Sync + Send {
 
     fn run(&self, board: &mut Board, initial_move: Option<&Move>, rng: &mut XorShiftRng) -> PlayoutResult {
         let mut played_moves = Vec::new();
-        
+
         initial_move.map(|&m| {
             board.play_legal_move(m);
             played_moves.push(m);

Diff for: src/playout/mod.rs

@@ -24,13 +24,19 @@
 mod no_eyes;
 
 #[test]
-fn factory_returns_no_eyes_by_default() {
+fn factory_returns_no_self_atari_by_default() {
     let playout = super::factory(None);
-    assert_eq!("NoEyesPlayout", playout.playout_type());
+    assert_eq!("NoSelfAtariPlayout", playout.playout_type());
 }
 
 #[test]
-fn factroy_returns_no_eyes_when_given_any_string() {
+fn factory_returns_no_self_atari_when_given_any_string() {
     let playout = super::factory(Some(String::from_str("foo")));
+    assert_eq!("NoSelfAtariPlayout", playout.playout_type());
+}
+
+#[test]
+fn factory_returns_no_eyes_when_given_light() {
+    let playout = super::factory(Some(String::from_str("light")));
     assert_eq!("NoEyesPlayout", playout.playout_type());
-}
+}

Diff for: src/playout/test/mod.rs

@@ -20,5 +20,5 @@
  ************************************************************************/
 
 pub fn version() -> &'static str {
-    "0.2.0-rc3"
+    "0.2.0"
 }