Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for 2018 #22

Merged
merged 15 commits into from
Jan 31, 2018
Merged

Updates for 2018 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7f8312f
metadata changes
Jan 29, 2018
e371a9d
update introduction information
Jan 29, 2018
bb42aef
- update "overview" slightly
Jan 29, 2018
61646ff
fix slicing
Jan 29, 2018
2d45e05
remove unnecessary examples
Jan 29, 2018
779299d
Shorten long tedious examples
Jan 29, 2018
67dc4fa
metadata changes
Jan 29, 2018
138f38c
make underscore a dash for invoke task
Jan 29, 2018
853ccc8
remove "input"
Jan 29, 2018
2c6ecfa
add code comments + metadata changes
Jan 29, 2018
f86b4b0
fix spelling and urls
Jan 29, 2018
e9bf843
add multiple assignment
Jan 29, 2018
7187af5
reword "Do's and Don'ts"
Jan 31, 2018
0161e8d
fix spelling and sentences
Jan 31, 2018
82b93fa
update tutor lecture information
Jan 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ install:
- pip install -r requirements-dev.txt

script:
- invoke check_notebooks
- invoke check-notebooks
2 changes: 1 addition & 1 deletion Extra_01_Algebra_Demo.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.3"
"version": "3.6.4"
}
},
"nbformat": 4,
Expand Down
4 changes: 2 additions & 2 deletions Extra_02_Plotting_Demo.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@
"#6\n",
"figure()\n",
"M = zeros(U.shape, dtype='bool')\n",
"M[U.shape[0]/3:2*U.shape[0]/3,U.shape[1]/3:2*U.shape[1]/3] = True\n",
"M[U.shape[0]//3:2*U.shape[0]//3,U.shape[1]//3:2*U.shape[1]//3] = True\n",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this could be made much easier to understand by assigning rows, cols = U.shape

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not too worried about the source code of the demo notebooks, just as long as it runs. We only briefly demo the outputs in any case.

"U = ma.masked_array(U, mask=M)\n",
"V = ma.masked_array(V, mask=M)\n",
"Q = quiver( U, V)\n",
Expand Down Expand Up @@ -1139,7 +1139,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.3"
"version": "3.6.4"
}
},
"nbformat": 4,
Expand Down
27 changes: 12 additions & 15 deletions Other_01_Tutors_Lecture.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"\n",
"### General\n",
"\n",
"- Payment rates $\\to$ Mrs Elzabe Pieterse\n",
"- Payment rates $\\to$ Mrs Ilka Meyer\n",
"\n",
"\n",
"- Banking details forms $\\to$ email\n",
" - To be submitted to Mrs Elzabe Pieterse\n",
" - To be submitted to Mrs Ilka Meyer\n",
"\n",
"\n",
"- No tutorial sessions in the first week of lectures, I.e. tutorial sessions start on 13 Feb 2017.\n",
"- No tutorial sessions in the first week of lectures, I.e. tutorial sessions start on 12 Feb 2018.\n",
"\n",
"\n",
"- TA’s and tutors $\\to$ Will have direct access to the MPR213 module on ClickUP (I.e. listed as one of their modules)\n",
Expand All @@ -47,18 +47,18 @@
"source": [
"### New in 2017\n",
"\n",
"- [Anaconda](https://www.continuum.io/downloads) in place of Python (x, y)\n",
"- This year we will be using *Python 3* and the software [Jupyter Notebook](https://jupyter.org) which can easily be installed through [Anaconda](https://www.continuum.io/downloads)\n",
"- [Anaconda](https://www.anaconda.com/download) in place of Python (x, y)\n",
"- This year we will be using *Python 3* and the software [Jupyter Notebook](https://jupyter.org) which can easily be installed through [Anaconda](https://www.anaconda.com/download)\n",
" - What is a Notebook?\n",
" - Why we are using Notebooks?\n",
"\n",
"\n",
"- To open Notebooks from a specific folder in Windows please refer to the YouTube video https://youtu.be/JId0f7URtOQ\n",
"- To open Notebooks from a specific folder in Windows please refer to the YouTube video https://youtu.be/yCAWLgoo94Y\n",
"\n",
"\n",
"- The lecture notes also make use of the notebook extension [nbtutor](https://github.com/lgpage/nbtutor) which can be installed by:\n",
" - First installing [Anaconda](https://www.continuum.io/downloads)\n",
" - Then opening the Windows Command Prompt as Administrator (Refer to the YouTube video https://www.youtube.com/watch?v=btg5hYs72gc)\n",
" - First installing [Anaconda](https://www.anaconda.com/download)\n",
" - Then opening the Windows Command Prompt (Refer to the YouTube video https://youtu.be/FeUCOh7fE7s)\n",
" - Then, in the Command Prompt, type the following and hit enter:\n",
" ```\n",
" conda install -c conda-forge nbtutor\n",
Expand Down Expand Up @@ -228,12 +228,12 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"## Tutorial assignments\n",
"## Weekly assignments\n",
"\n",
"- Students will be handing in tutorial assignments for marks\n",
"- Students will be handing in tutorial assignments (**not for marks**)\n",
"\n",
"\n",
"- Questions for hand-in will be announced each Monday\n",
"- Questions for hand-in will be announced on ClickUP\n",
"\n",
"\n",
"- No marking required by TA’s or Tutors $\\to$ Electronically marks by a PC\n",
Expand All @@ -245,9 +245,6 @@
"- Imperative not to do the work for the students and follow the rules mentioned above\n",
"\n",
"\n",
"- Doing the work for the student $\\to$ constitutes plagiarism\n",
"\n",
"\n",
"- Unsure how to help the student $\\to$ ask the TA for help\n",
"\n",
"\n",
Expand Down Expand Up @@ -830,7 +827,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.3"
"version": "3.6.4"
}
},
"nbformat": 4,
Expand Down
61 changes: 26 additions & 35 deletions Section_01_Introduction.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@
"# Programming and Information Technology\n",
"\n",
"- [Welcome](#Welcome)\n",
"- [Lecture Notes](#Lecture Notes)\n",
"- [Credit Application](#Credit-Application)\n",
"- [Tutorials](#Tutorials)\n",
"- [Tests & Exam](#Tests-&-Exam)\n",
"- [Tutorial Sessions](#Tutorial-Sessions)\n",
"- [Weekly Assignments](#Weekly-Assignments)\n",
"- [Tests & Exams](#Tests-&-Exams)\n",
"- [Plagiarism](#Plagiarism)\n",
"- [Skill Development Stage](#Skill-Development-Stage)\n",
"- [Roles & Responsibilities](#Roles-&-Responsibilities)\n",
"- [Do's and Don'ts](#Do%27s-and-Don%27ts)\n",
"- [Take Heed](#Take-Heed)\n",
"- [Demo's](#Demo%27s)\n",
"\n",
"Lectures:\n",
Expand Down Expand Up @@ -61,17 +64,12 @@
"- Download from GitHub (https://github.com/mpr213/lecture-notes/releases)\n",
" - Click on the ``Source code (zip)`` download\n",
" - Save to your PC and extract the files\n",
"- These lecture notes are designed to be viewed using Jupyter Notebook (https://jupyter.org) which can easily be installed through Anaconda (https://www.continuum.io/downloads)\n",
"- All examples in the lecture notes are written / developed using Python 3\n",
"- To open Jupyter from a specific folder in Windows please refer to the YouTube video https://youtu.be/JId0f7URtOQ\n",
"- These lecture notes also make use of the notebook extension ``nbtutor`` (https://github.com/lgpage/nbtutor) which can be installed:\n",
" - First install Anaconda (https://www.continuum.io/downloads)\n",
" - Then open the Windows Command Prompt as Administrator (See https://www.youtube.com/watch?v=btg5hYs72gc)\n",
" - In the Command Prompt type the following and hit enter\n",
" ```\n",
" conda install -c conda-forge nbtutor\n",
" ```\n",
" - Note: Installing ``nbtutor`` requires an Internet connection"
"- Viewed using Jupyter Notebook (https://jupyter.org) $\\to$ installed through Anaconda (https://www.anaconda.com/download)\n",
" - see ClickUP (Software section) for installation instructions\n",
"- Make use of ``nbtutor`` (https://github.com/lgpage/nbtutor)\n",
" - see ClickUP (Software section) for installation instructions\n",
"- \"Getting started\" videos on ClickUP (Software section)\n",
"- \"Working with the lecture notes videos\" on ClickUP (Study Material section)"
]
},
{
Expand All @@ -89,14 +87,14 @@
"\n",
"- Application form:\n",
" - From Student Administration (Eng. I, Floor 6)\n",
" - Submit completed form to Mr L Page (Eng. III, 6-93) **before 17:00 on 17 February 2017**\n",
" - Submit completed form to Mr L Page (Eng. III, 6-93) **before 17:00 on 12 February 2018**\n",
" - Along with academic record and study guides\n",
"\n",
"\n",
"- Credit Assessment Exam:\n",
" - Date: **24 February 2017**\n",
" - Date: **14 February 2018**\n",
" - Venue: NW2 PhD Lab\n",
" - Time: **14:00 to 15:30** (90 minutes)\n",
" - Time: **11:30 to 13:00** (90 minutes)\n",
"\n",
"\n",
"- Detailed instructions $\\to$ Study Guide"
Expand Down Expand Up @@ -132,19 +130,15 @@
}
},
"source": [
"## Tutorial Assignments\n",
"## Weekly Assignments\n",
"- Covers the concepts discussed in class the previous week.\n",
"- Compulsory $\\to$ for marks\n",
"- Not compulsory $\\to$ not for marks\n",
"- Will be uploaded to ClickUP\n",
"- Due each week Friday before 17:00\n",
"\n",
"\n",
"- Due each week Friday $\\to$ Feedback provided Monday or Tuesday\n",
"- Best form of practice and preparation for tests and exams\n",
"- Detailed instructions on ClickUP !!\n",
" - All uploaded files will be checked for plagiarism\n",
" - All answers will be marked electronically (I.e. by a computer)\n",
" - All answers are graded binary (right or wrong)\n",
" - No queries regarding tutorial assignments will be entertained\n",
" - Late submissions will get 0"
" - All answers are graded binary (right or wrong)"
]
},
{
Expand Down Expand Up @@ -181,7 +175,7 @@
"\n",
"- Still an issue and not worth the risk:\n",
" - Several students expelled for cheating in test and exams\n",
" - Several students with strikes against their names for copying assignments (tutorial and group project)\n",
" - Several students with strikes against their names for copying assignments\n",
"\n",
"\n",
"- Make sure you know what plagiarism is about:\n",
Expand All @@ -193,7 +187,7 @@
"\n",
"- More Information:\n",
" - [UP Library](http://www.library.up.ac.za/plagiarism/)\n",
" - [Plagiarism.org](http://www.plagiarism.org/plagiarism-101/)\n",
" - [Plagiarism.org](http://www.plagiarism.org/article/what-is-plagiarism)\n",
"\n",
"\n",
"- Plagiarism degrades the integrity of your qualification at the end of the day"
Expand Down Expand Up @@ -257,7 +251,7 @@
}
},
"source": [
"## Do's and Don'ts\n",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it remain "Do's and Don'ts"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a contentious phrase. I recommend rewording.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also causes the spell checking to bomb out. I'll try reword.

"## Take Heed\n",
"\n",
"### Do\n",
"- Take this to heart\n",
Expand All @@ -279,7 +273,7 @@
"- Be happy with just a general understanding\n",
"- Go to tutorial sessions just to do assignments\n",
"\n",
"## Questions:\n",
"### Questions:\n",
"- Can you (did you) learn to play the guitar in one day?\n",
"- Can you learn (cram) programming in one day?\n",
"\n",
Expand Down Expand Up @@ -314,10 +308,7 @@
"- Plotting Demo\n",
"\n",
"\n",
"- GUI Demo\n",
"\n",
"\n",
"- Semester Project (Game – **TBC**)"
"- GUI Demo"
]
},
{
Expand Down Expand Up @@ -352,7 +343,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.3"
"version": "3.6.4"
},
"nbpresent": {
"slides": {},
Expand Down
Loading