merge

Author: cliburn

Labs/Lab04/Exercises04-Solutions.ipynb

@@ -130,7 +130,7 @@
       "\n",
       "def squared_euclidean_dist(u, v, axis=-1):\n",
       "    \"\"\"Returns squared Euclidean distance between two vectors.\"\"\"\n",
-      "    return squared_euclidean_norm(u -v)\n",
+      "    return squared_euclidean_norm(u-v, axis)\n",
       "\n",
       "def euclidean_dist(u, v, axis=-1):\n",
       "    \"\"\"Return Euclidean distacne between two vectors.\"\"\"\n",
@@ -164,15 +164,16 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 6
+     "prompt_number": 12
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
       "M = np.array([[1,2,3],[4,5,6]])\n",
       "\n",
-      "dist = euclidean_dist\n",
+      "# dist = euclidean_dist\n",
+      "dist = cosine_dist\n",
       "\n",
       "print loop_row_pdist(M, dist), '\\n'\n",
       "print broadcast_row_pdist(M, dist), '\\n'\n",
@@ -186,22 +187,23 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "[[ 0.000  5.196]\n",
-        " [ 5.196  0.000]] \n",
+        "[[ 0.000  0.025]\n",
+        " [ 0.025  0.000]] \n",
         "\n",
-        "[[ 0.000  5.196]\n",
-        " [ 5.196  0.000]] \n",
+        "[[ 0.000  0.025]\n",
+        " [ 0.025  0.000]] \n",
         "\n",
-        "[[ 0.000  1.414  2.828]\n",
-        " [ 1.414  0.000  1.414]\n",
-        " [ 2.828  1.414  0.000]] \n",
+        "[[ 0.000  0.009  0.024]\n",
+        " [ 0.009 -0.000  0.003]\n",
+        " [ 0.024  0.003  0.000]] \n",
         "\n",
-        "[[ 2.236  1.414  2.236]\n",
-        " [ 2.236  1.414  2.236]]\n"
+        "[[ 0.000  0.009  0.024]\n",
+        " [ 0.009 -0.000  0.003]\n",
+        " [ 0.024  0.003  0.000]]\n"
        ]
       }
      ],
-     "prompt_number": 7
+     "prompt_number": 13
     },
     {
      "cell_type": "markdown",