From a64973c3aaa11115f3d0fe22ab1a683aff263066 Mon Sep 17 00:00:00 2001
From: Richard Vaughan <vaughan@sfu.ca>
Date: Sat, 22 Jan 2011 11:04:03 -0800
Subject: [PATCH] added instructions for CMPT431 project

---
 431.txt  | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README   |  5 ++++
 antix.cc |  2 +-
 3 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 431.txt

diff --git a/431.txt b/431.txt
new file mode 100644
index 0000000..8a80ae1
--- /dev/null
+++ b/431.txt
@@ -0,0 +1,71 @@
+CMPT 431 Antix Project instructions
+====================================
+
+0. rtv (instructor) todos:
+  - collisions
+  - scoring
+
+1. Prerequisites
+ - a UNIX-like OS (tested on Linux and OS X)
+ - OpenGL and GLUT
+ - C++, STL, Make
+
+2. Obtaining the code:
+
+ - The original Antix repository is at http://github.com/rtv/Antix
+   - learn about github at http://help.github.com
+   - learn about git at http://git-scm.com
+
+ - Cloning the repo (to get your local copy to work on)
+	 - git clone git@github.com:rtv/Antix.git
+
+3. Building and running the code
+ - cd Antix
+ - (edit the Makefile to suit your system: OS X and Linux setups are provided)
+ - make
+ - ./antix
+
+4. The Big Task
+ - Extend (or reimplement) Antix to support
+   - 1,000,000 robots
+     - the simulation backend MAY be implemented as multiple threads, processes or hosts
+   - 1000 homes (teams) each with at least one independent controller
+     - controllers MUST be separate OS processes
+     - controllers MAY run on separate hosts to the simulation backend
+   - a visualization of the whole world
+   - the system should run as fast as you can make it, given the time available.
+   - your target platform is the CSIL laboratory. Additionally, access to the CMPT cluster or
+      Amazon Elastic Compute Cloud can be arranged privately or through the instructor.
+   - using git for SCM is _strongly_ recommended. You may find github useful for collaboration, too.
+
+5. The First Task
+  - Design a system architecture and development plan that can achieve the Big Task
+    - no code, just design
+    - split your team equally between backend and client-side responsibilities
+    - present a technical argument for your design
+      - why will it work?
+      - what could go wrong?
+      - what is Plan B, C?
+      - what remains to be decided?
+    - present a plan for development and testing, considering  balanced workload for team members
+    - presentations will be by 1 person from each team
+      - 20 minutes
+      - use computer, transparencies or blackboard BUT
+      - your slides and notes must be submitted on the day, and should be comprehensible by themselves
+    - Presentations will be in class on tuesday 25 January and followed by class critique.
+
+6. Subsequent tasks
+  - depend on your development plan, but each team will report each week, alternating between 
+    backend and client sub-teams. Every person presents at least once.
+	- Hint: improve single-thread performance by improving data  structures, etc. before using 
+    parallelism. This exercise will also help you understand the problem and the code.
+  - The final week of semester and the exam period will be an AI  contest using one or more 
+    of the online Antix systems you build.
+
+8. Getting help
+  - Use the github systems to submit bug reports, pull requests, etc.
+  - Your TA is Abbas Sadat [sas21@sfu.ca], and Autonomy Lab PhD student with relevant experience.
+    You can ask him anything except to do your project for you.
+  - Use the class mailing list cmpt-431-help@sfu.ca for questions and discussions.
+ 	- Ask Abbas and Richard questions via the mailing list so we can avoid duplicates, etc. Please 
+    reserve personal email only for private business.
diff --git a/README b/README
index e69de29..d2eba63 100644
--- a/README
+++ b/README
@@ -0,0 +1,5 @@
+Antix foraging simulator
+copyright Richard Vaughan 2011
+
+For CMPT431 Project instructions see 431.txt
+
diff --git a/antix.cc b/antix.cc
index 04584a3..b529122 100644
--- a/antix.cc
+++ b/antix.cc
@@ -184,7 +184,7 @@ void Robot::UpdateSensors()
 																			other->speed, 
 																			range, 
 																			relative_heading,
-																			false ) );			
+																			other->Holding() ) );			
     }	
 	
   // next fill the puck sensor