From 409e9f04c221051ad2580a2c360cd20a93149d73 Mon Sep 17 00:00:00 2001
From: Jukka Aho <ahojukka5@gmail.com>
Date: Mon, 15 Jun 2015 00:08:22 +0300
Subject: [PATCH] added iteration count for second version

---
 .../2015-06-15-performance-studies.ipynb      | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/notebooks/2015-06-15-performance-studies.ipynb b/notebooks/2015-06-15-performance-studies.ipynb
index 36b033a..b375a49 100644
--- a/notebooks/2015-06-15-performance-studies.ipynb
+++ b/notebooks/2015-06-15-performance-studies.ipynb
@@ -21,16 +21,18 @@
    },
    "outputs": [
     {
-     "ename": "LoadError",
-     "evalue": "today not defined\nwhile loading In[1], in expression starting on line 1",
-     "output_type": "error",
-     "traceback": [
-      "today not defined\nwhile loading In[1], in expression starting on line 1",
-      ""
-     ]
+     "data": {
+      "text/plain": [
+       "2015-06-15"
+      ]
+     },
+     "execution_count": 1,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
+    "using Dates\n",
     "today()"
    ]
   },
@@ -216,7 +218,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "elapsed time: 12.592200168 seconds (2020893880 bytes allocated, 24.21% gc time)\n"
+      "elapsed time: 11.336512664 seconds (2020893880 bytes allocated, 26.15% gc time)\n"
      ]
     }
    ],
@@ -301,7 +303,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Converged\n",
+      "Converged in 6 iterations\n",
       "[0.0 -0.39914506095474317 -0.07228582695592449 0.0\n",
       " 0.0 -2.1779892317073504 -2.222244754401764 0.0]\n"
      ]
@@ -321,7 +323,7 @@
     "    du = Kt[free_dofs, free_dofs] \\ -reshape(R, 8)[free_dofs]\n",
     "    u[free_dofs] += du\n",
     "    if norm(du) < 1.0e-9\n",
-    "        println(\"Converged\")\n",
+    "        println(\"Converged in \", i, \" iterations\")\n",
     "        break\n",
     "    end\n",
     "end\n",
@@ -355,22 +357,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "elapsed time: 9.96484533 seconds (1554800080 bytes allocated, 27.40% gc time)\n"
+      "elapsed time: 8.447644445 seconds (1554800080 bytes allocated, 29.45% gc time)\n"
      ]
     }
    ],
    "source": [
     "@time test_algo2()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {