Done. On May 10, 2012, at 1:03 PM, Iain Hewson wrote: > Iain Hewson has proposed merging lp:~pyotago/practical-programming/iain into lp:practical-programming. > > Requested reviews: > Brendan McCane (mccane) > > For more details, see: > https://code.launchpad.net/~pyotago/practical-programming/iain/+merge/105289 > > Tidying up an extra long line, and adding prac test instructions (as separate documents) > -- > https://code.launchpad.net/~pyotago/practical-programming/iain/+merge/105289 > You are requested to review the proposed merge of lp:~pyotago/practical-programming/iain into lp:practical-programming. > === modified file 'case_study_catch2.tex' > --- case_study_catch2.tex 2011-02-01 04:57:31 +0000 > +++ case_study_catch2.tex 2012-05-10 01:02:20 +0000 > @@ -180,10 +180,11 @@ > it works. Rather than typing it all in one go, follow the incremental > development scheme I used in lectures. That way, you will have less > debugging to do at each stage. > -\item Move the code that calculates the distance from the ball to the > -mitt into a function called \pythoninline{distance\_circles}. Do not > -use any class variables in the function (only parameters). Include > -several doctest tests to ensure the function is correct. > +\item \begin{sloppypar}Move the code that calculates the distance from > + the ball to the mitt into a function called > + \pythoninline{distance\_circles}. Do not use any class variables in > + the function (only parameters). Include several doctest tests to > + ensure the function is correct.\end{sloppypar} > \item At the moment, the program will keep going forever, or until you > close the window. Add code that will stop the program when either the > player or computer score reaches 10. Announce the winner using a > > === added directory 'prac-instructions' > === added file 'prac-instructions/instructions-150a.org' > --- prac-instructions/instructions-150a.org 1970-01-01 00:00:00 +0000 > +++ prac-instructions/instructions-150a.org 2012-05-10 01:02:20 +0000 > @@ -0,0 +1,47 @@ > +#+title: COMP150 Mastery Test 1 > +#+author: Lab 11 > +#+date: course weight 15\% > + > +#+options: toc:nil num:nil > + > +#+latex_header: \parindent = 0mm > +#+latex_header: \parskip = 3mm > +#+latex_header: \topmargin = -3cm > +#+latex_header: \textheight = 26.5cm > +#+latex_header: \pagestyle{empty} > + > +* > + > +** Place your Student ID Card on the desk beside you > + > +There are four parts to complete for this lab. Part 1 is worth 3%, > +and parts 2-4 are worth 4%, giving a total of 15% for the entire > +lab. The test files should open automatically once you have entered > +and confirmed your University usercode. If you need to open them > +again you can find them on your Desktop in a folder called > +=Lab-Test-1=. You must add code to make the doctests pass for > +each of the four files. If you are unable to complete one of the > +parts you may still continue on and attempt to complete the later > +parts. A demonstrator will mark off each part when you have completed > +as much of the test as you are able. > + > +** Turn off all personal electronic devices (this is an exam) > + > +In the previous labs you could complete the work using whatever > +resources you wished to, including help from demonstrators, lecture > +notes, previous work, online resources. In this lab you must complete > +the task during a 90-minute time slot, with minimal resources at your > +disposal. Using only IDLE and the four provided files, > +you must write all of the code needed to pass the given tests without > +any other help. > + > + - You are not permitted to access your home directory, or any other > + files or computers, nor may you use the Internet during this lab. > + > + - In all the following tests it is necessary to return a > + value. Using the /print/ statement is not allowed. > + > + - When you are ready to be marked just use democall as usual. > + > + - Make sure you get marked off by a demonstrator even before you > + leave, even if you don't get any of the test files working. > > === added file 'prac-instructions/instructions-150b.org' > --- prac-instructions/instructions-150b.org 1970-01-01 00:00:00 +0000 > +++ prac-instructions/instructions-150b.org 2012-05-10 01:02:20 +0000 > @@ -0,0 +1,47 @@ > +#+title: COMP150 Mastery Test 2 > +#+author: Lab 12 > +#+date: course weight 15\% > + > +#+options: toc:nil num:nil > + > +#+latex_header: \parindent = 0mm > +#+latex_header: \parskip = 3mm > +#+latex_header: \topmargin = -3cm > +#+latex_header: \textheight = 26.5cm > +#+latex_header: \pagestyle{empty} > + > +* > + > +** Place your Student ID Card on the desk beside you > + > +There are four parts to complete for this lab. Part 1 is worth 3%, > +and parts 2-4 are worth 4%, giving a total of 15% for the entire > +lab. The test files should open automatically once you have entered > +and confirmed your University usercode. If you need to open them > +again you can find them on your Desktop in a folder called > +=Lab-Test-2=. You must add code to make the doctests pass for > +each of the four files. If you are unable to complete one of the > +parts you may still continue on and attempt to complete the later > +parts. A demonstrator will mark off each part when you have completed > +as much of the test as you are able. > + > +** Turn off all personal electronic devices (this is an exam) > + > +In the previous labs you could complete the work using whatever > +resources you wished to, including help from demonstrators, lecture > +notes, previous work, online resources. In this lab you must complete > +the task during a 90-minute time slot, with minimal resources at your > +disposal. Using only IDLE and the four provided files, > +you must write all of the code needed to pass the given tests without > +any other help. > + > + - You are not permitted to access your home directory, or any other > + files or computers, nor may you use the Internet during this lab. > + > + - In all the following tests it is necessary to return a > + value. Using the /print/ statement is not allowed. > + > + - When you are ready to be marked just use democall as usual. > + > + - Make sure you get marked off by a demonstrator even before you > + leave, even if you don't get any of the test files working. > Cheers, Brendan. ----------------------------------------------------------------------- Brendan McCane, Head of Dept, Email: