rubykon 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0c6f51cb33c58227a82783ff663d546397ef750
-  data.tar.gz: 2764e68e3b5a9ecc0ed8b1e62273201bf8748962
+  metadata.gz: 719c9cb87af8a842ef98569911f50788ab6c0943
+  data.tar.gz: 0a6e0f63e45886fbec9c4f993b88488d35fd0709
 SHA512:
-  metadata.gz: 8d3d477881d123c94556c396885002ff3e01708f6f147c8aa1ceb7b625189de8d6f59202393d8f9806e75ef7743ccbd204c6f37e136b5dbe26b7f631eb5067f3
-  data.tar.gz: e5b6acffc005f3e3ad2098cb7c3efc37b95253e8d58288a486d46f43b7c12dd047e80b528dd95ad47fd7d5ad4b510bcea5db48b6da333d1767dd9b810c2b4993
+  metadata.gz: 3adfcd1fafb3ecb4eec479e2e09cea8bbcee5158a9cafc16b0b09adafb654c778d1f5a20fff8899015635d78c0ede536b95e5601918534491baa410aedc0e499
+  data.tar.gz: 2045fb60ecba1096171bd54ad770d118aee5dacb2175ac10f53e3e11418e4627817d91bc70a846ebfc51cd83867c4c581008bb6836a3717b21aa0954f9f4ff31

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-## 0.3 (2015-11-12)
+## 0.3.1
+Fixups to the CLI after the fast release.
+
+### Bugfixes
+* fix wrong magic comment in gem executable
+* do not allow invalid moves in the CLI
+* implement `wdyt` command to ask rubykon what it is thinking
+* make FakeIO return nil on print/puts as it should be
+* Allow lower case move input (a19)
+
+## 0.3 (2015-11-17)
 Implement full bot together with Monte Carlo Tree Search, as well as a more coarse grained benchmarking tool to benchmark full MCTS runs. Also add a CLI. Mostly a feature release.
 
 ### Performance

data/README.md

@@ -1,8 +1,12 @@
-# Rubykon [![Build Status](https://secure.travis-ci.org/PragTob/rubykon.png?branch=master)](https://travis-ci.org/PragTob/rubykon)[![Code Climate](https://codeclimate.com/github/PragTob/Rubykon.png)](https://codeclimate.com/github/PragTob/Rubykon)[![Test Coverage](https://codeclimate.com/github/PragTob/Rubykon/badges/coverage.svg)](https://codeclimate.com/github/PragTob/Rubykon/coverage)
+# Rubykon [![Gem Version](https://badge.fury.io/rb/rubykon.svg)](https://badge.fury.io/rb/rubykon)[![Build Status](https://secure.travis-ci.org/PragTob/rubykon.png?branch=master)](https://travis-ci.org/PragTob/rubykon)[![Code Climate](https://codeclimate.com/github/PragTob/Rubykon.png)](https://codeclimate.com/github/PragTob/Rubykon)[![Test Coverage](https://codeclimate.com/github/PragTob/Rubykon/badges/coverage.svg)](https://codeclimate.com/github/PragTob/Rubykon/coverage)
 A Go-Engine being built in Ruby. 
 
 ### Status?
-A naive very slow implementation of random playouts. Next up making it faster... or implementing the mcts bits. We'll see. Don't use and judge yet, some pretty inefficient stuff in here :D
+There is a CLI with which you can play, it does a full UCT MCTS. Still work to do on making move generation and scoring faster. Also there is no AMAF/RAVE implementation yet (which would make it a lot stronger) and it also does not use any expert knowledge right now. So still a lot to do, but it works.
+
+
+### Sub gems
+Right now the `mcts` and `benchmark/avg` gem that I wrote for this are still embedded in here. They are bound to be broken out and released as separate gems to play with. If you want to use them now, just use rubykon and you can require `mcts` or `benchmark/avg` :)
 
 ### Why would you build a Go-Bot in Ruby?
 Cause it's fun.

data/exe/rubykon

@@ -1,4 +1,4 @@
-#!/usr/exe/env ruby
+#!/usr/bin/env ruby
 require_relative '../lib/rubykon'
 
 cli = Rubykon::CLI.new

data/lib/rubykon/cli.rb

@@ -1,15 +1,19 @@
 module Rubykon
   class CLI
 
-    EXIT            = /exit/i
-    CHAR_LABELS     = GTPCoordinateConverter::X_CHARS
-    X_LABEL_PADDING = ' '.freeze * 4
-    Y_LABEL_WIDTH   = 3
+    EXIT                      = /exit/i
+    CHAR_LABELS               = GTPCoordinateConverter::X_CHARS
+    X_LABEL_PADDING           = ' '.freeze * 4
+    Y_LABEL_WIDTH             = 3
+    GTP_COORDINATE            = /^[A-Z]\d\d?$/
+    MOVE_CONSIDERATIONS_COUNT = 10
 
     def initialize(output = $stdout, input = $stdin)
-      @output     = output
-      @input      = input
-      @state      = :init
+      @output         = output
+      @input          = input
+      @state          = :init
+      @move_validator = MoveValidator.new
+      @root           = nil
     end
 
     def start
@@ -18,7 +22,7 @@ module Rubykon
       @output.puts <<-PLAYOUTS
 Please enter the number of playouts you'd like rubykon to make!
 More playouts means rubykon is stronger, but also takes longer.
-For 9x9 10000 is an acceptable value, for 19x19 1000 already take a long time.
+For 9x9 10000 is an acceptable value, for 19x19 1000 already take a long time (but still plays bad).
       PLAYOUTS
       playouts = get_digit_input
       init_game(size, playouts)
@@ -68,7 +72,7 @@ For 9x9 10000 is an acceptable value, for 19x19 1000 already take a long time.
         if bot_turn?
           bot_move
         else
-          human_move
+          human_input
         end
       end
     end
@@ -96,19 +100,55 @@ For 9x9 10000 is an acceptable value, for 19x19 1000 already take a long time.
 
     def bot_move
       @output.puts 'Rubykon is thinking...'
-      root = @mcts.start @game_state, @playouts
-      move = root.best_move
-      best_children = root.children.sort_by(&:win_percentage).reverse.take(10)
-      @output.puts best_children.map {|child| "#{@gtp_converter.to(child.move.first)} => #{child.win_percentage}"}.join "\n"
+      @root = @mcts.start @game_state, @playouts
+      move = @root.best_move
       make_move(move)
     end
 
-    def human_move
+    def human_input
+      input = ask_for_input.upcase
+      case input
+      when GTP_COORDINATE
+        human_move(input)
+      when 'WDYT'.freeze
+        print_move_considerations
+      else
+        invalid_input
+      end
+    end
+
+    def ask_for_input
       @output.puts "Make a move in the form XY, e.g. A19, D7 as the labels indicate!"
-      coords = get_input
-      identifier = @gtp_converter.from(coords)
-      move = [identifier, :white]
-      make_move(move)
+      @output.puts 'Or ask rubykon what it is thinking with "wdyt"'
+      get_input
+    end
+
+    def human_move(input)
+      move = move_from_input(input)
+      if @move_validator.valid?(*move, @game_state.game)
+        make_move(move)
+      else
+        retry_input
+      end
+    end
+
+    def retry_input
+      @output.puts 'That was an invalid move, please try again!'
+      human_input
+    end
+
+    def print_move_considerations
+      best_children = @root.children.sort_by(&:win_percentage).reverse
+      top_children  = best_children.take(MOVE_CONSIDERATIONS_COUNT)
+      moves_to_win_percentage = top_children.map do |child|
+        "#{@gtp_converter.to(child.move.first)} => #{child.win_percentage * 100}%"
+      end.join "\n"
+      @output.puts moves_to_win_percentage
+    end
+
+    def move_from_input(input)
+      identifier = @gtp_converter.from(input)
+      [identifier, :white]
     end
 
     def make_move(move)
@@ -118,5 +158,9 @@ For 9x9 10000 is an acceptable value, for 19x19 1000 already take a long time.
       @output.puts "#{@game.next_turn_color}'s turn to move!'"
     end
 
+    def invalid_input
+      puts "Sorry, didn't catch that!"
+    end
+
   end
 end

data/lib/rubykon/version.rb

@@ -1,3 +1,3 @@
 module Rubykon
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubykon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tobias Pfeiffer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies: []
 description: An AI to play Go using Monte Carlo Tree Search. Currently includes the
   mcts gem and benchmark/avg. Works on all major ruby versions.