Merge branch 'master' of github.com:TrainingByPackt/Data-Visualization-with-Python

timgrossmann · timgrossmann · commit 6ec03dedd89c · 2019-01-02T15:12:29.000+01:00
diff --git a/lesson04/Activity02/activity02_solution.ipynb b/lesson04/Activity02/activity02_solution.ipynb
@@ -126,7 +126,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,
diff --git a/lesson04/Activity03/activity03_solution.ipynb b/lesson04/Activity03/activity03_solution.ipynb
@@ -131,7 +131,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,
diff --git a/lesson04/Activity04/activity04_solution.ipynb b/lesson04/Activity04/activity04_solution.ipynb
@@ -110,7 +110,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,
diff --git a/lesson04/Activity05/activity05.ipynb b/lesson04/Activity05/activity05.ipynb
@@ -94,31 +94,31 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "singapore = [118, 103, 125, 107, 111,  96, 104,  97,  96, 114,  96,  75, 114,\n",
+    "group_a = [118, 103, 125, 107, 111,  96, 104,  97,  96, 114,  96,  75, 114,\n",
     "       107,  87, 117, 117, 114, 117, 112, 107, 133,  94,  91, 118, 110,\n",
     "       117,  86, 143,  83, 106,  86,  98, 126, 109,  91, 112, 120, 108,\n",
     "       111, 107,  98,  89, 113, 117,  81, 113, 112,  84, 115,  96,  93,\n",
     "       128, 115, 138, 121,  87, 112, 110,  79, 100,  84, 115,  93, 108,\n",
     "       130, 107, 106, 106, 101, 117,  93,  94, 103, 112,  98, 103,  70,\n",
     "       139,  94, 110, 105, 122,  94,  94, 105, 129, 110, 112,  97, 109,\n",
     "       121, 106, 118, 131,  88, 122, 125,  93,  78]\n",
-    "germany = [126,  89,  90, 101, 102,  74,  93, 101,  66, 120, 108,  97,  98,\n",
+    "group_b = [126,  89,  90, 101, 102,  74,  93, 101,  66, 120, 108,  97,  98,\n",
     "            105, 119,  92, 113,  81, 104, 108,  83, 102, 105, 111, 102, 107,\n",
     "            103,  89,  89, 110,  71, 110, 120,  85, 111,  83, 122, 120, 102,\n",
     "            84, 118, 100, 100, 114,  81, 109,  69,  97,  95, 106, 116, 109,\n",
     "            114,  98,  90,  92,  98,  91,  81,  85,  86, 102,  93, 112,  76,\n",
     "            89, 110,  75, 100,  90,  96,  94, 107, 108,  95,  96,  96, 114,\n",
     "            93,  95, 117, 141, 115,  95,  86, 100, 121, 103,  66,  99,  96,\n",
     "            111, 110, 105, 110,  91, 112, 102, 112,  75]\n",
-    "china = [108,  89, 114, 116, 126, 104, 113,  96,  69, 121, 109, 102, 107,\n",
+    "group_c = [108,  89, 114, 116, 126, 104, 113,  96,  69, 121, 109, 102, 107,\n",
     "       122, 104, 107, 108, 137, 107, 116,  98, 132, 108, 114,  82,  93,\n",
     "        89,  90,  86,  91,  99,  98,  83,  93, 114,  96,  95, 113, 103,\n",
     "        81, 107,  85, 116,  85, 107, 125, 126, 123, 122, 124, 115, 114,\n",
     "        93,  93, 114, 107, 107,  84, 131,  91, 108, 127, 112, 106, 115,\n",
     "        82,  90, 117, 108, 115, 113, 108, 104, 103,  90, 110, 114,  92,\n",
     "       101,  72, 109,  94, 122,  90, 102,  86, 119, 103, 110,  96,  90,\n",
     "       110,  96,  69,  85, 102,  69,  96, 101,  90]\n",
-    "usa = [ 93,  99,  91, 110,  80, 113, 111, 115,  98,  74,  96,  80,  83,\n",
+    "group_d = [ 93,  99,  91, 110,  80, 113, 111, 115,  98,  74,  96,  80,  83,\n",
     "       102,  60,  91,  82,  90,  97, 101,  89,  89, 117,  91, 104, 104,\n",
     "       102, 128, 106, 111,  79,  92,  97, 101, 106, 110,  93,  93, 106,\n",
     "       108,  85,  83, 108,  94,  79,  87, 113, 112, 111, 111,  79, 116,\n",
