Updates for 2018 #22

lgpage · 2018-01-29T10:10:00Z

- move "importing modules" after "name assignment and namespace" - remove slideshow and nbpresent metadata

smroux

Most changes appear to be cosmetic, removal of bulky/messy examples seems to be biggest change.

All looks good.

smroux · 2018-01-31T09:54:30Z

Section_01_Introduction.ipynb

@@ -257,7 +251,7 @@
    }
   },
   "source": [
-    "## Do's and Don'ts\n",


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

This is a contentious phrase. I recommend rewording.

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

smroux · 2018-01-31T10:10:56Z

Section_01_Introduction.ipynb

    "- [Roles & Responsibilities](#Roles-&-Responsibilities)\n",
-    "- [Do's and Don'ts](#Do%27s-and-Don%27ts)\n",
+    "- [Do and Don't](#Do-and-Don%27t)\n",


Same "Do's and Don'ts" comment

smroux · 2018-01-31T10:15:28Z

Section_11_Reading_And_Writing_Data.ipynb

@@ -321,7 +321,7 @@
   "source": [
    "### Example - Experimental Data\n",
    "\n",
-    "- Consider an experimental setup whereby air is forced through a rectangular channel. Inside this channel there are several obstacles (cylindrical pins) that obstruct the flow.\n",


Setup more correct than set-up?

I'm not sure, will change it back to "setup".

smroux · 2018-01-31T10:16:11Z

sphinx/source/spelling_wordlist.txt

@@ -21,10 +21,11 @@ Numpy
 PhD
 Pieterse
 placeholder
+radians
+Roux


Why don't you get the honour of having your surname?

I assume because "page" is already in the standard word list.

Yup. Spell check does not like your surname but is happy with mine

smroux · 2018-01-31T10:31:00Z

Section_08_Aditional_Examples.ipynb

@@ -575,32 +587,15 @@
    "<img src=\"./figures/Interpolation_example_linear.svg\" alt=\"Linear Interpolation\" style=\"height: 400px;\"/>"
   ]
  },
-  {


Did you consider this example to be too bulky and messy?

Yes. Having the additional quadratic method does not add anything useful other than a very backwards way of introducing a wrapper function which I don't think is critical for the students to know. I would rather move this to one of the weekly assignments.

alchemyst

I'm down with the actual changes, but I've made a few small suggestions in the comments.

alchemyst · 2018-01-31T10:51:38Z

sphinx/source/spelling_wordlist.txt

@@ -21,10 +21,11 @@ Numpy
 PhD
 Pieterse
 placeholder
+radians
+Roux


I assume because "page" is already in the standard word list.

alchemyst · 2018-01-31T10:52:39Z

Extra_02_Plotting_Demo.ipynb

@@ -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",


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

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.

alchemyst · 2018-01-31T10:54:32Z

Section_05_For_Loop.ipynb

-    "for i in np.arange(0, 5, 1):\n",
-    "    s0 = h_init[i]\n",
-    "    v0 = v_init[i]\n",
+    "for i in np.arange(0, 5, 1):  # iterate over array indexes\n",


Why use np.arange here instead of range?

There is a section immediately after this example introducing range, but range as an iterator is a little more difficult to explain. We opted to compare range to np.arange, as the students should be familiar with this, and then lie a little about range

alchemyst · 2018-01-31T10:55:24Z

Section_07_Branching.ipynb

@@ -280,7 +271,7 @@
    "\n",
    "### Example - print integer information:\n",
    "\n",
-    "- Write a program that asks the user to input an integer.\n",
+    "- Write a function that an integer as input.\n",


Write a function that takes an integer as input

I'll fix this, thanks for catching it.

lgpage · 2018-01-31T13:14:00Z

@alchemyst and @smroux thanks for reviewing.

Logan Page added 7 commits January 29, 2018 13:51

metadata changes

7f8312f

update introduction information

e371a9d

- update "overview" slightly

bb42aef

- move "importing modules" after "name assignment and namespace" - remove slideshow and nbpresent metadata

fix slicing

61646ff

remove unnecessary examples

2d45e05

Shorten long tedious examples

779299d

metadata changes

67dc4fa

lgpage force-pushed the 2018 branch from 27ca802 to 67dc4fa Compare January 29, 2018 12:04

Logan Page added 5 commits January 29, 2018 14:38

make underscore a dash for invoke task

138f38c

remove "input"

853ccc8

add code comments + metadata changes

2c6ecfa

fix spelling and urls

f86b4b0

add multiple assignment

e9bf843

lgpage requested review from alchemyst and smroux January 29, 2018 13:53

smroux reviewed Jan 31, 2018

View reviewed changes

alchemyst approved these changes Jan 31, 2018

View reviewed changes

Logan Page added 2 commits January 31, 2018 15:00

reword "Do's and Don'ts"

7187af5

fix spelling and sentences

0161e8d

alchemyst approved these changes Jan 31, 2018

View reviewed changes

update tutor lecture information

82b93fa

lgpage merged commit cf971a9 into mpr213:master Jan 31, 2018

lgpage deleted the 2018 branch January 31, 2018 13:27

This was referenced Jan 31, 2018

Strip down long- and remove unnecessary- examples #23

Closed

Add code comments to examples #24

Closed

Explain multiple returns as a special case of multiple assignment #19

Closed

Fix CI (spell- and link- checking) #21

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates for 2018 #22

Updates for 2018 #22

lgpage commented Jan 29, 2018 •

edited

Loading

smroux left a comment

smroux Jan 31, 2018

alchemyst Jan 31, 2018

lgpage Jan 31, 2018

smroux Jan 31, 2018

smroux Jan 31, 2018

lgpage Jan 31, 2018

smroux Jan 31, 2018

alchemyst Jan 31, 2018

lgpage Jan 31, 2018

smroux Jan 31, 2018

lgpage Jan 31, 2018

alchemyst left a comment

alchemyst Jan 31, 2018

alchemyst Jan 31, 2018

lgpage Jan 31, 2018

alchemyst Jan 31, 2018

lgpage Jan 31, 2018

alchemyst Jan 31, 2018

lgpage Jan 31, 2018

lgpage commented Jan 31, 2018

Updates for 2018 #22

Updates for 2018 #22

Conversation

lgpage commented Jan 29, 2018 • edited Loading

smroux left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alchemyst left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lgpage commented Jan 31, 2018

lgpage commented Jan 29, 2018 •

edited

Loading