April 11, 2010 15:45 Began work on predicate class 16:00 Worked on quantity predicate 16:15 Worked on quantity predicate 16:30 Worked on quantity predicate ??? April 12, 2010 00:00 Finished revisions to predicates April 14, 2010 Same as Aaron Todd's until I left at a little after midnight Copy and pasted from his log (24 hour time change): 20:15 - Worked on Species.py 20:30 - Worked on Species.py 20:45 - Worked on Rule.py 21:00 - worked on rule/instruction interaction, made a design descision about rules 21:15 - worked on Instruction.py 21:30 - worked on local world 21:45 - worked on local world 22:00 - worked on conflict resolver design 22:15 - worked on local world Recovery after tubes broke. 22:30 - worked on ConflictResolutionPolicy.py 23:00 - Pizza Break! Talked about the project and enjoyed ourselves. 23:30 - Finished the conflict resolution policy. April 15, 2010 00:00 - Code tidying 00:15 - More code tidying (80 column width, comments, etc.) April 17, 2010 13:30 - Started merging code of group0.0 and group1 15:30 - Finished merging code, started debugging