@@ -132,7 +132,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Create a box plot for each of the IQ scores of the different nations. Add labels and a title."
+    "Create a box plot for each of the IQ scores of the different test groups. Add labels and a title."
    ]
   },
   {
@@ -174,7 +174,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,
diff --git a/lesson04/Activity05/activity05_solution.ipynb b/lesson04/Activity05/activity05_solution.ipynb
diff --git a/lesson04/Activity06/activity06_solution.ipynb b/lesson04/Activity06/activity06_solution.ipynb
@@ -132,7 +132,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,
diff --git a/lesson04/Activity07/activity07_solution.ipynb b/lesson04/Activity07/activity07_solution.ipynb
@@ -132,7 +132,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,
diff --git a/lesson04/Activity08/activity08_solution.ipynb b/lesson04/Activity08/activity08_solution.ipynb
@@ -110,7 +110,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,
diff --git a/lesson04/Exercise02/data/.~religions.csv b/lesson04/Exercise02/data/.~religions.csv
diff --git a/lesson04/Exercise02/data/religions.csv b/lesson04/Exercise02/data/religions.csv
diff --git a/lesson04/Exercise02/data/water_usage.csv b/lesson04/Exercise02/data/water_usage.csv
@@ -0,0 +1,7 @@
+,Usage,Percentage
+0,Leak,12
+1,Clothes Washer,17
+2,Faucet,19
+3,Shower,20
+4,Toilet,24
+5,Other,8
diff --git a/lesson04/Exercise02/exercise02.ipynb b/lesson04/Exercise02/exercise02.ipynb
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Religious demographics"
+    "## Water usage"
    ]
   },
   {
@@ -40,7 +40,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Use a pie chart to visualize the religious demographics. Highlight one religion of your choice using the explode parameter. Show the percentages for each slice and add a title."
+    "Use a pie chart to visualize the water usage. Highlight one usage of your choice using the explode parameter. Show the percentages for each slice and add a title."
    ]
   },
   {
@@ -50,7 +50,7 @@
    "outputs": [],
    "source": [
     "# Create figure\n",
-    "plt.figure(figsize=(8, 7), dpi=300)\n",
+    "plt.figure(figsize=(8, 8), dpi=300)\n",
     "# Create pie plot\n",
     "\n",
     "# Add title\n",
@@ -83,7 +83,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,
diff --git a/lesson04/Exercise02/exercise02_solution.ipynb b/lesson04/Exercise02/exercise02_solution.ipynb

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@`
`126`	`126`	`"name": "python",`
`127`	`127`	`"nbconvert_exporter": "python",`
`128`	`128`	`"pygments_lexer": "ipython3",`
`129`		`- "version": "3.7.1"`
	`129`	`+ "version": "3.6.6"`
`130`	`130`	`}`
`131`	`131`	`},`
`132`	`132`	`"nbformat": 4,`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@`
`131`	`131`	`"name": "python",`
`132`	`132`	`"nbconvert_exporter": "python",`
`133`	`133`	`"pygments_lexer": "ipython3",`
`134`		`- "version": "3.7.1"`
	`134`	`+ "version": "3.6.6"`
`135`	`135`	`}`
`136`	`136`	`},`
`137`	`137`	`"nbformat": 4,`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@`
`110`	`110`	`"name": "python",`
`111`	`111`	`"nbconvert_exporter": "python",`
`112`	`112`	`"pygments_lexer": "ipython3",`
`113`		`- "version": "3.7.1"`
	`113`	`+ "version": "3.6.6"`
`114`	`114`	`}`
`115`	`115`	`},`
`116`	`116`	`"nbformat": 4,`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`	`"name": "python",`
`133`	`133`	`"nbconvert_exporter": "python",`
`134`	`134`	`"pygments_lexer": "ipython3",`
`135`		`- "version": "3.7.1"`
	`135`	`+ "version": "3.6.6"`
`136`	`136`	`}`
`137`	`137`	`},`
`138`	`138`	`"nbformat": 4,`