From cc84e4faaa2542ad9bd2eb07f98bdd06a4bfdefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Babi=C4=8D?= <babicpet@gmail.com>
Date: Fri, 24 Apr 2015 10:59:13 +0200
Subject: [PATCH] battle

---
 robocode-svm | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/robocode-svm b/robocode-svm
index efa3179..331e6a9 100755
--- a/robocode-svm
+++ b/robocode-svm
@@ -9,11 +9,19 @@ settings="$path/.settings.battle"
 results="$path/.results.data"
 training="$path/training.data"
 testing="$path/testing.data"
+# scaling="$path/scaling.data"
 
 # Battle parameters
-rounds=10
+rounds=1000
 width=500
 height=500
+robot1="sample.SpinBot"
+robot2="sample.VelociRobot"
+
+# Run battle without GUI, following the settings file, and returning the lines containing winners
+battle() {
+	echo $(robocode -nodisplay -battle "$settings" | tail -2);
+}
 
 # Make sure files are right
 cd $path
@@ -35,25 +43,34 @@ robocode.battleField.height=$height
 robocode.battle.numRounds=1
 robocode.battle.gunCoolingRate=0.1
 robocode.battle.rules.inactivityTime=450
-robocode.battle.selectedRobots=sample.TrackFire,sample.TrackFire
+robocode.battle.selectedRobots=$robot1,$robot2
 robocode.battle.initialPositions=($(($width/2)),$(($height/2)),0),($x,$y,$alpha)" > "$settings"
 
-	# Extract the winner from battle 
-	winner=$(robocode -nodisplay -battle "$settings" | tail -2 | awk 'NR==1 {print substr($3,2,1)}') 
+	# If the robots are of the same name
+	if [ "$robot1" == "$robot2" ] ; then
+		# Their order number is in the bracket after the name
+		winner=$(battle | awk 'NR==1 {print substr($3,2,1)}') 
+	else
+		# Otherwise we need to match the actual names
+		winner=$(battle | awk 'NR==1F {print $2}') 
+		if [ "$winner" == "$robot1" ] ; then
+			winner=1
+		else
+			winner=2
+		fi
+	fi
 
 	# Inform user about the winner of current round and append the results to the file
 	echo "Round $i winner: $winner"
-	echo "$winner 1:$x 2:$y" >> "$results"
-	# echo "$winner 1:$x 2:$y 3:$alpha" >> "$results"
+	# echo "$winner 1:$x 2:$y" >> "$results"
+	echo "$winner 1:$x 2:$y 3:$alpha" >> "$results"
 done
 
 # Calculate the lines needed to split the data to 90% and 10%
 tr=$(bc <<< "scale=0; $rounds * 0.9 / 1");
 te=$(bc <<< "scale=0; ($rounds - $tr) / 1");
-echo "tr: $tr, te: $te"
 
 # Scale the results to interval <0, 1> and split them to training set and testing set;
 # misuse tee for 'process substituion' and send its stdout do /dev/null
 svm-scale -l 0 -u 1 "$results" | tee  >(head -n $tr > "$training") >(tail -n $te > "$testing") > /dev/null
 
-