swint 0.5 → 0.6

data/CHANGELOG

@@ -1,7 +1,25 @@
-2008-01-17 v0.5 features
-
+2008-02-02 v0.6 features
+
+	* README rewritten
+	* swint executable now requires a subcommand, on of
+      'race', 'asc2map'
+	* some refactorization
+	* -n flag removed
+	* 'push_object'-feature implemented
+	* 'shout'- and listen'-feature implemented, not tested though
+	* swint now is a rubyforge project, see
+      http://rubyforge.org/projects/swint
+	* swint now comes with a simple 'asc2map' converter
+	* -t also turns on the flags-feature for visual marks on the map
+	* -r http://localhost:1234/ may be abbreviated to -r 1234
+
+2008-01-17 v0.5 features and fixes
+
+	* swint now is a ruby gem
 	* -e und -c to require and use a ruby robot class
-          for debugging and profiling purposes
+      for debugging and profiling purposes
+	* map rotation fix
+	* -w fix
 
 2008-01-14 v0.4 features
 
@@ -16,7 +34,7 @@
 
 2008-01-06 v0.2  lots of minor improvements
 
-	* less flickering
+	* less flickering (through ncurses binary tput)
 	* use -s to see every step
 	* use -w to wait for input each step
 

data/README

@@ -1,80 +1,49 @@
-
+(c) 2008-02-02 Philipp Hofmann <phil@s126.de>
 ================================================================================
-                             __         __            __    
-            .-----.--.--.--.|__|.-----.|  |_   .----.|  |--.
-            |__ --|  |  |  ||  ||     ||   _|__|   _||  _  |
-            |_____|________||__||__|__||____|__|__|  |_____|
-
-             (c) 2008-01-07 Philipp Hofmann <phil@s126.de>
+                                     __         __   
+                    .-----.--.--.--.|__|.-----.|  |_ 
+                    |__ --|  |  |  ||  ||     ||   _|
+                    |_____|________||__||__|__||____|
+        
 ================================================================================
 
-swint.rb is an entirely in Ruby written client for the SwarmIntelligence
-programming game originally created by Stefan Schwarzburg-Benz.
+_swint_ is an entirely in Ruby written client for the Swarm Intelligence
+programming game originally created by Stefan Schwarzburg.
+
 
 Usage:
 
-  ./swint.rb [options]
+  swint race [options]
+  swint asc2map <filename>
 
 
 Options:
 
-  -r|--robot <uri>
-
-    supply a URL to your robot's XMLRPC interface here, may be used repeatedly
-
-
-  -m|--map <filename>
-
-    supply a filename to the XML map of the game
-
-
-  -s|--step
-
-    visualize each step, not only each turn
-
-
-  -w|--wait
-
-    wait for input before each step
-
-
-  -v|--no-visual
-
-    turn off visuals
-
-
-  -t|--test
-
-    turn off the initial rotation of map (better for testing)
-
-
-  -n|--n-times <times>
-
-    play more than one game
-
-
-  -i|--statistics
-
-    display statistics
-
-
-  -e|--require <file>
-
-    require a ruby file
-
-
-  -c|--class
+  -r|--robot <uri>         supply a URL to your robot's XMLRPC
+                           interface here, may be used repeatedly
+  -m|--map <filename>      supply a filename to the XML map of the game
+  -s|--step                visualize each step, not only each turn
+  -w|--wait                wait for input before each step
+  -v|--no-visual           turn off visuals
+  -t|--test                turn off the initial rotation of map
+                           (better for testing)
+  -i|--statistics          display timing statistics
+  -e|--require <file>      require a ruby file
+  -c|--class               add a ruby robot class as player
 
-    add a ruby robot class as player
 
+Examples:
 
-Example:
+  A quick race on example.map
+  $ swint race -r 8000 -r 8001 -i
 
-  For a quick match on example.map:
+  Testing your bot
+  $ swint race -r 8000 -s -t -m another.map
 
-  ./swint.rb -r http://localhost:8000/ -r http://localhost:8001/
+  Converting an ascii-map to xml-map
+  $ swint asc2map ascii.map > xml.map
 
-  For testing your bot:
 
-  ./swint.rb -r http://localhost:8000/ -s -t -w -m maps/example.map
+See Also:
 
+  Project Hompage: http://branch14.org/swint

data/Rakefile

@@ -1,5 +1,19 @@
 require 'rubygems'
 Gem::manage_gems
+
+################################################################################
+
+require 'spec/rake/spectask'
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
+	t.spec_files = FileList['examples/**/*.rb']
+	t.rcov = true
+	t.rcov_opts = ['--exclude', 'examples']
+end
+
+################################################################################
+
 require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
@@ -7,7 +21,7 @@ spec = Gem::Specification.new do |s|
 	# REQUIRED
 
 	s.name				= "swint"
-	s.version			= "0.5"
+	s.version			= "0.6"
 	s.summary			= "a console client for the swarm intelligence programming game"
 
 	# REQUIRED AND SET BY DEFAULT
@@ -37,7 +51,8 @@ spec = Gem::Specification.new do |s|
 	# s.has_rdoc			= false
 	# s.rdoc_options		= []
 	# s.required_ruby_version	= '> 0.0.0'
-	# s.requirements		= []
+	s.requirements			<< 'tput binary from ncurses'
+	s.requirements			<< "swarm intelligence maps, see #{s.homepage}"
 	# s.test_files			= []
 	# s.dependencies		= []
 	# s.add_dependency('log4r', '>= 1.0.5')
@@ -56,4 +71,3 @@ end
 task :default => "pkg/#{spec.name}-#{spec.version}.gem" do
     puts "generated latest version"
 end
-

data/bin/swint

@@ -1,75 +1,19 @@
 #! /usr/bin/env ruby
 #-*- coding: utf-8 -*-
 
-# (c) 2008-01-17 Philipp Hofmann <phil@s126.de>
-
-##############################
-
-require 'optparse'
-require 'ostruct'
-require 'xmlrpc/client'
-require 'rexml/document'
-
-##############################
-
-# $:.unshift(File.dirname(__FILE__))
-
-require 'swint_basics/array'
-require 'swint_basics/hash'
-
-require 'swint/_constants'
-require 'swint/game'
-require 'swint/map'
-require 'swint/field'
-require 'swint/result'
-require 'swint/abstract_robot'
-require 'swint/xmlrpc_robot'
-require 'swint/class_robot'
-
-##############################
-
-config = OpenStruct.new
-config.step = false
-config.wait = false
-config.visual = true
-config.map = 'example.map'
-config.robots = []
-config.ntimes = 1
-config.statistics = false
-
-opts = OptionParser.new do |o|
-        o.on('-r', '--robot URI', 'URI of robot') { |r| config.robots << r }
-        o.on('-m', '--map URI', 'URI of map') { |m| config.map = m }
-        o.on('-s', '--step', 'Show each step') { config.step = true }
-        o.on('-w', '--wait', 'Wait for return after visual') { config.wait = true }
-	o.on('-v', '--no-visual', 'No visual at all') { config.visual = false }
-	o.on('-t', '--test', 'Do not rotate map') { config.test = true }
-	o.on('-n', '--n-times TIMES', 'Run n games') { |n| config.ntimes = n.to_i }
-	o.on('-i', '--statistics', 'Display statistics') { config.statistics = true }
-	o.on('-e', '--require FILENAME', 'Provide a file to require') { |e| require(e) }
-	o.on('-c', '--class CLASS', 'Provide a Ruby Robot Class') { |c| config.robots << Kernel.const_get(c) }
+# (c) 2008-02-02 Philipp Hofmann <phil@s126.de>
+
+args = ARGV
+case args.shift.to_sym
+when :race
+  require 'swint_exec/race'
+  SwintExec::Race::start(args)
+when :tournament
+  require 'swint_exec/tournament'
+  SwintExec::Tournament::start(args)
+when :asc2map
+  require 'swint_exec/ascii_to_map'
+  SwintExec::AsciiToMap::start(args)
+else
+  puts 'unkown command (valid commands: race, tournament, asc2map)'
 end
-
-opts.parse!(ARGV)
-
-Swint.rotate_map! unless config.test
-
-unless File.exist?(config.map)
-	puts "mapfile #{config.map} not found"
-	exit
-end
-
-config.ntimes.times do
-	game = Swint::Game.new(config)
-	result = game.run
-	puts "winner after % 3s rounds robot %s" % [result.rounds, result.winner]
-	if config.statistics
-		puts "\ntiming statistics\n-----------------"
-		puts "game took %5.2f seconds" % result.time 
-		result.data.each do |r, d|
-			time = 0
-			d[:times].each { |t| time += t }
-			puts "% 5.2f seconds %s (%s)" % [time, d[:robot].name, d[:robot].owner]
-		end
-	end
-end

