From 1583a48ab19540cdadc9d267c8b0bb23b0f1b862 Mon Sep 17 00:00:00 2001
From: Aubert <sindreaubert@gmail.com>
Date: Fri, 4 Sep 2020 11:42:09 +0200
Subject: [PATCH] =?UTF-8?q?fjern=20siste=20l=C3=B8sning=20fra=20lecture=20?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ovingsforelesninger/felles/lecture2.ipynb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Ovingsforelesninger/felles/lecture2.ipynb b/Ovingsforelesninger/felles/lecture2.ipynb
index e7bc5ef..86a44b4 100644
--- a/Ovingsforelesninger/felles/lecture2.ipynb
+++ b/Ovingsforelesninger/felles/lecture2.ipynb
@@ -153,15 +153,21 @@
       },
       {
          "cell_type": "code",
-         "execution_count": 11,
+         "execution_count": 9,
          "metadata": {
             "tags": []
          },
          "outputs": [
             {
-               "output_type": "stream",
-               "name": "stdout",
-               "text": "Totalsummen for varene er 49.0\n"
+               "output_type": "error",
+               "ename": "TypeError",
+               "evalue": "unsupported operand type(s) for +: 'float' and 'str'",
+               "traceback": [
+                  "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
+                  "\u001b[1;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
+                  "\u001b[1;32m<ipython-input-9-9df7f0deb4bb>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m\u001b[0m\n\u001b[0;32m      3\u001b[0m \u001b[0mhavregryn_pris\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;36m15\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m      4\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 5\u001b[1;33m \u001b[0mtotal_sum\u001b[0m \u001b[1;33m=\u001b[0m \u001b[0mbanan_pris\u001b[0m \u001b[1;33m+\u001b[0m \u001b[0mmelk_pris\u001b[0m \u001b[1;33m+\u001b[0m \u001b[0mhavregryn_pris\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m      6\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m      7\u001b[0m \u001b[0mprint\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m'Totalsummen for varene er '\u001b[0m \u001b[1;33m+\u001b[0m \u001b[0mtotal_sum\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
+                  "\u001b[1;31mTypeError\u001b[0m: unsupported operand type(s) for +: 'float' and 'str'"
+               ]
             }
          ],
          "source": [
@@ -169,9 +175,9 @@
             "melk_pris = '23.50'\n",
             "havregryn_pris = 15\n",
             "\n",
-            "total_sum = banan_pris + float(melk_pris) + havregryn_pris\n",
+            "total_sum = banan_pris + melk_pris + havregryn_pris\n",
             "\n",
-            "print('Totalsummen for varene er ' + str(total_sum))"
+            "print('Totalsummen for varene er ' + total_sum)"
          ]
       },
       {
-- 
GitLab