Merge branch 'master' of https://github.com/timeu/gwas-lecture

Author: mahort

Lecture-1-Python-Data-Science-Guide.ipynb

@@ -27,7 +27,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -116,7 +116,7 @@
     }
    ],
    "source": [
-    "# Create an array filled with 1 values\n",
+    "# Create an array filled with 0 values\n",
     "np.zeros((2, 3))"
    ]
   },
@@ -138,7 +138,7 @@
     }
    ],
    "source": [
-    "# Create an array filled with 0 values\n",
+    "# Create an array filled with 1 values\n",
     "np.ones((2, 3))"
    ]
   },
@@ -542,7 +542,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -556,7 +555,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -565,7 +564,7 @@
        "array([5, 6, 7])"
       ]
      },
-     "execution_count": 21,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -579,7 +578,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -588,7 +587,7 @@
        "array([5, 6, 7])"
       ]
      },
-     "execution_count": 22,
+     "execution_count": 6,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -602,8 +601,41 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "NumPy provides basic mathematical and statistical functions like mean, min, max, sum, prod, std, var, summation across different axes, transposing of a matrix, etc.\n",
-    "\n",
+    "NumPy provides basic mathematical and statistical functions like mean, min, max, sum, prod, std, var, summation across different axes, transposing of a matrix, etc."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 15,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "mean: 6.0\n",
+      "std: 0.816496580927726\n",
+      "sum: 18\n",
+      "var: 0.6666666666666666\n",
+      "min: 5\n",
+      "max: 7\n"
+     ]
+    }
+   ],
+   "source": [
+    "c = a + b\n",
+    "print(\"mean: %s\" % c.mean())\n",
+    "print(\"std: %s\" % c.std())\n",
+    "print(\"sum: %s\" % c.sum())\n",
+    "print(\"var: %s\" % c.var())\n",
+    "print(\"min: %s\" % c.min())\n",
+    "print(\"max: %s\" % c.max())"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
     "A particular NumPy feature of interest is solving a system of linear equations. NumPy has a function to solve linear equations. \n",
     "For example these linear equations \n",
     "\n",
@@ -4753,7 +4785,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.15"
+   "version": "2.7.15rc1"
   }
  },
  "nbformat": 4,