data/lib/{swint_basics/array.rb → array.rb}

@@ -15,4 +15,12 @@ class Array
 		replace(add(a))
 	end
 
+	def shuffle
+		# method 1, sorting is always slower
+		sort_by { rand }
+		# method 2, maybe faster
+		# a = self.clone
+		# a.collect { a.slice!(rand(a.size)) }
+	end
+
 end

data/lib/swint/abstract_robot.rb

@@ -33,6 +33,15 @@ module Swint
 		def end_game(msg)
 		end
 	
+		def flags
+		end
+
+		def listen
+		end
+
+		def shout
+		end
+
 		# --------------------------------------------------------------------------------
 
 		def is_valid?

data/lib/swint/class_robot.rb

@@ -43,6 +43,18 @@ module Swint
 			@instance.end_game(msg)
 		end
 	
+		def listen(msg)
+			@instance.listen(msg)
+		end
+
+		def shout
+			@instance.shout
+		end
+
+		def flags
+			@instance.flags
+		end
+
 	end
 
 end

data/lib/swint/field.rb

@@ -9,16 +9,16 @@ module Swint
 
 	class Field
 	
-		attr_accessor :robot
+		attr_accessor :robot, :weight
 		attr_reader :pos
 	
-		def initialize(s, pos)
-			@pos, @state = pos, s
+		def initialize(s, pos, weight=nil)
+			@pos, @state, @weight = pos, s, weight
 			@robot = false
 		end
 	
 		def state
-			@robot ? :robot : @state
+			@robot ? :robot : (@weight ? :object : @state)
 		end
 	
 	end

data/lib/swint/game.rb

@@ -1,129 +1,158 @@
 #! /usr/bin/env ruby
-#-*- coding: utf-8 -*-
+#-*- coding:utf-8 -*-
 
 # (c) 2008-01-14 Philipp Hofmann <phil@s126.de>
 
 module Swint
-
-	class Game
-		
-		def initialize(config)
-			@config = config
-			@robots = Hash.new
-			@map = Swint::Map.new.load_from_xml(File.new(config.map).read)
-			config.robots.each do |r|
-				puts "connecting to robot: #{r}" if config.visual
-				@robots[@robots.size+1] = Swint::XmlrpcRobot.new(r, @map.start) if r.is_a?(String)
-				@robots[@robots.size+1] = Swint::ClassRobot.new(r, @map.start) if r.is_a?(Class)
-			end
-			@result = Result.new(@robots)
-			@game_end = false
-		end
-	
-		def run
-			system "clear" if @config.visual
-			@robots.shuffle!
-			counter = 0
-			@result.start = Time.now
-			until @game_end
-				counter += 1
-				no_robot_left = true
-				@robots.each do |k, r|
-					r.speed.times do |step|
-						if !@game_end
-							answer = :do_nothing
-							dt = measure { answer = r.next(@map) } if r.has_energy?
-							case answer
-		
-								when :move_to
-									no_robot_left = false
-									if r.use_energy?
-										dir = nil
-										dt += measure { dir = r.move }
-										npos = r.pos.add(DIRV[dir])
-										nstate = @map.state_of_field(npos)
-										if nstate==:goal
-											@robots.each { |key, b| b.end_game( (b==r) ? 'winner' : 'looser' ) }
-											@result.winner = k
-											@game_end = true
-										end
-										if [:free, :energy, :start].include?(nstate)
-											f, p = @map.fields[npos], @map.fields[r.pos]
-											r.restore if f.state==:energy
-											p.robot = false
-											f.robot = true
-											r.pos = npos
-										end
-									end
-		
-								when :push_object
-									no_robot_left = false
-									if r.use_energy?
-										dir = nil
-										dt += measure { dir = r.push }
-										opos = r.pos.add(DIRV[dir])
-										ppos = opos.add(DIRV[dir])
-										ostate = @map.state_of_field(opos)
-										pstate = @map.state_of_field(ppos)
-										
-										if pstate==:free
-											if ostate==:object
-												# ...
-											end
-											if ostate==:robot
-												# ...
-											end
-										end
-		
-									end
-		
-							end
-		
-							@result.step(k, dt || 0)
-							# end of step
-							visualize(counter, step) if @config.visual && @config.step
-	
-						end
-	
-					end
-	
-					# end of robot
-	
-				end
+  
+  class Game
+    
+    def initialize(config)
+      @config = config
+      @robots = Hash.new
+      @map = Swint::Map.new.load_from_xml(File.new(config.map).read)
+      config.robots.each do |r|
+        puts "connecting to robot: #{r}" if config.visual
+        @robots[@robots.size+1] = Swint::XmlrpcRobot.new(r, @map.start) if r.is_a?(String)
+        @robots[@robots.size+1] = Swint::ClassRobot.new(r, @map.start) if r.is_a?(Class)
+      end
+      @result = Result.new(@robots)
+      @game_end = false
+    end
 	
-				# end of turn
-				visualize(counter) if @config.visual && !@config.step
-	
-				if no_robot_left
-					@robots.each { |k, b| b.end_game('looser') }
-					@game_end = true
-				end
-	
-			end
-	
-			# end of game
-			@result.rounds = counter
-			@result.end = Time.now
-			@result
-	
-		end
+    def run
+      system "clear" if @config.visual
+      counter = 0
+      @result.start = Time.now
+      until @game_end
+        counter += 1
+        no_robot_left = true
+        @robots.to_a.shuffle.each do |robot|
+          k, r = robot
+          r.speed.times do |step|
+            if !@game_end
+              answer = :do_nothing
+              dt = measure { answer = r.next(@map) } if r.has_energy?
+              case answer
+                
+              when :move_to
+                no_robot_left = false
+                if r.use_energy?
+                  dir = nil
+                  dt += measure { dir = r.move }
+                  npos = r.pos.add(DIRV[dir])
+                  nstate = @map.state_of_field(npos)
+                  if nstate==:goal
+                    @robots.each { |key, b| b.end_game( (b==r) ? 'winner' : 'looser' ) }
+                    @result.winner = k
+                    @game_end = true
+                  end
+                  if [:free, :energy, :start].include?(nstate)
+                    f, p = @map.fields[npos], @map.fields[r.pos]
+                    r.restore if f.state==:energy
+                    p.robot = false
+                    f.robot = true
+                    r.pos = npos
+                  end
+                end
+                
+              when :push_object
+                no_robot_left = false
+                if r.use_energy?
+                  dir = nil
+                  dt += measure { dir = r.push }
+                  opos = r.pos.add(DIRV[dir])
+                  ppos = opos.add(DIRV[dir])
+                  ostate = @map.state_of_field(opos)
+                  pstate = @map.state_of_field(ppos)
+                  
+                  if pstate==:free || pstate==:energy
+                    if ostate==:object
+                      if r.power >= @map.fields[opos].weight
+                        @map.fields[ppos].weight = @map.fields[opos].weight
+                        @map.fields[opos].weight = 0
+                      end
+                    end
+                    if ostate==:robot
+                      rob = @robots.values.select { |ro| ro.pos==opos }.first
+                      if r.power >= rob.weight
+                        rob.pos = ppos
+                        rob.restore if pstate==:energy
+                        @map.fields[opos].robot = false
+                        @map.fields[ppos].robot = true
+                      end
+                    end
+                  end
+                  
+                end
+
+              when :shout
+                no_robot_left = false
+                dt += measure { msg = r.shout }
+                @robots.each do |rid, rob|
+                  next if rid==k
+                  rob.listen(msg) if hex_distance(r.pos, rob.pos) <= r.voice * 10
+                end
+                
+              end
+              
+              @result.step(k, dt || 0)
+              # end of step
+              visualize(counter, step) if @config.visual && @config.step
+              
+            end
+            
+          end
+          
+          # end of robot
+          
+        end
+        
+        # end of turn
+        visualize(counter) if @config.visual && !@config.step
+        
+        if no_robot_left
+          @robots.each { |k, b| b.end_game('looser') }
+          @game_end = true
+        end
+        
+      end
+      
+      # end of game
+      @result.rounds = counter
+      @result.end = Time.now
+      @result
+      
+    end
 	
-		def visualize(round, step=nil)
-			system "tput cup 0 0"
-			print "ROUND: #{round}"
-			print " | STEP: #{step}" if step
-			puts
-			@robots.each { |k, r| puts "%s. [% 2s/% 2s] %s" % [k, r.energy_left, r.energy, r] }
-			@map.print_map(@robots)
-			gets if @config.wait
-		end
+    def visualize(round, step=nil)
+      system "tput cup 0 0"
+      print "ROUND: #{round}"
+      print " | STEP: #{step}" if step
+      puts
+      flags = {}
+      @robots.each do |k, r|
+        puts "%s. [% 2s/% 2s] %s" % [k, r.energy_left, r.energy, r]
+        flags.merge!(r.flags) if !@game_end && @config.test
+      end
+      @map.print_map(@robots, flags)
+      gets if @config.wait
+    end
 	
-		def measure
-			t = Time.now.to_f
-			yield
-			Time.now.to_f - t
-		end
-
-	end
+    def measure
+      t = Time.now.to_f
+      yield
+      Time.now.to_f - t
+    end
 
-end
+    def hex_distance(pos1, pos2) # might fail when map is rotated
+      x, y = pos2.add(pos1.collect { |e| -e })
+      a = 0
+      a = (x==y) ? 2 : 1 if ((x < 0) && (y < 0)) || ((x > 0) && (y > 0))
+      [x.abs, y.abs].max + a
+    end
+    
+  end
+  
+end
+    

data/lib/swint/map.rb

@@ -4,62 +4,75 @@
 # (c) 2008-01-07 Philipp Hofmann <phil@s126.de>
 
 module Swint
-
-	class Map
-	
-		attr_reader :start, :fields
-	
-		def initialize
-			@min, @max = [0, 0], [0, 0] # THIS IS AN ASUMPTION!
-			@fields = Hash.new(:outside)
-		end
-	
-		def load_from_xml(xml)
-			doc = REXML::Document.new(xml)
-			doc.elements.each('map/field') do |e|
-				v = e.attribute('v').value.to_i
-				u = e.attribute('u').value.to_i
-				s = e.attribute('state').value.to_sym
-				f = Swint::Field.new(s, [u, v])
-				@fields[f.pos] = f
-				@min[0] = u if u < @min[0]
-				@min[1] = v if v < @min[1]
-				@max[0] = u if u > @max[0]
-				@max[1] = v if v > @max[1]
-				if s==:start
-					@start = [u, v] 
-					# f.robot = true # HACK!
-				end
-			end
-			self
-		end
-	
-		def state_of_field(pos)
-			v = @fields[pos]
-			v.is_a?(Symbol) ? v : v.state
-		end
+  
+  class Map
 	
-		def print_map(robots)
-			w = ((@max[0]-@min[0])*2+(@max[1]-@min[1]))
-			border = '='*(w+6)
-			puts border
-			for y in @min[1]..@max[1]
-				line = ''
-				line += ' '*(y)
-				for x in @min[0]..@max[0]
-					s = state_of_field([x, y])
-					c = s!=:robot ? CHAR[state_of_field([x, y])] : robotkey_at(robots, [x, y]).to_s
-					line += c+' '
-				end
-				puts line
-			end
-			puts border
-		end
+    attr_reader :start, :fields
 	
-		def robotkey_at(robots, pos)
-			robots.each { |k, r| return k if r.pos==pos }
-		end
+    def initialize
+      @min, @max = [0, 0], [0, 0] # THIS IS AN ASUMPTION!
+      @fields = Hash.new(:outside)
+    end
 	
-	end
+    def load_from_xml(xml)
+      doc = REXML::Document.new(xml)
+      doc.elements.each('map/field') do |e|
+        v = e.attribute('v').value.to_i
+        u = e.attribute('u').value.to_i
+        s = e.attribute('state').value.to_sym
+        w = nil
+        if s==:object
+          w = e.attribute('weight').value.to_i
+          s = :free
+        end
+        f = Swint::Field.new(s, [u, v], w)
+        @fields[f.pos] = f
+        @min[0] = u if u < @min[0]
+        @min[1] = v if v < @min[1]
+        @max[0] = u if u > @max[0]
+        @max[1] = v if v > @max[1]
+        if s==:start
+          @start = [u, v] 
+          # f.robot = true # HACK!
+        end
+      end
+      self
+    end
+    
+    def state_of_field(pos)
+      v = @fields[pos]
+      v.is_a?(Symbol) ? v : v.state
+    end
+    
+    def print_map(robots, flags)
+      w = ((@max[0]-@min[0])*2+(@max[1]-@min[1]))
+      border = '='*(w+6)
+      puts border
+      print draw_map(robots, flags)
+      puts border
+    end
 
+    def draw_map(robots, flags)
+      output = []
+      for y in @min[1]..@max[1]
+        line = ''
+        line += ' '*(y)
+        for x in @min[0]..@max[0]
+          s = state_of_field([x, y])
+          c = s!=:robot ? CHAR[state_of_field([x, y])] : robotkey_at(robots, [x, y]).to_s
+          pstr = [x, y].add(@start.collect { |s| -s })*'x'
+          c = flags[pstr] if flags[pstr]
+          line += c+' '
+        end
+        output << line
+      end
+      output.join("\n")+"\n"
+    end
+    
+    def robotkey_at(robots, pos)
+      robots.each { |k, r| return k if r.pos==pos }
+    end
+    
+  end
+  
 end

data/lib/swint/xmlrpc_robot.rb

@@ -42,6 +42,18 @@ module Swint
 			@server.call('end_game', @gameid, msg)
 		end
 	
+		def listen(msg)
+			@server.call('listen', @gameid, msg)
+		end
+
+		def shout
+			@server.call('shout', @gameid)
+		end
+
+		def flags
+			@server.call('flags', @gameid)
+		end
+
 	end
 
 end

data/lib/swint_exec/ascii_to_map.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+# (c) 2008-01-22 Philipp Hofmann <phil@s126.de>
+
+require 'rexml/document'
+
+module SwintExec
+  
+  module AsciiToMap
+    
+    STATE = {
+      'S' => 'start',
+      'G' => 'goal',
+      '_' => 'free',
+      'o' => 'object',
+      '#' => 'outside',
+      '!' => 'energy'
+    }
+
+    def AsciiToMap.start(args)
+      
+      filename = args.first
+      lines = File.open(filename).read.split("\n")
+      xmldoc = REXML::Document.new
+      map = xmldoc.add_element('map')
+      
+      lines.size.times do |i|
+        line = lines[i].strip.split(' ')
+        line.size.times do |j|
+          map.add_element('field', {'state'=>STATE[line[j]], 'u'=>j, 'v'=>i })
+        end
+      end
+      
+      puts xmldoc
+      
+    end
+    
+  end
+  
+end

data/lib/swint_exec/race.rb

@@ -0,0 +1,74 @@
+#! /usr/bin/env ruby
+#-*- coding: utf-8 -*-
+
+# (c) 2008-01-17 Philipp Hofmann <phil@s126.de>
+
+require 'optparse'
+require 'ostruct'
+require 'xmlrpc/client'
+require 'rexml/document'
+
+require 'array'
+
+require 'swint/_constants'
+require 'swint/game'
+require 'swint/map'
+require 'swint/field'
+require 'swint/result'
+require 'swint/abstract_robot'
+require 'swint/xmlrpc_robot'
+require 'swint/class_robot'
+
+module SwintExec
+
+  module Race
+
+    def Race.start(args)
+      
+      config = OpenStruct.new
+      config.step = false
+      config.wait = false
+      config.visual = true
+      config.map = 'example.map'
+      config.robots = []
+      config.statistics = false
+      
+      opts = OptionParser.new do |o|
+        o.on('-r', '--robot URI', 'URI of robot') do |r|
+          r = "http://localhost:#{r}/" if /[0-9]+/.match(r)
+          config.robots << r
+        end
+        o.on('-m', '--map URI', 'URI of map') { |m| config.map = m }
+        o.on('-s', '--step', 'Show each step') { config.step = true }
+        o.on('-w', '--wait', 'Wait for return after visual') { config.wait = true }
+        o.on('-v', '--no-visual', 'No visual at all') { config.visual = false }
+        o.on('-t', '--test', 'Do not rotate map') { config.test = true }
+        o.on('-i', '--statistics', 'Display statistics') { config.statistics = true }
+        o.on('-e', '--require FILENAME', 'Provide a file to require') { |e| require(e) }
+        o.on('-c', '--class CLASS', 'Provide a Ruby Robot Class') { |c| config.robots << Kernel.const_get(c) }
+      end
+      
+      opts.parse!(args)
+      
+      Swint.rotate_map! unless config.test
+      
+      unless File.exist?(config.map)
+        puts "mapfile #{config.map} not found"
+        exit
+      end
+      
+      result = Swint::Game.new(config).run
+      puts "winner after % 3s rounds robot %s" % [result.rounds, result.winner]
+      if config.statistics
+        puts "\ntiming statistics\n-----------------"
+        puts "game took %5.2f seconds" % result.time 
+        result.data.each do |r, d|
+          time = 0
+          d[:times].each { |t| time += t }
+          puts "% 5.2f seconds %s (%s)" % [time, d[:robot].name, d[:robot].owner]
+        end
+      end
+      
+    end
+  end
+end

data/lib/swint_exec/tournament.rb

@@ -0,0 +1,78 @@
+#! /usr/bin/env ruby
+#-*- coding: utf-8 -*-
+
+# (c) 2008-02-02 Philipp Hofmann <phil@s126.de>
+
+require 'optparse'
+require 'ostruct'
+require 'xmlrpc/client'
+require 'rexml/document'
+
+require 'array'
+
+require 'swint/_constants'
+require 'swint/game'
+require 'swint/map'
+require 'swint/field'
+require 'swint/result'
+require 'swint/abstract_robot'
+require 'swint/xmlrpc_robot'
+require 'swint/class_robot'
+
+module SwintExec
+
+  module Tournament
+
+    def Tournament.start(args)
+      
+      puts 'sorry, not implemented yet'
+      exit
+
+###      config = OpenStruct.new
+###      config.step = false
+###      config.wait = false
+###      config.visual = true
+###      config.map = 'example.map'
+###      config.robots = []
+###      config.statistics = false
+###      
+###      opts = OptionParser.new do |o|
+###        o.on('-r', '--robot URI', 'URI of robot') do |r|
+###          r = "http://localhost:#{r}/" if /[0-9]+/.match(r)
+###          config.robots << r
+###        end
+###        o.on('-m', '--map URI', 'URI of map') { |m| config.map = m }
+###        o.on('-s', '--step', 'Show each step') { config.step = true }
+###        o.on('-w', '--wait', 'Wait for return after visual') { config.wait = true }
+###        o.on('-v', '--no-visual', 'No visual at all') { config.visual = false }
+###        o.on('-t', '--test', 'Do not rotate map') { config.test = true }
+###        o.on('-i', '--statistics', 'Display statistics') { config.statistics = true }
+###        o.on('-e', '--require FILENAME', 'Provide a file to require') { |e| require(e) }
+###        o.on('-c', '--class CLASS', 'Provide a Ruby Robot Class') { |c| config.robots << Kernel.const_get(c) }
+###      end
+###      
+###      opts.parse!(args)
+###      
+###      Swint.rotate_map! unless config.test
+###      
+###      unless File.exist?(config.map)
+###        puts "mapfile #{config.map} not found"
+###        exit
+###      end
+###      
+###      game = Swint::Game.new(config)
+###      result = game.run
+###      puts "winner after % 3s rounds robot %s" % [result.rounds, result.winner]
+###      if config.statistics
+###        puts "\ntiming statistics\n-----------------"
+###        puts "game took %5.2f seconds" % result.time 
+###        result.data.each do |r, d|
+###          time = 0
+###          d[:times].each { |t| time += t }
+###          puts "% 5.2f seconds %s (%s)" % [time, d[:robot].name, d[:robot].owner]
+###        end
+###      end
+      
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: swint
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: "0.6"
 platform: ""
 authors: 
 - Philipp Hofmann
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-20 00:00:00 +01:00
+date: 2008-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -24,22 +24,23 @@ extra_rdoc_files:
 - LICENSE
 - CHANGELOG
 files: 
-- lib/swint/field.rb
-- lib/swint/game.rb
+- lib/array.rb
 - lib/swint/map.rb
-- lib/swint/robot.rb
 - lib/swint/result.rb
+- lib/swint/field.rb
+- lib/swint/abstract_robot.rb
+- lib/swint/game.rb
+- lib/swint/class_robot.rb
 - lib/swint/xmlrpc_robot.rb
 - lib/swint/_constants.rb
-- lib/swint/class_robot.rb
-- lib/swint/abstract_robot.rb
-- lib/swint_basics/array.rb
-- lib/swint_basics/hash.rb
+- lib/swint_exec/tournament.rb
+- lib/swint_exec/ascii_to_map.rb
+- lib/swint_exec/race.rb
 - bin/swint
+- LICENSE
 - Rakefile
 - CHANGELOG
 - README
-- LICENSE
 has_rdoc: false
 homepage: http://branch14.org/swint/
 post_install_message: 
@@ -59,8 +60,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
-
+requirements: 
+- tput binary from ncurses
+- swarm intelligence maps, see http://branch14.org/swint/
 rubyforge_project: swint
 rubygems_version: 0.9.5
 signing_key: 

data/lib/swint/robot.rb

@@ -1,125 +0,0 @@
-#! /usr/bin/env ruby
-#-*- coding: utf-8 -*-
-
-# (c) 2008-01-07 Philipp Hofmann <phil@s126.de>
-
-module Swint
-
-	class Robot
-	
-		attr_accessor :pos
-	
-		attr_reader :speed, :sight, :power, :energy, :weight, :energy_left, :uri, :name, :owner
-	
-		# --------------------------------------------------------------------------------
-		# --- stub
-
-		def initialize(uri, pos)
-			@uri = uri
-			@pos = pos
-			restore
-		end
-	
-		def next(map)
-		end
-	
-		def move
-			# check_direction(...)
-		end
-	
-		def push
-		end
-	
-		def end_game(msg)
-		end
-	
-		# --------------------------------------------------------------------------------
-
-		def is_valid?
-			(@speed + @sight + @power + @energy + @weight) == 22
-		end
-	
-		def check_direction(d)
-			unless (0..5).include?(d)
-				puts "#{@name}, what is this? '#{d}' is not a drection." 
-				exit
-			end
-			d
-		end
-
-		def check_action(a)
-			unless [:do_nothing, :move_to, :push_object, :shout].include?(a)
-				puts "#{@name}, what is this? '#{a}' is not an action." 
-				exit
-			end
-			a
-		end
-		
-		def to_s
-			a = ["#{@name} (#{@owner})", @speed, @sight, @power, @weight, @energy]
-			"%-30s [sp: % 2s, si: % 2s, po: % 2s, we: % 2s, en: % 2s]" % a
-		end
-	
-		def use_energy?
-			return false unless has_energy?
-			@energy_left -= 1
-			true
-		end
-	
-		def has_energy?
-			@energy_left>0
-		end
-	
-		def restore
-			@energy_left = @energy
-		end
-	
-		def calculate_view(map)
-	
-			# A centered hexagonal number, or hex number, is a centered figurate
-			# number that represents a hexagon with a dot in the center and all
-			# other dots surrounding the center dot in a hexagonal lattice.
-			# 1, 7, 19, 37, 61, 91, 127, 169, 217, 271, 331, 397, 469, 547, 631, 721, 817, 919
-	
-			# relative directions
-			reld = [2, 3, 4, 5, 0, 1]
-	
-			data = []
-			cpos = pos.clone # that was tough!
-	
-			### stef's version
-
-	                sight.times do |depth|
-	                        cpos.add!(DIRV[0])
-	                        data << map.state_of_field(cpos)
-	                        5.times do |dir|
-	                                (depth+1).times do |i|
-	                                        cpos.add!(DIRV[reld[dir]])
-	                                        data << map.state_of_field(cpos)
-	                                end
-	                        end
-	                	depth.times do |i|
-	                        	cpos.add!(DIRV[reld[5]])
-	                                data << map.state_of_field(cpos)
-	                        end
-	            		cpos.add!(DIRV[1])
-	                end
-
-			### sight.times do |depth|
-			### 	cpos.add!(DIRV[0])
-			### 	data << map.state_of_field(cpos)
-			### 	6.times do |dir|
-			### 		(depth+1).times do |i|
-			### 			cpos.add!(DIRV[reld[dir]])
-			### 			data << map.state_of_field(cpos)
-			### 		end
-			### 	end
-			### end
-	
-			data
-	
-		end
-	
-	end
-
-end

data/lib/swint_basics/hash.rb

@@ -1,11 +0,0 @@
-#! /usr/bin/env ruby
-#-*- coding: utf-8 -*-
-
-# (c) 2008-01-07 Philipp Hofmann <phil@s126.de>
-
-class Hash
-	def shuffle!
-		replace(self) # HACK!
-	end
-end
-